diff --git a/crmeb/.mvn/wrapper/MavenWrapperDownloader.java b/crmeb/.mvn/wrapper/MavenWrapperDownloader.java deleted file mode 100644 index a45eb6ba..00000000 --- a/crmeb/.mvn/wrapper/MavenWrapperDownloader.java +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Copyright 2007-present the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.net.*; -import java.io.*; -import java.nio.channels.*; -import java.util.Properties; - -public class MavenWrapperDownloader { - - private static final String WRAPPER_VERSION = "0.5.6"; - /** - * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. - */ - private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" - + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; - - /** - * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to - * use instead of the default one. - */ - private static final String MAVEN_WRAPPER_PROPERTIES_PATH = - ".mvn/wrapper/maven-wrapper.properties"; - - /** - * Path where the maven-wrapper.jar will be saved to. - */ - private static final String MAVEN_WRAPPER_JAR_PATH = - ".mvn/wrapper/maven-wrapper.jar"; - - /** - * Name of the property which should be used to override the default download url for the wrapper. - */ - private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; - - public static void main(String args[]) { - System.out.println("- Downloader started"); - File baseDirectory = new File(args[0]); - System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); - - // If the maven-wrapper.properties exists, read it and check if it contains a custom - // wrapperUrl parameter. - File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); - String url = DEFAULT_DOWNLOAD_URL; - if (mavenWrapperPropertyFile.exists()) { - FileInputStream mavenWrapperPropertyFileInputStream = null; - try { - mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); - Properties mavenWrapperProperties = new Properties(); - mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); - url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); - } catch (IOException e) { - System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); - } finally { - try { - if (mavenWrapperPropertyFileInputStream != null) { - mavenWrapperPropertyFileInputStream.close(); - } - } catch (IOException e) { - // Ignore ... - } - } - } - System.out.println("- Downloading from: " + url); - - File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); - if (!outputFile.getParentFile().exists()) { - if (!outputFile.getParentFile().mkdirs()) { - System.out.println( - "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); - } - } - System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); - try { - downloadFileFromURL(url, outputFile); - System.out.println("Done"); - System.exit(0); - } catch (Throwable e) { - System.out.println("- Error downloading"); - e.printStackTrace(); - System.exit(1); - } - } - - private static void downloadFileFromURL(String urlString, File destination) throws Exception { - if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { - String username = System.getenv("MVNW_USERNAME"); - char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); - Authenticator.setDefault(new Authenticator() { - @Override - protected PasswordAuthentication getPasswordAuthentication() { - return new PasswordAuthentication(username, password); - } - }); - } - URL website = new URL(urlString); - ReadableByteChannel rbc; - rbc = Channels.newChannel(website.openStream()); - FileOutputStream fos = new FileOutputStream(destination); - fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); - fos.close(); - rbc.close(); - } - -} diff --git a/crmeb/.mvn/wrapper/maven-wrapper.jar b/crmeb/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index 2cc7d4a5..00000000 Binary files a/crmeb/.mvn/wrapper/maven-wrapper.jar and /dev/null differ diff --git a/crmeb/.mvn/wrapper/maven-wrapper.properties b/crmeb/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index 642d572c..00000000 --- a/crmeb/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1,2 +0,0 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/crmeb/crmeb-admin/pom.xml b/crmeb/crmeb-admin/pom.xml index c7d7994e..d7579585 100644 --- a/crmeb/crmeb-admin/pom.xml +++ b/crmeb/crmeb-admin/pom.xml @@ -22,6 +22,29 @@ crmeb-service ${crmeb-service} + + + org.springframework.boot + spring-boot-starter-quartz + + + + + com.github.oshi + oshi-core + 5.8.6 + + + net.java.dev.jna + jna + 5.13.0 + + + net.java.dev.jna + jna-platform + 5.13.0 + + @@ -40,6 +63,21 @@ + + org.apache.maven.plugins + maven-resources-plugin + + + true + + woff + woff2 + eot + ttf + svg + + + @@ -71,6 +109,17 @@ **/*.xml + + + true + src/main/resources + + **/*.woff + **/*.ttf + **/*.eot + **/*.svg + + diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/CrmebAdminApplication.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/CrmebAdminApplication.java index 79514992..969f00d2 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/CrmebAdminApplication.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/CrmebAdminApplication.java @@ -15,7 +15,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -27,6 +27,12 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; @Configuration @EnableTransactionManagement @SpringBootApplication(exclude = DataSourceAutoConfiguration.class) //去掉数据源 +//@ComponentScan(basePackages={"com.utils", +// "com.zbkj.crmeb", +// "com.exception", +// "com.common", +// "com.aop"}) //扫描utils包和父包 +//@MapperScan(basePackages = {"com.zbkj.crmeb.*.dao", "com.zbkj.crmeb.*.*.dao"}) @ComponentScan(basePackages = {"com.zbkj"}) @MapperScan(basePackages = {"com.zbkj.**.dao"}) public class CrmebAdminApplication { diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/acpect/ControllerAspect.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/acpect/ControllerAspect.java deleted file mode 100644 index 1e043a8c..00000000 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/acpect/ControllerAspect.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.zbkj.admin.acpect; - -import org.aspectj.lang.ProceedingJoinPoint; -import org.aspectj.lang.annotation.Around; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Pointcut; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -import java.util.Arrays; - - -/** - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - * 所有的前端controller层的拦截业务，方法的执行时间长度， - */ -@Aspect -@Component -public class ControllerAspect { - - Logger logger = LoggerFactory.getLogger(ControllerAspect.class); - - @Pointcut("execution(* com.zbkj.admin.controller.*.*(..))") - private void pointCutMethodController() { - - } - - @Around("pointCutMethodController()") - public Object doAroundService(ProceedingJoinPoint pjp) throws Throwable { - - long begin = System.nanoTime(); - - Object obj = pjp.proceed(); - - long end = System.nanoTime(); - - logger.info("Controller method：{}，prams：{}，cost time：{} ns，cost：{} ms", - - pjp.getSignature().toString(), Arrays.toString(pjp.getArgs()), (end - begin), (end - begin) / 1000000); - - return obj; - } - -} diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/CorsConfig.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/CorsConfig.java index b28c73c0..5ef768aa 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/CorsConfig.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/CorsConfig.java @@ -10,7 +10,7 @@ import org.springframework.web.filter.CorsFilter; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -21,20 +21,16 @@ import org.springframework.web.filter.CorsFilter; public class CorsConfig{ private CorsConfiguration buildConfig() { CorsConfiguration corsConfiguration = new CorsConfiguration(); - //允许任何域名 - corsConfiguration.addAllowedOrigin("*"); - //允许任何头 - corsConfiguration.addAllowedHeader("*"); - //允许任何方法 - corsConfiguration.addAllowedMethod("*"); + corsConfiguration.addAllowedOrigin("*"); //允许任何域名 + corsConfiguration.addAllowedHeader("*"); //允许任何头 + corsConfiguration.addAllowedMethod("*"); //允许任何方法 return corsConfiguration; } @Bean public CorsFilter corsFilter() { UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); - //注册 - source.registerCorsConfiguration("/**", buildConfig()); + source.registerCorsConfiguration("/**", buildConfig()); //注册 return new CorsFilter(source); } } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/DruidConfig.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/DruidConfig.java index 07d6b576..4ef0b288 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/DruidConfig.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/DruidConfig.java @@ -16,7 +16,7 @@ import javax.sql.DataSource; * +---------------------------------------------------------------------- * | 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,18 +35,20 @@ public class DruidConfig { servletRegistrationBean.addInitParameter("loginUsername", "kf"); // 用户名 servletRegistrationBean.addInitParameter("loginPassword", "654321"); // 密码 servletRegistrationBean.addInitParameter("resetEnable", "true"); // 是否可以重置数据源 - return servletRegistrationBean ; + return servletRegistrationBean; } + @Bean public FilterRegistrationBean filterRegistrationBean() { - FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean() ; + FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean(); filterRegistrationBean.setFilter(new WebStatFilter()); filterRegistrationBean.addUrlPatterns("/*"); // 所有请求进行监控处理 //不必监控的请求 filterRegistrationBean.addInitParameter("exclusions", "*.html,*.png,*.ico,*.js,*.gif,*.jpg,*.css,/druid/*"); - return filterRegistrationBean ; + return filterRegistrationBean; } + @Bean("dataSource") @ConfigurationProperties(prefix = "spring.datasource") public DataSource druidDataSource() { diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/JacksonConfig.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/JacksonConfig.java index b67e03ae..bdbc9b67 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/JacksonConfig.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/JacksonConfig.java @@ -12,7 +12,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/RestTemplateConfig.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/RestTemplateConfig.java index e06a3fc1..4a0c4f74 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/RestTemplateConfig.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/RestTemplateConfig.java @@ -18,7 +18,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/SchedulerConfig.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/SchedulerConfig.java index eacb3378..748054f2 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/SchedulerConfig.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/SchedulerConfig.java @@ -11,7 +11,7 @@ import org.springframework.scheduling.config.ScheduledTaskRegistrar; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/SwaggerConfig.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/SwaggerConfig.java index 92202171..f28a3640 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/SwaggerConfig.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/SwaggerConfig.java @@ -25,7 +25,7 @@ import static com.google.common.collect.Lists.newArrayList; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/TaskExecutorConfig.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/TaskExecutorConfig.java index 5d1b8763..a37cbd12 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/TaskExecutorConfig.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/TaskExecutorConfig.java @@ -13,7 +13,7 @@ import java.util.concurrent.ThreadPoolExecutor; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/WebConfig.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/WebConfig.java index a71594da..0d737f20 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/WebConfig.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/WebConfig.java @@ -1,9 +1,10 @@ package com.zbkj.admin.config; +import com.zbkj.common.constants.Constants; +import com.zbkj.common.constants.UploadConstants; +import com.zbkj.common.interceptor.SwaggerInterceptor; import com.zbkj.admin.filter.ResponseFilter; import com.zbkj.common.config.CrmebConfig; -import com.zbkj.common.constants.Constants; -import com.zbkj.common.interceptor.SwaggerInterceptor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -15,12 +16,14 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.handler.MappedInterceptor; +import java.io.File; + /** * token验证拦截器 * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -90,17 +93,21 @@ public class WebConfig implements WebMvcConfigurer { .addResourceLocations("classpath:/META-INF/resources/webjars/"); /** 本地文件上传路径 */ - registry.addResourceHandler(Constants.UPLOAD_TYPE_IMAGE + "/**") - .addResourceLocations("file:" + crmebConfig.getImagePath() + "/" + Constants.UPLOAD_TYPE_IMAGE + "/"); + registry.addResourceHandler(UploadConstants.UPLOAD_FILE_KEYWORD + "/**") + .addResourceLocations("file:" + crmebConfig.getImagePath() + "/" + UploadConstants.UPLOAD_FILE_KEYWORD + "/"); + + registry.addResourceHandler(UploadConstants.UPLOAD_AFTER_FILE_KEYWORD + "/**") + .addResourceLocations("file:" +crmebConfig.getImagePath() + "/" + UploadConstants.UPLOAD_AFTER_FILE_KEYWORD + "/" ); + } @Bean - public FilterRegistrationBean filterRegister() { + public FilterRegistrationBean filterRegister() + { //注册过滤器 FilterRegistrationBean registration = new FilterRegistrationBean(responseFilter()); // 仅仅api前缀的请求才会拦截 - registration.addUrlPatterns("/api/admin/*"); - registration.addUrlPatterns("/api/front/*"); + registration.addUrlPatterns("/api/*"); return registration; } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/WebSecurityConfig.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/WebSecurityConfig.java index 73912e8b..24aa5a4c 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/WebSecurityConfig.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/WebSecurityConfig.java @@ -5,6 +5,7 @@ import com.zbkj.admin.manager.AuthenticationEntryPointImpl; import com.zbkj.admin.manager.CustomAccessDeniedHandler; import com.zbkj.admin.manager.CustomAuthenticationProvider; import com.zbkj.common.constants.Constants; +import com.zbkj.common.constants.UploadConstants; import com.zbkj.service.service.impl.UserDetailServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -25,7 +26,7 @@ import org.springframework.web.filter.CorsFilter; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -77,7 +78,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { // } @Override - protected void configure(AuthenticationManagerBuilder auth) { + protected void configure(AuthenticationManagerBuilder auth) throws Exception { auth.authenticationProvider(new CustomAuthenticationProvider(new UserDetailServiceImpl())); } @@ -110,16 +111,18 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { .authorizeRequests() // 跨域预检请求 // .antMatchers(HttpMethod.OPTIONS, "/**").permitAll() - // 对于登录login 验证码captchaImage 和其他放行的目录 允许匿名访问"/citylife/front/**" - .antMatchers("/api/admin/login", "/api/admin/validate/code/get").permitAll() - .antMatchers("/api/admin/getLoginPic").permitAll() + // 对于登录login 验证码captchaImage 和其他放行的目录 允许匿名访问"/citylife/front/**" + .antMatchers("/api/admin/login", "/api/admin/validate/code/get").permitAll() + .antMatchers("/api/admin/getLoginPic").permitAll() + .antMatchers("/api/admin/login/account/detection").permitAll() + .antMatchers("/api/admin/validate/code/getcaptchaconfig").permitAll() // 放行资源路径 - .antMatchers("/"+ Constants.UPLOAD_TYPE_IMAGE +"/**").anonymous() + .antMatchers("/"+ UploadConstants.UPLOAD_FILE_KEYWORD +"/**").permitAll() + .antMatchers("/"+ UploadConstants.DOWNLOAD_FILE_KEYWORD +"/**").permitAll() + .antMatchers("/"+ UploadConstants.UPLOAD_AFTER_FILE_KEYWORD +"/**").permitAll() // 放行图片、文件上传 - .antMatchers("/api/admin/upload/image").permitAll() - .antMatchers("/api/admin/upload/file").permitAll() - // 代码生成器 - .antMatchers("/api/codegen/code").permitAll() + .antMatchers("/api/admin/upload/image").permitAll() + .antMatchers("/api/admin/upload/file").permitAll() // .antMatchers("/wx/user/*/login","/citylife/nocheck/**").anonymous() .antMatchers( HttpMethod.GET, @@ -140,7 +143,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers("/druid/**").anonymous() .antMatchers("/captcha/get", "/captcha/check").anonymous() .antMatchers("/api/admin/payment/callback/**").anonymous() - .antMatchers("/api/public/**").anonymous() + .antMatchers("/api/public/**").permitAll() // 除上面外的所有请求全部需要鉴权认证 .anyRequest().authenticated() .and() diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/AdminLoginController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/AdminLoginController.java index 110bc28c..87d391f2 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/AdminLoginController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/AdminLoginController.java @@ -1,12 +1,15 @@ package com.zbkj.admin.controller; +import com.zbkj.admin.service.AdminLoginService; +import com.zbkj.common.request.AdminAccountDetectionRequest; +import com.zbkj.common.request.LoginAdminUpdatePasswordRequest; +import com.zbkj.common.request.LoginAdminUpdateRequest; import com.zbkj.common.request.SystemAdminLoginRequest; -import com.zbkj.common.response.CommonResult; import com.zbkj.common.response.MenusResponse; import com.zbkj.common.response.SystemAdminResponse; import com.zbkj.common.response.SystemLoginResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.common.utils.CrmebUtil; -import com.zbkj.admin.service.AdminLoginService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -24,7 +27,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -45,7 +48,7 @@ public class AdminLoginController { public CommonResult SystemAdminLogin(@RequestBody @Validated SystemAdminLoginRequest systemAdminLoginRequest, HttpServletRequest request) { String ip = CrmebUtil.getClientIp(request); SystemLoginResponse systemAdminResponse = adminLoginService.login(systemAdminLoginRequest, ip); - return CommonResult.success(systemAdminResponse, "login success"); + return CommonResult.success(systemAdminResponse); } @PreAuthorize("hasAuthority('admin:logout')") @@ -53,7 +56,7 @@ public class AdminLoginController { @GetMapping(value = "/logout") public CommonResult SystemAdminLogout() { adminLoginService.logout(); - return CommonResult.success("logout success"); + return CommonResult.success(); } @PreAuthorize("hasAuthority('admin:info')") @@ -83,4 +86,30 @@ public class AdminLoginController { return CommonResult.success(adminLoginService.getMenus()); } + + @ApiOperation(value="账号登录检测") + @RequestMapping(value = "/login/account/detection", method = RequestMethod.POST) + public CommonResult accountDetection(@RequestBody @Validated AdminAccountDetectionRequest request) { + return CommonResult.success(adminLoginService.accountDetection(request.getAccount())); + } + + @PreAuthorize("hasAuthority('admin:update:name')") + @ApiOperation(value="修改登录用户信息") + @RequestMapping(value = "/login/admin/update", method = RequestMethod.POST) + public CommonResult loginAdminUpdate(@RequestBody @Validated LoginAdminUpdateRequest request) { + if (adminLoginService.loginAdminUpdate(request)) { + return CommonResult.success(); + } + return CommonResult.failed(); + } + + @PreAuthorize("hasAuthority('admin:update:password')") + @ApiOperation(value="修改登录用户密码") + @RequestMapping(value = "/login/update/password", method = RequestMethod.POST) + public CommonResult loginAdminUpdatePwd(@RequestBody @Validated LoginAdminUpdatePasswordRequest request) { + if (adminLoginService.loginAdminUpdatePwd(request)) { + return CommonResult.success(); + } + return CommonResult.failed(); + } } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/ArticleController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/ArticleController.java index 4023dc03..56f07ee5 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/ArticleController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/ArticleController.java @@ -5,7 +5,7 @@ import com.zbkj.common.page.CommonPage; import com.zbkj.common.request.ArticleRequest; import com.zbkj.common.request.ArticleSearchRequest; import com.zbkj.common.request.PageParamRequest; -import com.zbkj.common.response.CommonResult; +import com.zbkj.common.result.CommonResult; import com.zbkj.common.vo.ArticleVo; import com.zbkj.service.service.ArticleService; import io.swagger.annotations.Api; @@ -23,7 +23,7 @@ import org.springframework.web.bind.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/CallbackController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/CallbackController.java index 4079e9e7..9574c5b2 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/CallbackController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/CallbackController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/CategoryController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/CategoryController.java index 36049046..7e96b6e7 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/CategoryController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/CategoryController.java @@ -6,7 +6,7 @@ import com.zbkj.common.page.CommonPage; import com.zbkj.common.request.CategoryRequest; import com.zbkj.common.request.CategorySearchRequest; import com.zbkj.common.request.PageParamRequest; -import com.zbkj.common.response.CommonResult; +import com.zbkj.common.result.CommonResult; import com.zbkj.common.utils.CrmebUtil; import com.zbkj.common.vo.CategoryTreeVo; import com.zbkj.service.service.CategoryService; @@ -29,7 +29,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相关版权 * +---------------------------------------------------------------------- @@ -49,18 +49,16 @@ public class CategoryController { private SystemAttachmentService systemAttachmentService; /** - * 分页显示分类表 + * 显示分类表 * @param request 搜索条件 - * @param pageParamRequest 分页参数 * @author Mr.Zhang * @since 2020-04-16 */ @PreAuthorize("hasAuthority('admin:category:list')") - @ApiOperation(value = "分页分类列表") + @ApiOperation(value = "分类列表") @RequestMapping(value = "/list", method = RequestMethod.GET) - public CommonResult> getList(@ModelAttribute CategorySearchRequest request, @ModelAttribute PageParamRequest pageParamRequest) { - CommonPage categoryCommonPage = CommonPage.restPage(categoryService.getList(request, pageParamRequest)); - return CommonResult.success(categoryCommonPage); + public CommonResult> getList(@ModelAttribute CategorySearchRequest request) { + return CommonResult.success(categoryService.getList(request)); } /** diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/CodeGenerator.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/CodeGenerator.java deleted file mode 100644 index d3374671..00000000 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/CodeGenerator.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.zbkj.admin.controller; - -import com.zbkj.common.constants.Constants; -import com.zbkj.common.response.CommonResult; -import com.zbkj.common.utils.DateUtil; -import com.zbkj.common.utils.genutils.GenCodePageListUtils; -import com.zbkj.common.utils.genutils.GenCodePageQueryUtils; -import com.zbkj.service.service.impl.CrmebGeneratorCodeService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.apache.commons.io.IOUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.Date; -import java.util.Map; - -/** - * 前后端代码生成器 controller - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - */ -@Controller -@RequestMapping("api/codegen") -@Api(tags = "代码生成") -public class CodeGenerator { - - @Autowired - private CrmebGeneratorCodeService crmebGeneratorCodeService; - - @ResponseBody - @ApiOperation(value="代码生成-新列表") - @GetMapping("/list") - public CommonResult listNew(@RequestParam Map params){ - GenCodePageListUtils pageUtil = crmebGeneratorCodeService.queryList(new GenCodePageQueryUtils(params)); - return CommonResult.success(pageUtil); - } - - /** - * 生成代码 API - */ - @GetMapping("/code") - public void code(@RequestParam String tables, HttpServletResponse response) throws IOException { - byte[] data = crmebGeneratorCodeService.generatorCode(tables.split(",")); - - String contentLength = "Content-Length"; - String contentType = "application/octet-stream; charset=UTF-8;"; - String contentDisposition = "Content-Disposition"; - String attachment = "attachment; filename=\"CRMEB-Java-Code-"+ DateUtil.dateToStr(new Date(), Constants.DATE_FORMAT_HHMM) +".zip\""; - - response.reset(); - response.addHeader(contentLength, data.length +""); - response.setContentType(contentType); - response.setHeader(contentDisposition, attachment); - - IOUtils.write(data, response.getOutputStream()); - } -} diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/ExcelController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/ExcelController.java index bc0f11a1..c4f460f7 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/ExcelController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/ExcelController.java @@ -5,7 +5,7 @@ import com.zbkj.common.request.StoreBargainSearchRequest; import com.zbkj.common.request.StoreCombinationSearchRequest; import com.zbkj.common.request.StoreOrderSearchRequest; import com.zbkj.common.request.StoreProductSearchRequest; -import com.zbkj.common.response.CommonResult; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.ExcelService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -25,7 +25,7 @@ import java.util.HashMap; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/ExpressController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/ExpressController.java index c54c5770..088c3584 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/ExpressController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/ExpressController.java @@ -1,22 +1,22 @@ package com.zbkj.admin.controller; import com.alibaba.fastjson.JSONObject; +import com.zbkj.common.model.express.Express; import com.zbkj.common.page.CommonPage; -import com.zbkj.common.response.CommonResult; -import com.zbkj.common.request.PageParamRequest; -import com.zbkj.common.request.ExpressUpdateRequest; import com.zbkj.common.request.ExpressSearchRequest; +import com.zbkj.common.request.ExpressUpdateRequest; import com.zbkj.common.request.ExpressUpdateShowRequest; +import com.zbkj.common.request.PageParamRequest; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.ExpressService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import com.zbkj.common.model.express.Express; import java.util.List; @@ -26,7 +26,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相关版权 * +---------------------------------------------------------------------- @@ -51,8 +51,8 @@ public class ExpressController { @ApiOperation(value = "分页列表") @RequestMapping(value = "/list", method = RequestMethod.GET) @ApiImplicitParam(name="keywords", value="搜索关键字") - public CommonResult> getList(@Validated ExpressSearchRequest request, - @ModelAttribute PageParamRequest pageParamRequest) { + public CommonResult> getList(@Validated ExpressSearchRequest request, + @ModelAttribute PageParamRequest pageParamRequest) { CommonPage expressCommonPage = CommonPage.restPage(expressService.getList(request, pageParamRequest)); return CommonResult.success(expressCommonPage); } @@ -91,9 +91,11 @@ public class ExpressController { @RequestMapping(value = "/sync/express", method = RequestMethod.POST) public CommonResult syncExpress() { if (expressService.syncExpress()) { - return CommonResult.success(); + CommonResult success = CommonResult.success(); + success.setMessage("同步物流公司成功"); + return success; } - return CommonResult.failed(); + return CommonResult.failed("同步物流公司失败"); } @@ -130,6 +132,16 @@ public class ExpressController { public CommonResult template(@RequestParam(value = "com") String com) { return CommonResult.success(expressService.template(com)); } + +// /** +// * 获取电子面单模版 +// */ +// @ApiOperation(value = "查询 电子面单 模版列表") +// @RequestMapping(value = "/templatedianzi", method = RequestMethod.GET) +// @ApiImplicitParam(name="com", value="快递公司编号", required = true) +// public CommonResult templateDZ(@RequestParam(value = "com") String com) { +// return CommonResult.success(expressService.templateFor(com)); +// } } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/FundsMonitorController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/FundsMonitorController.java index f1d2ca49..4d6d155b 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/FundsMonitorController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/FundsMonitorController.java @@ -1,12 +1,12 @@ package com.zbkj.admin.controller; +import com.zbkj.common.model.user.UserBrokerageRecord; import com.zbkj.common.page.CommonPage; -import com.zbkj.common.response.CommonResult; -import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.BrokerageRecordRequest; import com.zbkj.common.request.FundsMonitorRequest; +import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.response.MonitorResponse; -import com.zbkj.common.model.user.UserBrokerageRecord; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.UserBillService; import com.zbkj.service.service.UserFundsMonitorService; import io.swagger.annotations.Api; @@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController; * +---------------------------------------------------------------------- * | 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 FundsMonitorController { @PreAuthorize("hasAuthority('admin:finance:monitor:list')") @ApiOperation(value = "资金监控") @RequestMapping(value = "/list", method = RequestMethod.GET) - public CommonResult> getList(@Validated FundsMonitorRequest request, @Validated PageParamRequest pageParamRequest){ + public CommonResult> getList(@Validated FundsMonitorRequest request, @Validated PageParamRequest pageParamRequest){ CommonPage userExtractCommonPage = CommonPage.restPage(userBillService.fundMonitoring(request, pageParamRequest)); return CommonResult.success(userExtractCommonPage); } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/HomeController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/HomeController.java index 3dc2c0fa..58cca927 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/HomeController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/HomeController.java @@ -1,7 +1,8 @@ package com.zbkj.admin.controller; -import com.zbkj.common.response.CommonResult; +import com.zbkj.common.response.HomeOperatingDataResponse; import com.zbkj.common.response.HomeRateResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.HomeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -20,7 +21,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -102,6 +103,16 @@ public class HomeController { public CommonResult> chartOrderInYear() { return CommonResult.success(homeService.chartOrderInYear()); } + + /** + * 首页经营数据 + */ + @PreAuthorize("hasAuthority('admin:statistics:home:operating:data')") + @ApiOperation(value = "经营数据") + @RequestMapping(value = "/operating/data", method = RequestMethod.GET) + public CommonResult operatingData() { + return CommonResult.success(homeService.operatingData()); + } } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/OnePassController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/OnePassController.java index f3acc316..7eb77392 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/OnePassController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/OnePassController.java @@ -1,27 +1,27 @@ package com.zbkj.admin.controller; import com.alibaba.fastjson.JSONObject; -import com.zbkj.common.request.*; -import com.zbkj.common.response.CommonResult; +import com.zbkj.common.request.onepass.OnePassLoginRequest; +import com.zbkj.common.request.onepass.OnePassShipmentCancelOrderRequest; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.OnePassService; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; /** * 一号通控制器 * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -37,160 +37,40 @@ public class OnePassController { @Autowired private OnePassService onePassService; - /** - * 获取用户验证码 - * @param phone 手机号码 - */ - @PreAuthorize("hasAuthority('admin:pass:send:code')") - @ApiOperation(value = "获取用户验证码") - @RequestMapping(value = "/sendUserCode", method = RequestMethod.GET) - @ApiImplicitParams({ - @ApiImplicitParam(name="phone", value="手机号"), - @ApiImplicitParam(name="types", value="验证码类型1:修改，0:注册") - }) - public CommonResult sendUserCode(@RequestParam(name = "phone") String phone,@RequestParam(name = "types", required = false) Integer types) { - return CommonResult.success(onePassService.sendUserCode(phone, types)); + + @PreAuthorize("hasAuthority('admin:pass:appsave')") + @ApiOperation(value = "一号通 应用保存") + @RequestMapping(value = "/appsave", method = RequestMethod.POST) + public CommonResult saveOnePassApplication(@Validated @RequestBody OnePassLoginRequest request) { + return CommonResult.success(onePassService.saveOnePassApplicationInfo(request)); } - /** - * 账号注册 - * @param registerRequest 注册参数 - */ - @PreAuthorize("hasAuthority('admin:pass:register')") - @ApiOperation(value = "账号注册") - @RequestMapping(value = "/register", method = RequestMethod.POST) - public CommonResult register(@Validated @RequestBody OnePassRegisterRequest registerRequest) { - return CommonResult.success(onePassService.register(registerRequest)); + @PreAuthorize("hasAuthority('admin:pass:appget')") + @ApiOperation(value = "一号通 应用详情获取") + @RequestMapping(value = "/appget", method = RequestMethod.GET) + public CommonResult getOnePassApplication() { + return CommonResult.success(onePassService.getOnePassApplicationInfo()); } - /** - * 一号通用户登录 - * @return - */ - @PreAuthorize("hasAuthority('admin:pass:login')") - @ApiOperation(value = "一号通用户登录") - @RequestMapping(value = "/login", method = RequestMethod.POST) - public CommonResult> account(@Validated @RequestBody OnePassLoginRequest request) { - return CommonResult.success(onePassService.login(request)); + @PreAuthorize("hasAuthority('admin:pass:shipment:cancel')") + @ApiOperation(value = "一号通 取消商家寄件") + @RequestMapping(value = "/shipment/cancel", method = RequestMethod.POST) + public CommonResult onePassShipmentCancel(OnePassShipmentCancelOrderRequest request) { + return CommonResult.success(onePassService.shipmentCancelOrder(request)); } - /** - * 判断是否已经登录 - * @return - */ - @PreAuthorize("hasAuthority('admin:pass:is:login')") - @ApiOperation(value = "是否已经登录") - @RequestMapping(value = "/isLogin", method = RequestMethod.GET) - public CommonResult> isLogin() { - return CommonResult.success(onePassService.isLogin()); + @PreAuthorize("hasAuthority('admin:pass:shipment:express')") + @ApiOperation(value = "一号通 商家寄件 快递列表") + @RequestMapping(value = "/shipment/express", method = RequestMethod.GET) + public CommonResult onePassShipmentExpress() { + return CommonResult.success(onePassService.shipmentComs()); } - /** - * 一号通用户信息 - */ - @PreAuthorize("hasAuthority('admin:pass:info')") - @ApiOperation(value = "一号通用户信息") - @RequestMapping(value = "/info", method = RequestMethod.GET) - public CommonResult getInfo() { - return CommonResult.success(onePassService.info()); + @PreAuthorize("hasAuthority('admin:pass:shipment:callback')") + @ApiOperation(value = "一号通 商家寄件 回调地址") + @RequestMapping(value = "/shipment/callback", method = RequestMethod.POST) + public CommonResult onePassShipmentCallBack(String type, String data) { + return CommonResult.success(onePassService.shipmentCallBackMethod(type, data)); } - /** - * 注销当前登录 - * @return result - */ - @PreAuthorize("hasAuthority('admin:pass:logout')") - @ApiOperation(value = "注销") - @RequestMapping(value = "/logout", method = RequestMethod.GET) - public CommonResult logOut() { - if (onePassService.logOut()) { - return CommonResult.success(); - } - return CommonResult.failed(); - } - - /** - * 修改密码 - * 手机号+验证码方式修改 - */ - @PreAuthorize("hasAuthority('admin:pass:update:password')") - @ApiOperation(value = "修改密码") - @RequestMapping(value = "/update/password", method = RequestMethod.POST) - public CommonResult updatePassword(@Validated @RequestBody OnePassUpdateRequest request) { - if (onePassService.updatePassword(request)) { - return CommonResult.success(); - } - return CommonResult.failed(); - } - - /** - * 修改手机号——验证账号密码 - */ - @PreAuthorize("hasAuthority('admin:pass:update:phone:validator')") - @ApiOperation(value = "修改手机号——验证账号密码") - @RequestMapping(value = "/update/phone/validator", method = RequestMethod.POST) - public CommonResult updatePhone(@Validated @RequestBody OnePassLoginRequest request) { - if (onePassService.beforeUpdatePhoneValidator(request)) { - return CommonResult.success(); - } - return CommonResult.failed(); - } - - /** - * 修改手机号 - */ - @PreAuthorize("hasAuthority('admin:pass:update:phone')") - @ApiOperation(value = "修改手机号") - @RequestMapping(value = "/update/phone", method = RequestMethod.POST) - public CommonResult updatePhone(@Validated @RequestBody OnePassUpdateRequest request) { - if (onePassService.updatePhone(request)) { - return CommonResult.success(); - } - return CommonResult.failed(); - } - - /** - * 套餐列表 - * @param type 套餐类型：sms,短信；expr_query,物流查询；expr_dump,电子面单；copy,产品复制 - */ - @PreAuthorize("hasAuthority('admin:pass:meal:list')") - @ApiOperation(value = "套餐列表") - @RequestMapping(value = "/meal/list", method = RequestMethod.GET) - @ApiImplicitParam(name="type", value="套餐类型：sms,短信；expr_query,物流查询；expr_dump,电子面单；copy,产品复制") - public CommonResult mealList(@Validated @RequestParam String type) { - return CommonResult.success(onePassService.mealList(type)); - } - - /** - * 套餐购买 - */ - @PreAuthorize("hasAuthority('admin:pass:meal:code')") - @ApiOperation(value = "套餐购买") - @RequestMapping(value = "/meal/code", method = RequestMethod.POST) - public CommonResult mealCode(@RequestBody @Validated MealCodeRequest request) { - return CommonResult.success(onePassService.mealCode(request)); - } - - /** - * 服务开通 - */ - @PreAuthorize("hasAuthority('admin:pass:service:open')") - @ApiOperation(value = "服务开通") - @RequestMapping(value = "/service/open", method = RequestMethod.POST) - public CommonResult serviceOpen(@RequestBody @Validated ServiceOpenRequest request) { - if (onePassService.serviceOpen(request)) { - return CommonResult.success(); - } - return CommonResult.failed(); - } - - /** - * 用量记录 - */ - @PreAuthorize("hasAuthority('admin:pass:user:record')") - @ApiOperation(value = "用量记录") - @RequestMapping(value = "/user/record", method = RequestMethod.GET) - public CommonResult record(@Validated OnePassUserRecordRequest request) { - return CommonResult.success(onePassService.userRecord(request)); - } } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/RetailShopController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/RetailShopController.java index 62f96be2..aec9b353 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/RetailShopController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/RetailShopController.java @@ -5,9 +5,9 @@ import com.zbkj.common.page.CommonPage; import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.RetailShopRequest; import com.zbkj.common.request.RetailShopStairUserRequest; -import com.zbkj.common.response.CommonResult; import com.zbkj.common.response.SpreadOrderResponse; import com.zbkj.common.response.SpreadUserResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.RetailShopService; import com.zbkj.service.service.UserService; import io.swagger.annotations.Api; @@ -25,7 +25,7 @@ import org.springframework.web.bind.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/ShippingTemplatesController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/ShippingTemplatesController.java index fe2160f0..9386b808 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/ShippingTemplatesController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/ShippingTemplatesController.java @@ -1,27 +1,28 @@ package com.zbkj.admin.controller; +import com.zbkj.common.model.express.ShippingTemplates; import com.zbkj.common.page.CommonPage; -import com.zbkj.common.response.CommonResult; import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.ShippingTemplatesRequest; import com.zbkj.common.request.ShippingTemplatesSearchRequest; +import com.zbkj.common.response.ShippingTemplatesInfoResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.ShippingTemplatesService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; -import com.zbkj.common.model.express.ShippingTemplates; /** * 物流-模板控制器 * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -39,56 +40,60 @@ public class ShippingTemplatesController { /** * 分页显示 - * @param request 搜索条件 + * + * @param request 搜索条件 * @param pageParamRequest 分页参数 */ @PreAuthorize("hasAuthority('admin:shipping:templates:list')") @ApiOperation(value = "分页列表") @RequestMapping(value = "/list", method = RequestMethod.GET) - public CommonResult> getList(@Validated ShippingTemplatesSearchRequest request, @Validated PageParamRequest pageParamRequest){ + public CommonResult> getList(@Validated ShippingTemplatesSearchRequest request, @Validated PageParamRequest pageParamRequest) { CommonPage shippingTemplatesCommonPage = CommonPage.restPage(shippingTemplatesService.getList(request, pageParamRequest)); return CommonResult.success(shippingTemplatesCommonPage); } /** * 新增 + * * @param request 新增参数 */ @PreAuthorize("hasAuthority('admin:shipping:templates:save')") @ApiOperation(value = "新增") @RequestMapping(value = "/save", method = RequestMethod.POST) - public CommonResult save(@RequestBody @Validated ShippingTemplatesRequest request){ + public CommonResult save(@RequestBody @Validated ShippingTemplatesRequest request) { if (shippingTemplatesService.create(request)) { - return CommonResult.success(); + return CommonResult.success("新增运费模板成功"); } return CommonResult.failed("新增运费模板失败"); } /** * 删除 + * * @param id Integer */ @PreAuthorize("hasAuthority('admin:shipping:templates:delete')") @ApiOperation(value = "删除") @RequestMapping(value = "/delete", method = RequestMethod.GET) - @ApiImplicitParam(name="id", value="模板ID", required = true) - public CommonResult delete(@RequestParam(value = "id") Integer id){ - if(shippingTemplatesService.remove(id)){ + @ApiImplicitParam(name = "id", value = "模板ID", required = true) + public CommonResult delete(@RequestParam(value = "id") Integer id) { + if (shippingTemplatesService.remove(id)) { return CommonResult.success(); - }else{ + } else { return CommonResult.failed(); } } /** * 修改 - * @param id integer id + * + * @param id integer id * @param request ShippingTemplatesRequest 修改参数 */ @PreAuthorize("hasAuthority('admin:shipping:templates:update')") @ApiOperation(value = "修改") @RequestMapping(value = "/update", method = RequestMethod.POST) - public CommonResult update(@RequestParam Integer id, @RequestBody @Validated ShippingTemplatesRequest request){ + public CommonResult update(@RequestParam Integer id, @RequestBody @Validated ShippingTemplatesRequest request) { if (shippingTemplatesService.update(id, request)) { return CommonResult.success(); } @@ -97,15 +102,16 @@ public class ShippingTemplatesController { /** * 查询信息 + * * @param id Integer */ @PreAuthorize("hasAuthority('admin:shipping:templates:info')") @ApiOperation(value = "详情") @RequestMapping(value = "/info", method = RequestMethod.GET) - @ApiImplicitParam(name="id", value="模板ID", required = true) - public CommonResult info(@RequestParam(value = "id") Integer id){ + @ApiImplicitParam(name = "id", value = "模板ID", required = true) + public CommonResult info(@RequestParam(value = "id") Integer id) { return CommonResult.success(shippingTemplatesService.getInfo(id)); - } + } } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/ShippingTemplatesFreeController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/ShippingTemplatesFreeController.java index 1640987b..e2b911ba 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/ShippingTemplatesFreeController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/ShippingTemplatesFreeController.java @@ -1,7 +1,7 @@ package com.zbkj.admin.controller; -import com.zbkj.common.request.ShippingTemplatesFreeRequest; -import com.zbkj.common.response.CommonResult; +import com.zbkj.common.response.ShippingTemplatesFreeResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.ShippingTemplatesFreeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -20,7 +20,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相关版权 * +---------------------------------------------------------------------- @@ -43,7 +43,7 @@ public class ShippingTemplatesFreeController { @PreAuthorize("hasAuthority('admin:shipping:templates:free:list')") @ApiOperation(value = "根据模板id查询数据") @RequestMapping(value = "/list", method = RequestMethod.GET) - public CommonResult> getList(@RequestParam Integer tempId){ + public CommonResult> getList(@RequestParam Integer tempId){ return CommonResult.success(shippingTemplatesFreeService.getListGroup(tempId)); } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/ShippingTemplatesRegionController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/ShippingTemplatesRegionController.java index 46a1dc7e..6b06a146 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/ShippingTemplatesRegionController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/ShippingTemplatesRegionController.java @@ -1,7 +1,7 @@ package com.zbkj.admin.controller; -import com.zbkj.common.request.ShippingTemplatesRegionRequest; -import com.zbkj.common.response.CommonResult; +import com.zbkj.common.response.ShippingTemplatesRegionResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.ShippingTemplatesRegionService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -20,7 +20,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相关版权 * +---------------------------------------------------------------------- @@ -43,7 +43,7 @@ public class ShippingTemplatesRegionController { @PreAuthorize("hasAuthority('admin:shipping:templates:region:list')") @ApiOperation(value = "根据模板id查询数据") @RequestMapping(value = "/list", method = RequestMethod.GET) - public CommonResult> getList(@RequestParam Integer tempId){ + public CommonResult> getList(@RequestParam Integer tempId){ return CommonResult.success(shippingTemplatesRegionService.getListGroup(tempId)); } } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SmsRecordController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SmsRecordController.java index dcecdc81..1fba3805 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SmsRecordController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SmsRecordController.java @@ -1,11 +1,11 @@ package com.zbkj.admin.controller; import com.alibaba.fastjson.JSONObject; -import com.zbkj.common.response.CommonResult; -import com.zbkj.common.vo.MyRecord; import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.SmsApplyTempRequest; import com.zbkj.common.request.SmsModifySignRequest; +import com.zbkj.common.result.CommonResult; +import com.zbkj.common.vo.MyRecord; import com.zbkj.service.service.SmsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -24,7 +24,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreBargainController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreBargainController.java index 6e2f4718..1786c480 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreBargainController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreBargainController.java @@ -1,7 +1,6 @@ package com.zbkj.admin.controller; import com.zbkj.common.page.CommonPage; -import com.zbkj.common.response.CommonResult; import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.StoreBargainRequest; import com.zbkj.common.request.StoreBargainSearchRequest; @@ -10,6 +9,7 @@ import com.zbkj.common.response.StoreBargainResponse; import com.zbkj.common.response.StoreBargainUserHelpResponse; import com.zbkj.common.response.StoreBargainUserResponse; import com.zbkj.common.response.StoreProductInfoResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.StoreBargainService; import com.zbkj.service.service.StoreBargainUserHelpService; import com.zbkj.service.service.StoreBargainUserService; @@ -29,7 +29,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相关版权 * +---------------------------------------------------------------------- @@ -59,7 +59,7 @@ public class StoreBargainController { @PreAuthorize("hasAuthority('admin:bargain:list')") @ApiOperation(value = "分页显示砍价商品列表") //配合swagger使用 @RequestMapping(value = "/list", method = RequestMethod.GET) - public CommonResult> getList(@Validated StoreBargainSearchRequest request, @Validated PageParamRequest pageParamRequest){ + public CommonResult> getList(@Validated StoreBargainSearchRequest request, @Validated PageParamRequest pageParamRequest){ CommonPage storeBargainCommonPage = CommonPage.restPage(storeBargainService.getList(request, pageParamRequest)); return CommonResult.success(storeBargainCommonPage); } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreCombinationController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreCombinationController.java index 0df3a4ee..0ecd4187 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreCombinationController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreCombinationController.java @@ -1,7 +1,6 @@ package com.zbkj.admin.controller; import com.zbkj.common.page.CommonPage; -import com.zbkj.common.response.CommonResult; import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.StoreCombinationRequest; import com.zbkj.common.request.StoreCombinationSearchRequest; @@ -10,6 +9,7 @@ import com.zbkj.common.response.StoreCombinationResponse; import com.zbkj.common.response.StorePinkAdminListResponse; import com.zbkj.common.response.StorePinkDetailResponse; import com.zbkj.common.response.StoreProductInfoResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.StoreCombinationService; import com.zbkj.service.service.StorePinkService; import io.swagger.annotations.Api; @@ -28,7 +28,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreCouponController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreCouponController.java index a115f322..b368a636 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreCouponController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreCouponController.java @@ -1,13 +1,13 @@ package com.zbkj.admin.controller; +import com.zbkj.common.model.coupon.StoreCoupon; import com.zbkj.common.page.CommonPage; -import com.zbkj.common.response.CommonResult; import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.SearchAndPageRequest; -import com.zbkj.common.model.coupon.StoreCoupon; import com.zbkj.common.request.StoreCouponRequest; import com.zbkj.common.request.StoreCouponSearchRequest; import com.zbkj.common.response.StoreCouponInfoResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.StoreCouponService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -24,7 +24,7 @@ import org.springframework.web.bind.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相关版权 * +---------------------------------------------------------------------- @@ -48,7 +48,7 @@ public class StoreCouponController { @PreAuthorize("hasAuthority('admin:coupon:list')") @ApiOperation(value = "分页列表") @RequestMapping(value = "/list", method = RequestMethod.GET) - public CommonResult> getList(@Validated StoreCouponSearchRequest request, @Validated PageParamRequest pageParamRequest) { + public CommonResult> getList(@Validated StoreCouponSearchRequest request, @Validated PageParamRequest pageParamRequest) { CommonPage storeCouponCommonPage = CommonPage.restPage(storeCouponService.getList(request, pageParamRequest)); return CommonResult.success(storeCouponCommonPage); } @@ -116,7 +116,7 @@ public class StoreCouponController { @RequestMapping(value = "/delete", method = RequestMethod.POST) public CommonResult delete(@RequestParam Integer id) { if (storeCouponService.delete(id)) { - return CommonResult.success("删除成功"); + return CommonResult.success(); } else { return CommonResult.failed("删除失败"); } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreCouponUserController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreCouponUserController.java index 90430f2f..bffdddeb 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreCouponUserController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreCouponUserController.java @@ -1,19 +1,21 @@ package com.zbkj.admin.controller; import com.zbkj.common.page.CommonPage; -import com.zbkj.common.response.CommonResult; import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.StoreCouponUserRequest; import com.zbkj.common.request.StoreCouponUserSearchRequest; import com.zbkj.common.response.StoreCouponUserResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.StoreCouponUserService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; /** @@ -21,7 +23,7 @@ import org.springframework.web.bind.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相关版权 * +---------------------------------------------------------------------- @@ -45,7 +47,7 @@ public class StoreCouponUserController { @PreAuthorize("hasAuthority('admin:coupon:user:list')") @ApiOperation(value = "分页列表") @RequestMapping(value = "/list", method = RequestMethod.GET) - public CommonResult> getList(@Validated StoreCouponUserSearchRequest request, @Validated PageParamRequest pageParamRequest) { + public CommonResult> getList(@Validated StoreCouponUserSearchRequest request, @Validated PageParamRequest pageParamRequest) { CommonPage storeCouponUserCommonPage = CommonPage.restPage(storeCouponUserService.getList(request, pageParamRequest)); return CommonResult.success(storeCouponUserCommonPage); } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreOrderController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreOrderController.java index f9094d52..bcf60adb 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreOrderController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreOrderController.java @@ -3,6 +3,7 @@ package com.zbkj.admin.controller; import com.zbkj.common.page.CommonPage; import com.zbkj.common.request.*; import com.zbkj.common.response.*; +import com.zbkj.common.result.CommonResult; import com.zbkj.common.vo.ExpressSheetVo; import com.zbkj.common.vo.LogisticsResultVo; import com.zbkj.service.service.StoreOrderService; @@ -25,7 +26,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相关版权 * +---------------------------------------------------------------------- @@ -64,8 +65,9 @@ public class StoreOrderController { @RequestMapping(value = "/status/num", method = RequestMethod.GET) public CommonResult getOrderStatusNum( @RequestParam(value = "dateLimit", defaultValue = "") String dateLimit, - @RequestParam(value = "type", defaultValue = "2") @Range(min = 0, max = 2, message = "未知的订单类型") Integer type) { - return CommonResult.success(storeOrderService.getOrderStatusNum(dateLimit, type)); + @RequestParam(value = "type", defaultValue = "2") @Range(min = 0, max = 2, message = "未知的订单类型") Integer type, + @RequestParam(value = "orderId", defaultValue = "") String orderNo) { + return CommonResult.success(storeOrderService.getOrderStatusNum(dateLimit, type, orderNo)); } /** @@ -137,11 +139,8 @@ public class StoreOrderController { @PreAuthorize("hasAuthority('admin:order:send')") @ApiOperation(value = "发送货") @RequestMapping(value = "/send", method = RequestMethod.POST) - public CommonResult send(@RequestBody @Validated StoreOrderSendRequest request) { - if (storeOrderService.send(request)) { - return CommonResult.success(); - } - return CommonResult.failed(); + public CommonResult send(@RequestBody @Validated StoreOrderSendRequest request) { + return CommonResult.success(storeOrderService.send(request)); } /** @@ -150,7 +149,7 @@ public class StoreOrderController { @PreAuthorize("hasAuthority('admin:order:refund')") @ApiOperation(value = "退款") @RequestMapping(value = "/refund", method = RequestMethod.GET) - public CommonResult send(@Validated StoreOrderRefundRequest request) { + public CommonResult refund(@Validated StoreOrderRefundRequest request) { return CommonResult.success(storeOrderService.refund(request)); } @@ -260,6 +259,16 @@ public class StoreOrderController { return CommonResult.success(storeOrderService.getDeliveryInfo()); } + @PreAuthorize("hasAuthority('admin:order:tracking:number:update')") + @ApiOperation(value = "更改订单运单号") + @RequestMapping(value = "/update/tracking/number", method = RequestMethod.POST) + public CommonResult updateTrackingNumber(@RequestBody @Validated StoreOrderSendRequest request) { + if (storeOrderService.updateTrackingNumber(request)) { + return CommonResult.success(); + } + return CommonResult.failed(); + } + } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreOrderStatusController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreOrderStatusController.java index d0b3b1ef..289112af 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreOrderStatusController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreOrderStatusController.java @@ -1,10 +1,10 @@ package com.zbkj.admin.controller; -import com.zbkj.common.page.CommonPage; -import com.zbkj.common.response.CommonResult; -import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.model.order.StoreOrderStatus; +import com.zbkj.common.page.CommonPage; +import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.StoreOrderStatusSearchRequest; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.StoreOrderStatusService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -47,8 +47,8 @@ public class StoreOrderStatusController { @PreAuthorize("hasAuthority('admin:order:status:list')") @ApiOperation(value = "分页列表") //配合swagger使用 @RequestMapping(value = "/list", method = RequestMethod.GET) - public CommonResult> getList(@Validated StoreOrderStatusSearchRequest request, - @Validated PageParamRequest pageParamRequest){ + public CommonResult> getList(@Validated StoreOrderStatusSearchRequest request, + @Validated PageParamRequest pageParamRequest){ CommonPage storeOrderStatusCommonPage = CommonPage.restPage(storeOrderStatusService.getList(request, pageParamRequest)); return CommonResult.success(storeOrderStatusCommonPage); } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreProductController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreProductController.java index 80e43fcc..ccea77f7 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreProductController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreProductController.java @@ -1,15 +1,12 @@ package com.zbkj.admin.controller; +import com.zbkj.common.model.product.StoreProduct; import com.zbkj.common.page.CommonPage; -import com.zbkj.common.response.CommonResult; -import com.zbkj.common.request.PageParamRequest; -import com.zbkj.common.request.StoreCopyProductRequest; -import com.zbkj.common.request.StoreProductAddRequest; -import com.zbkj.common.request.StoreProductRequest; -import com.zbkj.common.request.StoreProductSearchRequest; +import com.zbkj.common.request.*; import com.zbkj.common.response.StoreProductInfoResponse; import com.zbkj.common.response.StoreProductResponse; import com.zbkj.common.response.StoreProductTabsHeader; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.StoreCartService; import com.zbkj.service.service.StoreProductService; import io.swagger.annotations.Api; @@ -34,7 +31,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -66,6 +63,13 @@ public class StoreProductController { return CommonResult.success(CommonPage.restPage(storeProductService.getAdminList(request, pageParamRequest))); } + @PreAuthorize("hasAuthority('admin:product:listbyids')") + @ApiOperation(value = "根据id集合获取商品列表") //配合swagger使用 + @RequestMapping(value = "/listids/{ids}", method = RequestMethod.GET) + public CommonResult> getListByIds(@PathVariable(value = "ids") List ids) { + return CommonResult.success(CommonPage.restPage(storeProductService.getListInIds(ids))); + } + /** * 新增商品 * @param request 新增参数 @@ -90,7 +94,7 @@ public class StoreProductController { @RequestMapping(value = "/delete/{id}", method = RequestMethod.GET) public CommonResult delete(@RequestBody @PathVariable Integer id, @RequestParam(value = "type", required = false, defaultValue = "recycle")String type) { if (storeProductService.deleteProduct(id, type)) { - if ("recycle".equals(type)) { + if (type.equals("recycle")) { storeCartService.productStatusNotEnable(id); } else { storeCartService.productDelete(id); @@ -148,8 +152,8 @@ public class StoreProductController { @PreAuthorize("hasAuthority('admin:product:tabs:headers')") @ApiOperation(value = "商品表头数量") @RequestMapping(value = "/tabs/headers", method = RequestMethod.GET) - public CommonResult> getTabsHeader() { - return CommonResult.success(storeProductService.getTabsHeader()); + public CommonResult> getTabsHeader(@Validated StoreProductHeaderRequest request) { + return CommonResult.success(storeProductService.getTabsHeader(request)); } @@ -211,6 +215,17 @@ public class StoreProductController { public CommonResult> copyProduct(@RequestBody @Valid StoreCopyProductRequest request) { return CommonResult.success(storeProductService.copyProduct(request.getUrl())); } + + @PreAuthorize("hasAuthority('admin:product:quick:stock:add')") + @ApiOperation(value = "快捷添加库存") + @RequestMapping(value = "/quick/stock/add", method = RequestMethod.POST) + public CommonResult quickAddStock(@RequestBody @Validated ProductAddStockRequest request) { + if (storeProductService.quickAddStock(request)) { + return CommonResult.success(); + } + return CommonResult.failed(); + } + } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreProductReplyController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreProductReplyController.java index 6f834950..2f01a70f 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreProductReplyController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreProductReplyController.java @@ -1,13 +1,13 @@ package com.zbkj.admin.controller; -import com.zbkj.common.page.CommonPage; -import com.zbkj.common.response.CommonResult; -import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.model.product.StoreProductReply; +import com.zbkj.common.page.CommonPage; +import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.StoreProductReplyAddRequest; import com.zbkj.common.request.StoreProductReplyCommentRequest; import com.zbkj.common.request.StoreProductReplySearchRequest; import com.zbkj.common.response.StoreProductReplyResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.StoreProductReplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -23,7 +23,7 @@ import org.springframework.web.bind.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相关版权 * +---------------------------------------------------------------------- @@ -47,8 +47,8 @@ public class StoreProductReplyController { @PreAuthorize("hasAuthority('admin:product:reply:list')") @ApiOperation(value = "分页列表") //配合swagger使用 @RequestMapping(value = "/list", method = RequestMethod.GET) - public CommonResult> getList(@Validated StoreProductReplySearchRequest request, - @Validated PageParamRequest pageParamRequest) { + public CommonResult> getList(@Validated StoreProductReplySearchRequest request, + @Validated PageParamRequest pageParamRequest) { CommonPage storeProductReplyCommonPage = CommonPage.restPage(storeProductReplyService.getList(request, pageParamRequest)); return CommonResult.success(storeProductReplyCommonPage); diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreProductRuleController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreProductRuleController.java index 64ed6fa2..851b0585 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreProductRuleController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreProductRuleController.java @@ -1,19 +1,19 @@ package com.zbkj.admin.controller; -import com.zbkj.common.page.CommonPage; -import com.zbkj.common.response.CommonResult; -import com.zbkj.common.request.PageParamRequest; -import com.zbkj.common.utils.CrmebUtil; import com.zbkj.common.model.product.StoreProductRule; +import com.zbkj.common.page.CommonPage; +import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.StoreProductRuleRequest; import com.zbkj.common.request.StoreProductRuleSearchRequest; +import com.zbkj.common.result.CommonResult; +import com.zbkj.common.utils.CrmebUtil; import com.zbkj.service.service.StoreProductRuleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; @@ -22,7 +22,7 @@ import org.springframework.web.bind.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相关版权 * +---------------------------------------------------------------------- @@ -46,7 +46,7 @@ public class StoreProductRuleController { @PreAuthorize("hasAuthority('admin:product:rule:list')") @ApiOperation(value = "分页列表") //配合swagger使用 @RequestMapping(value = "/list", method = RequestMethod.GET) - public CommonResult> getList( + public CommonResult> getList( @Validated StoreProductRuleSearchRequest request, @Validated PageParamRequest pageParamRequest) { CommonPage storeProductRuleCommonPage = CommonPage.restPage(storeProductRuleService.getList(request, pageParamRequest)); diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreSeckillController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreSeckillController.java index a76572d8..bc6ba719 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreSeckillController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreSeckillController.java @@ -1,12 +1,12 @@ package com.zbkj.admin.controller; import com.zbkj.common.page.CommonPage; -import com.zbkj.common.response.CommonResult; import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.StoreSeckillAddRequest; import com.zbkj.common.request.StoreSeckillSearchRequest; -import com.zbkj.common.response.StoreSeckillResponse; import com.zbkj.common.response.StoreProductInfoResponse; +import com.zbkj.common.response.StoreSeckillResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.StoreSeckillService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -22,7 +22,7 @@ import org.springframework.web.bind.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相关版权 * +---------------------------------------------------------------------- @@ -46,7 +46,7 @@ public class StoreSeckillController { @PreAuthorize("hasAuthority('admin:seckill:list')") @ApiOperation(value = "分页列表") //配合swagger使用 @RequestMapping(value = "/list", method = RequestMethod.GET) - public CommonResult> getList(@Validated StoreSeckillSearchRequest request, @Validated PageParamRequest pageParamRequest) { + public CommonResult> getList(@Validated StoreSeckillSearchRequest request, @Validated PageParamRequest pageParamRequest) { CommonPage storeSeckillCommonPage = CommonPage.restPage(storeSeckillService.getList(request, pageParamRequest)); return CommonResult.success(storeSeckillCommonPage); diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreSeckillMangerController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreSeckillMangerController.java index c6c82a73..50b9fb98 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreSeckillMangerController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreSeckillMangerController.java @@ -1,11 +1,11 @@ package com.zbkj.admin.controller; import com.zbkj.common.page.CommonPage; -import com.zbkj.common.response.CommonResult; import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.StoreSeckillMangerRequest; import com.zbkj.common.request.StoreSeckillMangerSearchRequest; import com.zbkj.common.response.StoreSeckillManagerResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.StoreSeckillMangerService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -23,7 +23,7 @@ import org.springframework.web.bind.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相关版权 * +---------------------------------------------------------------------- @@ -47,7 +47,7 @@ public class StoreSeckillMangerController { @PreAuthorize("hasAuthority('admin:seckill:manger:list')") @ApiOperation(value = "分页列表") //配合swagger使用 @RequestMapping(value = "/list", method = RequestMethod.GET) - public CommonResult> getList( + public CommonResult> getList( @Validated StoreSeckillMangerSearchRequest request, @Validated PageParamRequest pageParamRequest) { return CommonResult.success(CommonPage.restPage(storeSeckillMangerService.getList(request, pageParamRequest))); } @@ -117,9 +117,9 @@ public class StoreSeckillMangerController { @RequestMapping(value = "/update/status/{id}", method = RequestMethod.POST) @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "商品id", dataType = "int", required = true), - @ApiImplicitParam(name = "status", value = "状态", dataType = "boolean", required = true) + @ApiImplicitParam(name = "status", value = "状态", dataType = "string", required = true) }) - public CommonResult updateStatus(@PathVariable(value = "id") Integer id, Boolean status) { + public CommonResult updateStatus(@PathVariable(value = "id") Integer id, String status) { return CommonResult.success(storeSeckillMangerService.updateStatus(id,status)); } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemAdminController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemAdminController.java index 3d64714a..544009c5 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemAdminController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemAdminController.java @@ -6,8 +6,8 @@ import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.SystemAdminAddRequest; import com.zbkj.common.request.SystemAdminRequest; import com.zbkj.common.request.SystemAdminUpdateRequest; -import com.zbkj.common.response.CommonResult; import com.zbkj.common.response.SystemAdminResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.SystemAdminService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -25,7 +25,7 @@ import javax.validation.Valid; * +---------------------------------------------------------------------- * | 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,7 +64,7 @@ public class SystemAdminController { @RequestMapping(value = "/save", method = RequestMethod.POST) public CommonResult save(@RequestBody SystemAdminAddRequest systemAdminAddRequest) { if (systemAdminService.saveAdmin(systemAdminAddRequest)) { - return CommonResult.success("添加管理员成功"); + return CommonResult.success(); } return CommonResult.failed("添加管理员失败"); } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemAttachmentController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemAttachmentController.java index 5560634b..d2c248a3 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemAttachmentController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemAttachmentController.java @@ -1,12 +1,12 @@ package com.zbkj.admin.controller; -import com.zbkj.common.page.CommonPage; -import com.zbkj.common.response.CommonResult; -import com.zbkj.common.request.PageParamRequest; -import com.zbkj.common.utils.CrmebUtil; import com.zbkj.common.model.system.SystemAttachment; +import com.zbkj.common.page.CommonPage; +import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.SystemAttachmentMoveRequest; import com.zbkj.common.request.SystemAttachmentRequest; +import com.zbkj.common.result.CommonResult; +import com.zbkj.common.utils.CrmebUtil; import com.zbkj.service.service.SystemAttachmentService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -21,7 +21,7 @@ import org.springframework.web.bind.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相关版权 * +---------------------------------------------------------------------- @@ -44,7 +44,7 @@ public class SystemAttachmentController { @PreAuthorize("hasAuthority('admin:system:attachment:list')") @ApiOperation(value = "分页列表") //配合swagger使用 @RequestMapping(value = "/list", method = RequestMethod.GET) - public CommonResult> getList( + public CommonResult> getList( @RequestParam @Validated Integer pid, @RequestParam( value = "attType", diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemCityController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemCityController.java index eceee395..221749ce 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemCityController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemCityController.java @@ -3,7 +3,7 @@ package com.zbkj.admin.controller; import com.zbkj.common.model.system.SystemCity; import com.zbkj.common.request.SystemCityRequest; import com.zbkj.common.request.SystemCitySearchRequest; -import com.zbkj.common.response.CommonResult; +import com.zbkj.common.result.CommonResult; import com.zbkj.common.vo.SystemCityTreeVo; import com.zbkj.service.service.SystemCityService; import io.swagger.annotations.Api; @@ -25,7 +25,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemConfigController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemConfigController.java index c4403c0e..f1822edb 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemConfigController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemConfigController.java @@ -1,9 +1,10 @@ package com.zbkj.admin.controller; -import com.zbkj.common.response.CommonResult; import com.zbkj.common.model.system.SystemConfig; -import com.zbkj.common.request.SystemConfigAdminRequest; +import com.zbkj.common.request.SaveConfigRequest; import com.zbkj.common.request.SystemFormCheckRequest; +import com.zbkj.common.response.AdminSiteLogoResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.SystemConfigService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -14,7 +15,6 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.HashMap; -import java.util.List; /** @@ -22,7 +22,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相关版权 * +---------------------------------------------------------------------- @@ -38,87 +38,93 @@ public class SystemConfigController { @Autowired private SystemConfigService systemConfigService; - /** - * 查询配置表信息 - * @param formId Integer - */ @PreAuthorize("hasAuthority('admin:system:config:info')") - @ApiOperation(value = "详情") + @ApiOperation(value = "表单详情") @RequestMapping(value = "/info", method = RequestMethod.GET) public CommonResult> info(@RequestParam(value = "formId") Integer formId) { return CommonResult.success(systemConfigService.info(formId)); } - - /** - * 整体保存表单数据 - * @param systemFormCheckRequest SystemFormCheckRequest 新增参数 - */ @PreAuthorize("hasAuthority('admin:system:config:save:form')") @ApiOperation(value = "整体保存表单数据") @RequestMapping(value = "/save/form", method = RequestMethod.POST) public CommonResult saveFrom(@RequestBody @Validated SystemFormCheckRequest systemFormCheckRequest) { if (systemConfigService.saveForm(systemFormCheckRequest)) { - return CommonResult.success(); + return CommonResult.success("表单保存成功"); } - return CommonResult.failed(); + return CommonResult.failed("表单保存失败"); } - /** - * 检测表单name是否存在 - * @param name name - */ - @PreAuthorize("hasAuthority('admin:system:config:check')") - @ApiOperation(value = "检测表单name是否存在") - @RequestMapping(value = "/check", method = RequestMethod.GET) - public CommonResult check(@RequestParam String name) { - return CommonResult.success(systemConfigService.checkName(name)); + @PreAuthorize("hasAuthority('admin:system:config:upload:type')") + @ApiOperation(value = "获取文件存储类型") + @RequestMapping(value = "/get/upload/type", method = RequestMethod.GET) + public CommonResult getFileUploadType() { + return CommonResult.success(systemConfigService.getFileUploadType()); } - /** - * 配置表中仅仅存储对应的配置 - * @param key 配置表中的配置字段 - * @param value 对应的值 - */ - @PreAuthorize("hasAuthority('admin:system:config:saveuniq')") - @ApiOperation(value = "表单配置中仅仅存储") - @RequestMapping(value = "/saveuniq", method = RequestMethod.POST) - public CommonResult justSaveUniq(@RequestParam String key, @RequestParam String value) { - return CommonResult.success(systemConfigService.updateOrSaveValueByName(key, value)); +// @PreAuthorize("hasAuthority('admin:system:config:site:logo')") + @ApiOperation(value = "获取管理端logo") + @RequestMapping(value = "/get/site/logo", method = RequestMethod.GET) + public CommonResult getSiteLogo() { + return CommonResult.success(systemConfigService.getSiteLogo()); } - /** - * 根据key获取表单配置数据 - * @param key 配置表的的字段 - */ - @PreAuthorize("hasAuthority('admin:system:config:getuniq')") - @ApiOperation(value = "表单配置根据key获取") - @RequestMapping(value = "/getuniq", method = RequestMethod.GET) - public CommonResult justGetUniq(@RequestParam String key) { - return CommonResult.success(systemConfigService.getValueByKey(key),"success"); + @PreAuthorize("hasAuthority('admin:system:config:tx:map:key')") + @ApiOperation(value = "获取腾讯地图key") + @RequestMapping(value = "/get/tx/map/key", method = RequestMethod.GET) + public CommonResult getTxMapKey() { + return CommonResult.success(systemConfigService.getTxMapKey()); } - /** - * 根据key获取配置 - */ - @PreAuthorize("hasAuthority('admin:system:config:get')") - @ApiOperation(value = "根据key获取配置") - @RequestMapping(value = "/get", method = RequestMethod.GET) - public CommonResult> getByKey(@RequestParam String key) { - return CommonResult.success(systemConfigService.getListByKey(key)); + @PreAuthorize("hasAuthority('admin:system:config:home:page:list:style')") + @ApiOperation(value = "获取移动端首页列表样式") + @RequestMapping(value = "/get/home/page/list/style", method = RequestMethod.GET) + public CommonResult getHomePageSaleListStyle() { + return CommonResult.success(systemConfigService.getHomePageSaleListStyle()); } - /** - * 更新配置信息 - */ - @PreAuthorize("hasAuthority('admin:system:config:update')") - @ApiOperation(value = "更新配置信息") - @RequestMapping(value = "/update", method = RequestMethod.POST) - public CommonResult> getByKey(@RequestBody @Validated List requestList) { - if (systemConfigService.updateByList(requestList)) { - return CommonResult.success(); + @PreAuthorize("hasAuthority('admin:system:config:home:page:list:style:save')") + @ApiOperation(value = "保存移动端首页列表样式") + @RequestMapping(value = "/save/home/page/list/style", method = RequestMethod.POST) + public CommonResult saveHomePageSaleListStyle(@RequestBody SaveConfigRequest request) { + if (systemConfigService.saveHomePageSaleListStyle(request)) { + return CommonResult.success("保存成功"); } - return CommonResult.failed(); + return CommonResult.failed("保存失败"); + } + + @PreAuthorize("hasAuthority('admin:system:config:auth:host:get')") + @ApiOperation(value = "获取授权地址") + @RequestMapping(value = "/get/auth/host", method = RequestMethod.GET) + public CommonResult getAuthHost() { + return CommonResult.success(systemConfigService.getAuthHost()); + } + + @PreAuthorize("hasAuthority('admin:system:config:change:color:get')") + @ApiOperation(value = "获取主题色") + @RequestMapping(value = "/get/change/color", method = RequestMethod.GET) + public CommonResult getChangeColor() { + return CommonResult.success(systemConfigService.getChangeColor()); + } + + @PreAuthorize("hasAuthority('admin:system:config:change:color:save')") + @ApiOperation(value = "保存主题色") + @RequestMapping(value = "/save/change/color", method = RequestMethod.POST) + public CommonResult saveChangeColor(@RequestBody SaveConfigRequest request) { + if (systemConfigService.saveChangeColor(request)) { + return CommonResult.success("保存成功"); + } + return CommonResult.failed("保存失败"); + } + + @PreAuthorize("hasAuthority('admin:system:config:clear:cache')") + @ApiOperation(value = "清除config缓存") + @RequestMapping(value = "/clear/cache", method = RequestMethod.POST) + public CommonResult clearCache() { + if (systemConfigService.clearCache()) { + return CommonResult.success("清除成功"); + } + return CommonResult.failed("清除失败"); } } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemFormTempController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemFormTempController.java index e39d205f..cd603b31 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemFormTempController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemFormTempController.java @@ -1,11 +1,11 @@ package com.zbkj.admin.controller; -import com.zbkj.common.page.CommonPage; -import com.zbkj.common.response.CommonResult; -import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.model.system.SystemFormTemp; +import com.zbkj.common.page.CommonPage; +import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.SystemFormTempRequest; import com.zbkj.common.request.SystemFormTempSearchRequest; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.SystemFormTempService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -21,7 +21,7 @@ import org.springframework.web.bind.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相关版权 * +---------------------------------------------------------------------- @@ -45,7 +45,7 @@ public class SystemFormTempController { @PreAuthorize("hasAuthority('admin:system:form:list')") @ApiOperation(value = "分页列表") @RequestMapping(value = "/list", method = RequestMethod.GET) - public CommonResult> getList(@Validated SystemFormTempSearchRequest request, @Validated PageParamRequest pageParamRequest) { + public CommonResult> getList(@Validated SystemFormTempSearchRequest request, @Validated PageParamRequest pageParamRequest) { CommonPage systemFormTempCommonPage = CommonPage.restPage(systemFormTempService.getList(request, pageParamRequest)); return CommonResult.success(systemFormTempCommonPage); } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemGroupController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemGroupController.java index b1ac3139..c0f4eb23 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemGroupController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemGroupController.java @@ -1,19 +1,22 @@ package com.zbkj.admin.controller; +import com.zbkj.common.model.system.SystemGroup; import com.zbkj.common.page.CommonPage; -import com.zbkj.common.response.CommonResult; import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.SystemGroupRequest; import com.zbkj.common.request.SystemGroupSearchRequest; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.SystemGroupService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; -import com.zbkj.common.model.system.SystemGroup; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; /** @@ -21,7 +24,7 @@ import com.zbkj.common.model.system.SystemGroup; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -45,7 +48,7 @@ public class SystemGroupController { @PreAuthorize("hasAuthority('admin:system:group:list')") @ApiOperation(value = "分页列表") @RequestMapping(value = "/list", method = RequestMethod.GET) - public CommonResult> getList(@Validated SystemGroupSearchRequest request, @Validated PageParamRequest pageParamRequest) { + public CommonResult> getList(@Validated SystemGroupSearchRequest request, @Validated PageParamRequest pageParamRequest) { CommonPage systemGroupCommonPage = CommonPage.restPage(systemGroupService.getList(request, pageParamRequest)); return CommonResult.success(systemGroupCommonPage); } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemGroupDataController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemGroupDataController.java index 9de04c2f..9f7f5f30 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemGroupDataController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemGroupDataController.java @@ -1,11 +1,11 @@ package com.zbkj.admin.controller; -import com.zbkj.common.page.CommonPage; -import com.zbkj.common.response.CommonResult; -import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.model.system.SystemGroupData; +import com.zbkj.common.page.CommonPage; +import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.SystemGroupDataRequest; import com.zbkj.common.request.SystemGroupDataSearchRequest; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.SystemGroupDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -21,7 +21,7 @@ import org.springframework.web.bind.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相关版权 * +---------------------------------------------------------------------- @@ -45,7 +45,7 @@ public class SystemGroupDataController { @PreAuthorize("hasAuthority('admin:system:group:data:list')") @ApiOperation(value = "分页组合数据详情") @RequestMapping(value = "/list", method = RequestMethod.GET) - public CommonResult> getList(@Validated SystemGroupDataSearchRequest request, @Validated PageParamRequest pageParamRequest) { + public CommonResult> getList(@Validated SystemGroupDataSearchRequest request, @Validated PageParamRequest pageParamRequest) { CommonPage systemGroupDataCommonPage = CommonPage.restPage(systemGroupDataService.getList(request, pageParamRequest)); return CommonResult.success(systemGroupDataCommonPage); } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemMenuController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemMenuController.java index 0edab458..e01def88 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemMenuController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemMenuController.java @@ -1,9 +1,10 @@ package com.zbkj.admin.controller; -import com.zbkj.common.response.CommonResult; + import com.zbkj.common.model.system.SystemMenu; import com.zbkj.common.request.SystemMenuRequest; import com.zbkj.common.request.SystemMenuSearchRequest; +import com.zbkj.common.result.CommonResult; import com.zbkj.common.vo.MenuCheckVo; import com.zbkj.service.service.SystemMenuService; import io.swagger.annotations.Api; @@ -22,7 +23,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemNotificationController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemNotificationController.java index 90c1d573..10b257f1 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemNotificationController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemNotificationController.java @@ -4,8 +4,8 @@ import com.zbkj.common.model.system.SystemNotification; import com.zbkj.common.request.NotificationInfoRequest; import com.zbkj.common.request.NotificationSearchRequest; import com.zbkj.common.request.NotificationUpdateRequest; -import com.zbkj.common.response.CommonResult; import com.zbkj.common.response.NotificationInfoResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.SystemNotificationService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -22,7 +22,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemRoleController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemRoleController.java index 596cf951..ce26e628 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemRoleController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemRoleController.java @@ -5,8 +5,8 @@ import com.zbkj.common.page.CommonPage; import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.SystemRoleRequest; import com.zbkj.common.request.SystemRoleSearchRequest; -import com.zbkj.common.response.CommonResult; import com.zbkj.common.response.RoleInfoResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.SystemRoleService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -22,7 +22,7 @@ import org.springframework.web.bind.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemStoreController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemStoreController.java index bafdb470..99f60e23 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemStoreController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemStoreController.java @@ -1,11 +1,11 @@ package com.zbkj.admin.controller; -import com.zbkj.common.page.CommonPage; -import com.zbkj.common.response.CommonResult; -import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.model.system.SystemStore; +import com.zbkj.common.page.CommonPage; +import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.SystemStoreRequest; import com.zbkj.common.request.SystemStoreSearchRequest; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.SystemStoreService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -23,7 +23,7 @@ import java.util.HashMap; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -47,7 +47,7 @@ public class SystemStoreController { @PreAuthorize("hasAuthority('admin:system:store:list')") @ApiOperation(value = "门店自提分页列表") @RequestMapping(value = "/list", method = RequestMethod.GET) - public CommonResult> getList(@Validated SystemStoreSearchRequest request, @Validated PageParamRequest pageParamRequest) { + public CommonResult> getList(@Validated SystemStoreSearchRequest request, @Validated PageParamRequest pageParamRequest) { CommonPage expressCommonPage = CommonPage.restPage(systemStoreService.getList(request.getKeywords(), request.getStatus(), pageParamRequest)); return CommonResult.success(expressCommonPage); } @@ -58,8 +58,8 @@ public class SystemStoreController { @PreAuthorize("hasAuthority('admin:system:store:count')") @ApiOperation(value = "数量") @RequestMapping(value = "/getCount", method = RequestMethod.GET) - public CommonResult> getCount() { - return CommonResult.success(systemStoreService.getCount()); + public CommonResult> getCount( @RequestParam(value = "keywords", defaultValue = "") String keywords) { + return CommonResult.success(systemStoreService.getCount(keywords)); } /** diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemStoreStaffController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemStoreStaffController.java index 7323bd10..3e48d60f 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemStoreStaffController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemStoreStaffController.java @@ -1,11 +1,11 @@ package com.zbkj.admin.controller; -import com.zbkj.common.page.CommonPage; -import com.zbkj.common.response.CommonResult; -import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.model.system.SystemStoreStaff; +import com.zbkj.common.page.CommonPage; +import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.SystemStoreStaffRequest; import com.zbkj.common.response.SystemStoreStaffResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.SystemStoreStaffService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -20,7 +20,7 @@ import org.springframework.web.bind.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相关版权 * +---------------------------------------------------------------------- @@ -44,8 +44,8 @@ public class SystemStoreStaffController { @PreAuthorize("hasAuthority('admin:system:staff:list')") @ApiOperation(value = "分页列表") @RequestMapping(value = "/list", method = RequestMethod.GET) - public CommonResult> getList(@RequestParam(name = "storeId", required = false, defaultValue = "0") Integer storeId, - @ModelAttribute PageParamRequest pageParamRequest) { + public CommonResult> getList(@RequestParam(name = "storeId", required = false, defaultValue = "0") Integer storeId, + @ModelAttribute PageParamRequest pageParamRequest) { CommonPage systemStoreStaffCommonPage = CommonPage.restPage(systemStoreStaffService.getList(storeId, pageParamRequest)); return CommonResult.success(systemStoreStaffCommonPage); diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemUserLevelController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemUserLevelController.java index c1e31771..49d8a08c 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemUserLevelController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemUserLevelController.java @@ -1,9 +1,10 @@ package com.zbkj.admin.controller; -import com.zbkj.common.response.CommonResult; + import com.zbkj.common.model.system.SystemUserLevel; import com.zbkj.common.request.SystemUserLevelRequest; import com.zbkj.common.request.SystemUserLevelUpdateShowRequest; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.SystemUserLevelService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -21,7 +22,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemWriteOffOrderController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemWriteOffOrderController.java index 40109f6a..702ee3d5 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemWriteOffOrderController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemWriteOffOrderController.java @@ -2,8 +2,8 @@ package com.zbkj.admin.controller; import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.SystemWriteOffOrderSearchRequest; -import com.zbkj.common.response.CommonResult; import com.zbkj.common.response.SystemWriteOffOrderResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.StoreOrderService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -45,7 +45,7 @@ public class SystemWriteOffOrderController { @PreAuthorize("hasAuthority('admin:system:order:list')") @ApiOperation(value = "分页列表") //配合swagger使用 @RequestMapping(value = "/list", method = RequestMethod.POST) - public CommonResult getList( + public CommonResult getList( @Validated SystemWriteOffOrderSearchRequest request, @Validated PageParamRequest pageParamRequest) { return CommonResult.success(storeOrderService.getWriteOffList(request, pageParamRequest)); diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/TemplateMessageController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/TemplateMessageController.java index d6a330a4..eff634a5 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/TemplateMessageController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/TemplateMessageController.java @@ -1,6 +1,7 @@ package com.zbkj.admin.controller; -import com.zbkj.common.response.CommonResult; + +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.TemplateMessageService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -17,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UploadController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UploadController.java index 6d6a15ff..8ad305f2 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UploadController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UploadController.java @@ -1,6 +1,7 @@ package com.zbkj.admin.controller; -import com.zbkj.common.response.CommonResult; + +import com.zbkj.common.result.CommonResult; import com.zbkj.common.vo.FileResultVo; import com.zbkj.service.service.UploadService; import io.swagger.annotations.Api; @@ -9,7 +10,6 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; @@ -24,7 +24,7 @@ import java.io.IOException; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserController.java index 59c64346..f254469a 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserController.java @@ -1,12 +1,12 @@ package com.zbkj.admin.controller; +import com.zbkj.common.model.user.User; import com.zbkj.common.page.CommonPage; import com.zbkj.common.request.*; -import com.zbkj.common.response.CommonResult; -import com.zbkj.common.model.user.User; import com.zbkj.common.response.TopDetail; import com.zbkj.common.response.UserResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.UserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -29,7 +29,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserExtractController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserExtractController.java index 51200c63..b7d4d859 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserExtractController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserExtractController.java @@ -1,12 +1,12 @@ package com.zbkj.admin.controller; -import com.zbkj.common.page.CommonPage; -import com.zbkj.common.response.CommonResult; -import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.model.finance.UserExtract; +import com.zbkj.common.page.CommonPage; +import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.UserExtractRequest; import com.zbkj.common.request.UserExtractSearchRequest; import com.zbkj.common.response.BalanceResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.UserExtractService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController; * +---------------------------------------------------------------------- * | 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,7 +49,7 @@ public class UserExtractController { @PreAuthorize("hasAuthority('admin:finance:apply:list')") @ApiOperation(value = "分页列表") @RequestMapping(value = "/list", method = RequestMethod.GET) - public CommonResult> getList(@Validated UserExtractSearchRequest request, @Validated PageParamRequest pageParamRequest){ + public CommonResult> getList(@Validated UserExtractSearchRequest request, @Validated PageParamRequest pageParamRequest){ CommonPage userExtractCommonPage = CommonPage.restPage(userExtractService.getList(request, pageParamRequest)); return CommonResult.success(userExtractCommonPage); } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserGroupController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserGroupController.java index 720cfb19..b5b5910d 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserGroupController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserGroupController.java @@ -1,10 +1,10 @@ package com.zbkj.admin.controller; -import com.zbkj.common.page.CommonPage; -import com.zbkj.common.response.CommonResult; -import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.model.user.UserGroup; +import com.zbkj.common.page.CommonPage; +import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.UserGroupRequest; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.UserGroupService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -20,7 +20,7 @@ import org.springframework.web.bind.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相关版权 * +---------------------------------------------------------------------- @@ -43,7 +43,7 @@ public class UserGroupController { @PreAuthorize("hasAuthority('admin:user:group:list')") @ApiOperation(value = "分页列表") @RequestMapping(value = "/list", method = RequestMethod.GET) - public CommonResult> getList(@Validated PageParamRequest pageParamRequest) { + public CommonResult> getList(@Validated PageParamRequest pageParamRequest) { CommonPage userGroupCommonPage = CommonPage.restPage(userGroupService.getList(pageParamRequest)); return CommonResult.success(userGroupCommonPage); } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserIntegralController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserIntegralController.java index 24a025a5..95882080 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserIntegralController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserIntegralController.java @@ -1,10 +1,10 @@ package com.zbkj.admin.controller; import com.zbkj.common.page.CommonPage; -import com.zbkj.common.response.CommonResult; -import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.AdminIntegralSearchRequest; +import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.response.UserIntegralRecordResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.UserIntegralRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserLevelController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserLevelController.java index ca21b933..004ad655 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserLevelController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserLevelController.java @@ -1,9 +1,9 @@ package com.zbkj.admin.controller; -import com.zbkj.common.page.CommonPage; -import com.zbkj.common.response.CommonResult; -import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.model.user.UserLevel; +import com.zbkj.common.page.CommonPage; +import com.zbkj.common.request.PageParamRequest; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.UserLevelService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -44,7 +44,7 @@ public class UserLevelController { @PreAuthorize("hasAuthority('admin:user:level:list')") @ApiOperation(value = "分页列表") @RequestMapping(value = "/list", method = RequestMethod.GET) - public CommonResult> getList(@Validated PageParamRequest pageParamRequest) { + public CommonResult> getList(@Validated PageParamRequest pageParamRequest) { CommonPage userLevelCommonPage = CommonPage.restPage(userLevelService.getList(pageParamRequest)); return CommonResult.success(userLevelCommonPage); } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserRechargeController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserRechargeController.java index c3a02cf0..267f9a37 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserRechargeController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserRechargeController.java @@ -1,10 +1,10 @@ package com.zbkj.admin.controller; import com.zbkj.common.page.CommonPage; -import com.zbkj.common.response.CommonResult; import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.UserRechargeSearchRequest; import com.zbkj.common.response.UserRechargeResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.UserRechargeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -25,7 +25,7 @@ import java.util.HashMap; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserTagController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserTagController.java index dbdef5ed..d1a52c1e 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserTagController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserTagController.java @@ -1,18 +1,18 @@ package com.zbkj.admin.controller; +import com.zbkj.common.model.user.UserTag; import com.zbkj.common.page.CommonPage; -import com.zbkj.common.response.CommonResult; import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.UserTagRequest; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.UserTagService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; -import com.zbkj.common.model.user.UserTag; /** @@ -20,7 +20,7 @@ import com.zbkj.common.model.user.UserTag; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -43,7 +43,7 @@ public class UserTagController { @PreAuthorize("hasAuthority('admin:user:tag:list')") @ApiOperation(value = "分页列表") //配合swagger使用 @RequestMapping(value = "/list", method = RequestMethod.GET) - public CommonResult> getList(@Validated PageParamRequest pageParamRequest) { + public CommonResult> getList(@Validated PageParamRequest pageParamRequest) { CommonPage userTagCommonPage = CommonPage.restPage(userTagService.getList(pageParamRequest)); return CommonResult.success(userTagCommonPage); } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/ValidateCodeController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/ValidateCodeController.java deleted file mode 100644 index d73149b2..00000000 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/ValidateCodeController.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.zbkj.admin.controller; - -import com.zbkj.common.response.CommonResult; -import com.zbkj.admin.service.ValidateCodeService; -import com.zbkj.admin.vo.ValidateCode; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - - -/** - * 验证码服务 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - */ -@Slf4j -@RestController -@RequestMapping("api/admin/validate/code") -@Api(tags = "验证码服务") -public class ValidateCodeController { - - @Autowired - private ValidateCodeService validateCodeService; - - /** - * 获取图片验证码 - * @return CommonResult - */ -// @PreAuthorize("hasAuthority('admin:validate:code:get')") - @ApiOperation(value="获取验证码") - @GetMapping(value = "/get") - public CommonResult get() { - ValidateCode validateCode = validateCodeService.get(); - return CommonResult.success(validateCode); - } -} - - - diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/WeChatAdminController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/WeChatAdminController.java index 675ddc96..41eec9b5 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/WeChatAdminController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/WeChatAdminController.java @@ -1,7 +1,8 @@ package com.zbkj.admin.controller; -import com.zbkj.common.response.CommonResult; + import com.zbkj.common.response.WeChatJsSdkConfigResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.WechatNewService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -19,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/WeChatController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/WeChatController.java index 110b80d0..3bb109f7 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/WeChatController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/WeChatController.java @@ -1,7 +1,8 @@ package com.zbkj.admin.controller; import com.alibaba.fastjson.JSONObject; -import com.zbkj.common.response.CommonResult; +import com.zbkj.common.result.CommonResult; +import com.zbkj.service.service.WechatNewService; import com.zbkj.service.service.WechatPublicService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -18,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController; * +---------------------------------------------------------------------- * | 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,6 +34,8 @@ public class WeChatController { @Autowired private WechatPublicService wechatPublicService; + @Autowired + private WechatNewService wechatNewService; /** * 获取微信菜单 diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/WechatCallbackController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/WechatCallbackController.java index e3f7dfc6..cee1b066 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/WechatCallbackController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/WechatCallbackController.java @@ -17,7 +17,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/WechatMediaController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/WechatMediaController.java index 2fd95268..804c4f6f 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/WechatMediaController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/WechatMediaController.java @@ -1,6 +1,7 @@ package com.zbkj.admin.controller; -import com.zbkj.common.response.CommonResult; + +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.WechatMediaService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/WechatReplyController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/WechatReplyController.java index a328a4bb..39daa5ea 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/WechatReplyController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/WechatReplyController.java @@ -1,11 +1,11 @@ package com.zbkj.admin.controller; -import com.zbkj.common.page.CommonPage; -import com.zbkj.common.response.CommonResult; -import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.model.wechat.WechatReply; +import com.zbkj.common.page.CommonPage; +import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.WechatReplyRequest; import com.zbkj.common.request.WechatReplySearchRequest; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.WechatReplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -22,7 +22,7 @@ import org.springframework.web.bind.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相关版权 * +---------------------------------------------------------------------- @@ -46,7 +46,7 @@ public class WechatReplyController { @PreAuthorize("hasAuthority('admin:wechat:keywords:reply:list')") @ApiOperation(value = "分页列表") @RequestMapping(value = "/list", method = RequestMethod.GET) - public CommonResult> getList(@Validated WechatReplySearchRequest request, @Validated PageParamRequest pageParamRequest) { + public CommonResult> getList(@Validated WechatReplySearchRequest request, @Validated PageParamRequest pageParamRequest) { CommonPage wechatReplyCommonPage = CommonPage.restPage(wechatReplyService.getList(request, pageParamRequest)); return CommonResult.success(wechatReplyCommonPage); } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/YlyPrintController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/YlyPrintController.java index 0b8766da..ff8b192c 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/YlyPrintController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/YlyPrintController.java @@ -1,20 +1,24 @@ package com.zbkj.admin.controller; -import com.zbkj.common.response.CommonResult; + +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.YlyPrintService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; /** * 易联云打印订单 * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/filter/JwtAuthenticationTokenFilter.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/filter/JwtAuthenticationTokenFilter.java index d01d5e27..28e8964d 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/filter/JwtAuthenticationTokenFilter.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/filter/JwtAuthenticationTokenFilter.java @@ -15,17 +15,9 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; /** - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- * token过滤器 验证token有效性 */ +//@Component public class JwtAuthenticationTokenFilter extends OncePerRequestFilter { @Resource diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/filter/ResponseFilter.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/filter/ResponseFilter.java index ec55522e..a9808ea8 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/filter/ResponseFilter.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/filter/ResponseFilter.java @@ -1,7 +1,11 @@ package com.zbkj.admin.filter; +import com.zbkj.common.config.CrmebConfig; import com.zbkj.common.utils.RequestUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpMethod; +import org.springframework.security.web.FilterInvocation; import javax.servlet.*; import javax.servlet.http.HttpServletRequest; @@ -14,7 +18,7 @@ import java.nio.charset.StandardCharsets; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -25,20 +29,32 @@ import java.nio.charset.StandardCharsets; //@Component public class ResponseFilter implements Filter { + + @Autowired + CrmebConfig crmebConfig; + @Override - public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) + public void doFilter(ServletRequest servletRequest, ServletResponse response, FilterChain filterChain) throws IOException, ServletException { ResponseWrapper wrapperResponse = new ResponseWrapper((HttpServletResponse) response);//转换成代理类 + FilterInvocation fi = new FilterInvocation(servletRequest, wrapperResponse, filterChain); + HttpServletRequest request = (HttpServletRequest) servletRequest; + + //OPTIONS请求直接放行 + if(request.getMethod().equals(HttpMethod.OPTIONS.toString())){ + fi.getChain().doFilter(fi.getRequest(), fi.getResponse()); + return; + } // 这里只拦截返回，直接让请求过去，如果在请求前有处理，可以在这里处理 - filterChain.doFilter(request, wrapperResponse); + filterChain.doFilter(servletRequest, wrapperResponse); byte[] content = wrapperResponse.getContent();//获取返回值 //判断是否有值 if (content.length > 0) { String str = new String(content, StandardCharsets.UTF_8); try { - HttpServletRequest req = (HttpServletRequest) request; - str = new ResponseRouter().filter(str, RequestUtil.getUri(req)); + HttpServletRequest req = (HttpServletRequest) servletRequest; + str = new ResponseRouter().filter(str, RequestUtil.getUri(req), crmebConfig); } catch (Exception e) { e.printStackTrace(); } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/filter/ResponseRouter.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/filter/ResponseRouter.java index 0438a684..d8afefc0 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/filter/ResponseRouter.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/filter/ResponseRouter.java @@ -1,15 +1,18 @@ package com.zbkj.admin.filter; -import com.zbkj.common.constants.Constants; +import com.zbkj.common.config.CrmebConfig; +import com.zbkj.common.constants.UploadConstants; import com.zbkj.common.utils.SpringUtil; import com.zbkj.service.service.SystemAttachmentService; +import org.springframework.util.AntPathMatcher; +import org.springframework.util.PathMatcher; /** * response路径处理 * +---------------------------------------------------------------------- * | 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,24 +21,35 @@ import com.zbkj.service.service.SystemAttachmentService; */ public class ResponseRouter { - public String filter(String data, String path) { + public String filter(String data, String path, CrmebConfig crmebConfig) { boolean result = un().contains(path); if (result) { return data; } -// if (!path.contains("api/admin/") && !path.contains("api/front/")) { -// return data; -// } - - //根据需要处理返回值 - if (data.contains(Constants.UPLOAD_TYPE_IMAGE+"/") && !data.contains("data:image/png;base64")) { - data = SpringUtil.getBean(SystemAttachmentService.class).prefixImage(data); + //系统不用过滤的URL，针对数据而非token + PathMatcher pathMatcher = new AntPathMatcher(); + for (String configUrl : crmebConfig.getIgnored()) { + if(pathMatcher.match(path, configUrl)){ + return data; + } } -// if (data.contains("file/")) { 附件也走crmebimage 目录下 -// data = SpringUtil.getBean(SystemAttachmentService.class).prefixFile(data); -// } + if (!path.contains("api/admin/") && !path.contains("api/front/")) { + return data; + } + + //根据需要处理返回值 && !data.contains("data:image/png;base64") + if ((data.contains(UploadConstants.UPLOAD_FILE_KEYWORD + "/")) + || data.contains(UploadConstants.DOWNLOAD_FILE_KEYWORD) || data.contains(UploadConstants.UPLOAD_AFTER_FILE_KEYWORD)) { + if (data.contains(UploadConstants.DOWNLOAD_FILE_KEYWORD + "/" + UploadConstants.UPLOAD_MODEL_PATH_EXCEL)) { + data = SpringUtil.getBean(SystemAttachmentService.class).prefixFile(data); + } else if (data.contains(UploadConstants.UPLOAD_AFTER_FILE_KEYWORD + "/")) { + data = SpringUtil.getBean(SystemAttachmentService.class).prefixUploadf(data); + } else { + data = SpringUtil.getBean(SystemAttachmentService.class).prefixImage(data); + } + } return data; } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/filter/ResponseWrapper.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/filter/ResponseWrapper.java index 358c0274..83321b0c 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/filter/ResponseWrapper.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/filter/ResponseWrapper.java @@ -1,19 +1,20 @@ package com.zbkj.admin.filter; +import java.io.ByteArrayOutputStream; +import java.io.IOException; + import javax.servlet.ServletOutputStream; import javax.servlet.WriteListener; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponseWrapper; -import java.io.ByteArrayOutputStream; -import java.io.IOException; /** * Response包装类 * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/filter/TokenComponent.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/filter/TokenComponent.java index 7dfb0202..0e7f90e1 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/filter/TokenComponent.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/filter/TokenComponent.java @@ -17,7 +17,7 @@ import java.util.concurrent.TimeUnit; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/manager/AuthenticationEntryPointImpl.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/manager/AuthenticationEntryPointImpl.java index 0e87d1d6..e2848f2e 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/manager/AuthenticationEntryPointImpl.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/manager/AuthenticationEntryPointImpl.java @@ -1,7 +1,8 @@ package com.zbkj.admin.manager; import com.alibaba.fastjson.JSONObject; -import com.zbkj.common.response.CommonResult; +import com.zbkj.common.result.CommonResult; +import com.zbkj.common.result.CommonResultCode; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.stereotype.Component; @@ -26,7 +27,7 @@ public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint, S httpServletResponse.setContentType("application/json"); httpServletResponse.setCharacterEncoding("utf-8"); try { - httpServletResponse.getWriter().print(JSONObject.toJSONString(CommonResult.unauthorized())); + httpServletResponse.getWriter().print(JSONObject.toJSONString(CommonResult.failed(CommonResultCode.UNAUTHORIZED))); } catch (IOException ioException) { ioException.printStackTrace(); } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/manager/CustomAccessDeniedHandler.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/manager/CustomAccessDeniedHandler.java index 162985ec..4632819d 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/manager/CustomAccessDeniedHandler.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/manager/CustomAccessDeniedHandler.java @@ -1,7 +1,9 @@ package com.zbkj.admin.manager; import com.alibaba.fastjson.JSONObject; -import com.zbkj.common.response.CommonResult; + +import com.zbkj.common.result.CommonResult; +import com.zbkj.common.result.CommonResultCode; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.web.access.AccessDeniedHandler; import org.springframework.stereotype.Component; @@ -30,7 +32,7 @@ public class CustomAccessDeniedHandler implements AccessDeniedHandler, Serializa httpServletResponse.setContentType("application/json"); httpServletResponse.setCharacterEncoding("utf-8"); try { - httpServletResponse.getWriter().print(JSONObject.toJSONString(CommonResult.forbidden())); + httpServletResponse.getWriter().print(JSONObject.toJSONString(CommonResult.failed(CommonResultCode.FORBIDDEN))); } catch (IOException ioException) { ioException.printStackTrace(); } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/pub/GetJSConfig.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/pub/GetJSConfig.java index d6a3cb99..a3b68b6d 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/pub/GetJSConfig.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/pub/GetJSConfig.java @@ -1,6 +1,7 @@ package com.zbkj.admin.pub; import com.zbkj.common.constants.Constants; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.SystemConfigService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -31,4 +32,16 @@ public class GetJSConfig { public String set(){ return systemConfigService.getValueByKey(Constants.JS_CONFIG_CRMEB_CHAT_TONGJI); } + + @ApiOperation(value = "获取移动端域名") + @RequestMapping(value = "/get/front/domain", method = RequestMethod.GET) + public CommonResult getFrontDomain() { + return CommonResult.success(systemConfigService.getFrontDomain()); + } + + @ApiOperation(value = "获取平台当前的素材地址") + @RequestMapping(value = "/get/admin/mediadomain", method = RequestMethod.GET) + public CommonResult getMediaDomain() { + return CommonResult.success(systemConfigService.getMediaDomain()); + } } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/pub/ImageMergeController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/pub/ImageMergeController.java deleted file mode 100644 index 8eb02b10..00000000 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/pub/ImageMergeController.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.zbkj.admin.pub; - -import com.zbkj.common.response.CommonResult; -import com.zbkj.common.utils.ImageMergeUtil; -import com.zbkj.common.vo.ImageMergeUtilVo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * 图片操作 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - */ -@Slf4j -@RestController -@RequestMapping("api/public/qrcode") -@Api(tags = "图片操作") -public class ImageMergeController { - - @PreAuthorize("hasAuthority('public:qrcode:merge:list')") - @ApiOperation(value = "合并图片返回文件") - @RequestMapping(value = "/mergeList", method = RequestMethod.POST) - public CommonResult> mergeList(@RequestBody @Validated List list){ - Map map = new HashMap<>(); - map.put("base64Code", ImageMergeUtil.drawWordFile(list)); //需要云服务域名，如果需要存入数据库参照上传图片服务 - return CommonResult.success(map); - } -} diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/pub/WeChatMessageController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/pub/WeChatMessageController.java index 620c76c2..ce0b194c 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/pub/WeChatMessageController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/pub/WeChatMessageController.java @@ -21,7 +21,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/pub/WeChatPushController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/pub/WeChatPushController.java index 96cb651b..43d6943f 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/pub/WeChatPushController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/pub/WeChatPushController.java @@ -1,7 +1,7 @@ package com.zbkj.admin.pub; import com.alibaba.fastjson.JSONObject; -import com.zbkj.common.response.CommonResult; +import com.zbkj.common.result.CommonResult; import com.zbkj.common.utils.RestTemplateUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -21,7 +21,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/service/AdminLoginService.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/service/AdminLoginService.java index c01ce38f..2ea71e05 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/service/AdminLoginService.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/service/AdminLoginService.java @@ -1,5 +1,7 @@ package com.zbkj.admin.service; +import com.zbkj.common.request.LoginAdminUpdatePasswordRequest; +import com.zbkj.common.request.LoginAdminUpdateRequest; import com.zbkj.common.request.SystemAdminLoginRequest; import com.zbkj.common.response.MenusResponse; import com.zbkj.common.response.SystemAdminResponse; @@ -13,7 +15,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -48,4 +50,25 @@ public interface AdminLoginService { * 根据Token获取对应用户信息 */ SystemAdminResponse getInfoByToken(); + + /** + * 账号登录检测 + * @param account 账号 + * @return 账号错误登录次数 + */ + Integer accountDetection(String account); + + /** + * 修改登录用户信息 + * + * @param request 请求参数 + * @return Boolean + */ + Boolean loginAdminUpdate(LoginAdminUpdateRequest request); + + + /** + * 修改登录用户密码 + */ + Boolean loginAdminUpdatePwd(LoginAdminUpdatePasswordRequest request); } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/service/ValidateCodeService.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/service/ValidateCodeService.java deleted file mode 100644 index f50df75c..00000000 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/service/ValidateCodeService.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.zbkj.admin.service; - - -import com.zbkj.admin.vo.ValidateCode; - -import java.util.HashMap; - -/** - * ValidateCodeService 接口 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - */ -public interface ValidateCodeService { - - /** - * 获取图片验证码 - * @return CommonResult - */ - ValidateCode get(); - - /** - * 验证验证码 - */ - Boolean check(String key, String code); -} diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/service/WeChatMessageService.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/service/WeChatMessageService.java index 55fae157..7e07a266 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/service/WeChatMessageService.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/service/WeChatMessageService.java @@ -7,7 +7,7 @@ import javax.servlet.http.HttpServletRequest; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/service/impl/AdminLoginServiceImpl.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/service/impl/AdminLoginServiceImpl.java index 58ba227a..929353ef 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/service/impl/AdminLoginServiceImpl.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/service/impl/AdminLoginServiceImpl.java @@ -1,28 +1,35 @@ package com.zbkj.admin.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.anji.captcha.model.common.ResponseModel; import com.zbkj.admin.filter.TokenComponent; import com.zbkj.admin.service.AdminLoginService; -import com.zbkj.admin.service.ValidateCodeService; +import com.zbkj.common.constants.Constants; import com.zbkj.common.constants.SysConfigConstants; import com.zbkj.common.constants.SysGroupDataConstants; import com.zbkj.common.exception.CrmebException; import com.zbkj.common.model.system.SystemAdmin; import com.zbkj.common.model.system.SystemMenu; import com.zbkj.common.model.system.SystemPermissions; +import com.zbkj.common.request.LoginAdminUpdatePasswordRequest; +import com.zbkj.common.request.LoginAdminUpdateRequest; import com.zbkj.common.request.SystemAdminLoginRequest; import com.zbkj.common.response.MenusResponse; import com.zbkj.common.response.SystemAdminResponse; import com.zbkj.common.response.SystemGroupDataAdminLoginBannerResponse; import com.zbkj.common.response.SystemLoginResponse; +import com.zbkj.common.result.CommonResultCode; +import com.zbkj.common.utils.CrmebUtil; +import com.zbkj.common.utils.RedisUtil; import com.zbkj.common.utils.SecurityUtil; import com.zbkj.common.vo.LoginUserVo; import com.zbkj.common.vo.MenuTree; -import com.zbkj.service.service.SystemAdminService; -import com.zbkj.service.service.SystemConfigService; -import com.zbkj.service.service.SystemGroupDataService; -import com.zbkj.service.service.SystemMenuService; +import com.zbkj.service.service.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.AuthenticationManager; @@ -44,7 +51,7 @@ import java.util.stream.Stream; * +---------------------------------------------------------------------- * | 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,6 +60,7 @@ import java.util.stream.Stream; */ @Service public class AdminLoginServiceImpl implements AdminLoginService { + private final Logger logger = LoggerFactory.getLogger(getClass()); @Resource private TokenComponent tokenComponent; @@ -63,9 +71,6 @@ public class AdminLoginServiceImpl implements AdminLoginService { @Autowired private SystemAdminService systemAdminService; - @Autowired - private ValidateCodeService validateCodeService; - @Autowired private SystemConfigService systemConfigService; @@ -75,24 +80,44 @@ public class AdminLoginServiceImpl implements AdminLoginService { @Autowired private SystemMenuService systemMenuService; + @Autowired + private RedisUtil redisUtil; + + @Autowired + private SafetyService safetyService; /** * PC登录 */ @Override public SystemLoginResponse login(SystemAdminLoginRequest systemAdminLoginRequest, String ip) { - // 判断验证码 - boolean codeCheckResult = validateCodeService.check(systemAdminLoginRequest.getKey(), systemAdminLoginRequest.getCode()); - if (!codeCheckResult) throw new CrmebException("验证码不正确"); + Integer errorNum = accountDetection(systemAdminLoginRequest.getAccount()); + if (errorNum > 3) { + if (ObjectUtil.isNull(systemAdminLoginRequest.getCaptchaVO())) { + throw new CrmebException("验证码信息不存在"); + } + // 校验验证码 + ResponseModel responseModel = safetyService.verifySafetyCode(systemAdminLoginRequest.getCaptchaVO()); + if (!responseModel.getRepCode().equals("0000")) { + logger.error("验证码登录失败，repCode = {}, repMsg = {}", responseModel.getRepCode(), responseModel.getRepMsg()); + accountErrorNumAdd(systemAdminLoginRequest.getAccount()); + throw new CrmebException("验证码校验失败"); + } + } // 用户验证 Authentication authentication = null; // 该方法会去调用UserDetailsServiceImpl.loadUserByUsername try { +// CusAuthenticationManager authenticationManager = new CusAuthenticationManager(new CustomAuthenticationProvider()); authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(systemAdminLoginRequest.getAccount(), systemAdminLoginRequest.getPwd())); } catch (AuthenticationException e) { + accountErrorNumAdd(systemAdminLoginRequest.getAccount()); if (e instanceof BadCredentialsException) { throw new CrmebException("用户不存在或密码错误"); } throw new CrmebException(e.getMessage()); + }catch (CrmebException e){ + accountErrorNumAdd(systemAdminLoginRequest.getAccount()); + throw new CrmebException("账号或密码不正确"); } LoginUserVo loginUser = (LoginUserVo) authentication.getPrincipal(); SystemAdmin systemAdmin = loginUser.getUser(); @@ -103,12 +128,15 @@ public class AdminLoginServiceImpl implements AdminLoginService { BeanUtils.copyProperties(systemAdmin, systemAdminResponse); //更新最后登录信息 + systemAdmin.setUpdateTime(DateUtil.date()); systemAdmin.setLoginCount(systemAdmin.getLoginCount() + 1); systemAdmin.setLastIp(ip); systemAdminService.updateById(systemAdmin); + accountErrorNumClear(systemAdminLoginRequest.getAccount()); return systemAdminResponse; } + /** * 用户登出 */ @@ -124,6 +152,7 @@ public class AdminLoginServiceImpl implements AdminLoginService { /** * 获取登录页图片 + * * @return Map */ @Override @@ -137,11 +166,14 @@ public class AdminLoginServiceImpl implements AdminLoginService { //轮播图 List bannerList = systemGroupDataService.getListByGid(SysGroupDataConstants.GROUP_DATA_ID_ADMIN_LOGIN_BANNER_IMAGE_LIST, SystemGroupDataAdminLoginBannerResponse.class); map.put("banner", bannerList); + + map.put("siteName", systemConfigService.getValueByKey(SysConfigConstants.CONFIG_KEY_SITE_NAME)); return map; } /** * 获取管理员可访问目录 + * * @return List */ @Override @@ -184,4 +216,64 @@ public class AdminLoginServiceImpl implements AdminLoginService { systemAdminResponse.setPermissionsList(permList); return systemAdminResponse; } + + @Override + public Integer accountDetection(String account) { + SystemAdmin admin = systemAdminService.selectUserByUserName(account); + if (ObjectUtil.isNull(admin)) { + return 0; + } + String key = StrUtil.format(Constants.ADMIN_ACCOUNT_LOGIN_ERROR_NUM_KEY, account); + if (!redisUtil.exists(key)) { + return 0; + } + Integer num = redisUtil.get(key); + return num; + } + + /** + * 修改登录用户信息 + * + * @param request 请求参数 + * @return Boolean + */ + @Override + public Boolean loginAdminUpdate(LoginAdminUpdateRequest request) { + SystemAdmin admin = SecurityUtil.getLoginUserVo().getUser(); + SystemAdmin systemAdmin = new SystemAdmin(); + systemAdmin.setId(admin.getId()); + systemAdmin.setRealName(request.getRealName()); + systemAdmin.setUpdateTime(DateUtil.date()); + return systemAdminService.updateById(systemAdmin); + } + + /** + * 修改登录用户密码 + */ + @Override + public Boolean loginAdminUpdatePwd(LoginAdminUpdatePasswordRequest request) { + SystemAdmin admin = SecurityUtil.getLoginUserVo().getUser(); + SystemAdmin systemAdmin = systemAdminService.getById(admin.getId()); + String encryptPassword = CrmebUtil.encryptPassword(request.getOldPassword(), systemAdmin.getAccount()); + if (!systemAdmin.getPwd().equals(encryptPassword)) { + throw new CrmebException(CommonResultCode.VALIDATE_FAILED, "原密码不正确"); + } + SystemAdmin newAdmin = new SystemAdmin(); + newAdmin.setId(admin.getId()); + String pwd = CrmebUtil.encryptPassword(request.getPassword(), admin.getAccount()); + newAdmin.setPwd(pwd); + newAdmin.setUpdateTime(DateUtil.date()); + return systemAdminService.updateById(newAdmin); + } + + private void accountErrorNumAdd(String account) { + redisUtil.incr(StrUtil.format(Constants.ADMIN_ACCOUNT_LOGIN_ERROR_NUM_KEY, account), 1); + } + + private void accountErrorNumClear(String account) { + String key = StrUtil.format(Constants.ADMIN_ACCOUNT_LOGIN_ERROR_NUM_KEY, account); + if (redisUtil.exists(key)) { + redisUtil.delete(StrUtil.format(Constants.ADMIN_ACCOUNT_LOGIN_ERROR_NUM_KEY, account)); + } + } } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/service/impl/ValidateCodeServiceImpl.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/service/impl/ValidateCodeServiceImpl.java deleted file mode 100644 index 156f9154..00000000 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/service/impl/ValidateCodeServiceImpl.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.zbkj.admin.service.impl; - -import cn.hutool.core.util.ObjectUtil; -import com.zbkj.common.constants.Constants; -import com.zbkj.common.exception.CrmebException; -import com.zbkj.common.utils.CrmebUtil; -import com.zbkj.common.utils.RedisUtil; -import com.zbkj.common.utils.ValidateCodeUtil; -import com.zbkj.admin.service.ValidateCodeService; -import com.zbkj.admin.vo.ValidateCode; -import org.apache.commons.codec.digest.DigestUtils; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.concurrent.TimeUnit; - -/** - * ValidateCodeService 实现类 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - */ -@Service -public class ValidateCodeServiceImpl implements ValidateCodeService { - - @Resource - private RedisUtil redisAdminUtil; - - /** - * 获取验证码信息 - */ - @Override - public ValidateCode get() { - ValidateCodeUtil.Validate randomCode = ValidateCodeUtil.getRandomCode();//直接调用静态方法，返回验证码对象 - if (ObjectUtil.isNull(randomCode)) { - return null; - } - - String value = randomCode.getValue().toLowerCase(); - String md5Key = DigestUtils.md5Hex(value); - String redisKey = getRedisKey(md5Key); - redisAdminUtil.set(redisKey, value, 5L, TimeUnit.MINUTES); //5分钟过期 - String base64Str = randomCode.getBase64Str(); - return new ValidateCode(md5Key, CrmebUtil.getBase64Image(base64Str)); - } - - /** - * 获取redis key - * @param md5Key value的md5加密值 - */ - public String getRedisKey(String md5Key) { - return Constants.VALIDATE_REDIS_KEY_PREFIX + md5Key; - } - - /** - * 验证 - */ - public Boolean check(String key, String code) { - if (!redisAdminUtil.exists(getRedisKey(key))) { - throw new CrmebException("验证码错误"); - } - Object redisValue = redisAdminUtil.get(getRedisKey(key)); - if (ObjectUtil.isNull(redisValue)) { - return false; - } - return redisValue.equals(code.toLowerCase()); - } -} - diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/service/impl/WeChatMessageServiceImpl.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/service/impl/WeChatMessageServiceImpl.java index d3cb9dfa..be2e8bfd 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/service/impl/WeChatMessageServiceImpl.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/service/impl/WeChatMessageServiceImpl.java @@ -2,7 +2,7 @@ package com.zbkj.admin.service.impl; import com.alibaba.fastjson.JSONObject; import com.zbkj.common.constants.WeChatConstants; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.common.utils.RedisUtil; import com.zbkj.common.utils.XmlUtil; import com.zbkj.common.model.article.Article; @@ -29,7 +29,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -157,7 +157,7 @@ public class WeChatMessageServiceImpl implements WeChatMessageService { return "\n" + " \n" + " \n" + - " "+ DateUtil.getNowTime() +"\n" + + " "+ CrmebDateUtil.getNowTime() +"\n" + " \n" + " 1\n" + " \n" + diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/bargain/BargainStopChangeTask.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/bargain/BargainStopChangeTask.java index 9c92cc17..c4b722d1 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/bargain/BargainStopChangeTask.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/bargain/BargainStopChangeTask.java @@ -1,13 +1,10 @@ package com.zbkj.admin.task.bargain; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.service.service.StoreBargainService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; -import org.springframework.scheduling.annotation.EnableScheduling; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; /** @@ -15,16 +12,14 @@ import org.springframework.stereotype.Component; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- * | Author: CRMEB Team * +---------------------------------------------------------------------- */ -@Component -@Configuration //读取配置 -@EnableScheduling // 2.开启定时任务 +@Component("BargainStopChangeTask") public class BargainStopChangeTask { //日志 @@ -33,16 +28,18 @@ public class BargainStopChangeTask { @Autowired private StoreBargainService storeBargainService; - @Scheduled(cron = "0 0 0 */1 * ?") //5秒钟同步一次数据 - public void init(){ - logger.info("---BargainStopChangeTask------bargain stop status change task: Execution Time - {}", DateUtil.nowDateTime()); + /** + * 每天0点执行 + */ + public void bargainStopChange() { + // cron : 0 0 0 */1 * ? + logger.info("---BargainStopChangeTask------bargain stop status change task: Execution Time - {}", CrmebDateUtil.nowDateTime()); try { storeBargainService.stopAfterChange(); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); logger.error("BargainStopChangeTask" + " | msg : " + e.getMessage()); } - } } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/brokerage/BrokerageFrozenTask.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/brokerage/BrokerageFrozenTask.java index 85cfb5a3..4a87d897 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/brokerage/BrokerageFrozenTask.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/brokerage/BrokerageFrozenTask.java @@ -2,14 +2,11 @@ package com.zbkj.admin.task.brokerage; import com.zbkj.admin.task.order.OrderReceiptTask; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.service.service.UserBrokerageRecordService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; -import org.springframework.scheduling.annotation.EnableScheduling; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; /** @@ -17,16 +14,14 @@ import org.springframework.stereotype.Component; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- * | Author: CRMEB Team * +---------------------------------------------------------------------- */ -@Component -@Configuration //读取配置 -@EnableScheduling // 2.开启定时任务 +@Component("BrokerageFrozenTask") public class BrokerageFrozenTask { //日志 @@ -35,10 +30,12 @@ public class BrokerageFrozenTask { @Autowired private UserBrokerageRecordService userBrokerageRecordService; - // @Scheduled(fixedDelay = 1000 * 60 * 60L) //1小时同步一次数据 - @Scheduled(fixedDelay = 1000 * 60L) //1分钟同步一次数据 - public void init(){ - logger.info("---BrokerageFrozenTask task------produce Data with fixed rate task: Execution Time - {}", DateUtil.nowDateTime()); + /** + * 1小时同步一次数据 + */ + public void brokerageFrozen() { + // cron : 0 0 */1 * * ? + logger.info("---BrokerageFrozenTask task------produce Data with fixed rate task: Execution Time - {}", CrmebDateUtil.nowDateTime()); try { userBrokerageRecordService.brokerageThaw(); @@ -46,6 +43,5 @@ public class BrokerageFrozenTask { e.printStackTrace(); logger.error("BrokerageFrozenTask.task" + " | msg : " + e.getMessage()); } - } } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/coupon/CouponOverdueTask.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/coupon/CouponOverdueTask.java index 53ee566d..b92a17db 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/coupon/CouponOverdueTask.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/coupon/CouponOverdueTask.java @@ -1,13 +1,10 @@ package com.zbkj.admin.task.coupon; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.service.service.StoreCouponUserService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; -import org.springframework.scheduling.annotation.EnableScheduling; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; /** @@ -15,16 +12,14 @@ import org.springframework.stereotype.Component; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- * | Author: CRMEB Team * +---------------------------------------------------------------------- */ -@Component -@Configuration //读取配置 -@EnableScheduling // 2.开启定时任务 +@Component("CouponOverdueTask") public class CouponOverdueTask { //日志 @@ -33,16 +28,18 @@ public class CouponOverdueTask { @Autowired private StoreCouponUserService couponUserService; - @Scheduled(fixedDelay = 1000 * 60L) //1分钟同步一次数据 - public void init(){ - logger.info("---CouponOverdueTask task------produce Data with fixed rate task: Execution Time - {}", DateUtil.nowDateTime()); + /** + * 1分钟同步一次数据 + */ + public void couponOverdue() { + // cron : 0 */1 * * * ? + logger.info("---CouponOverdueTask task------produce Data with fixed rate task: Execution Time - {}", CrmebDateUtil.nowDateTime()); try { couponUserService.overdueTask(); } catch (Exception e) { e.printStackTrace(); logger.error("CouponOverdueTask.task" + " | msg : " + e.getMessage()); } - } } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/integral/IntegralFrozenTask.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/integral/IntegralFrozenTask.java index 72c614c8..3a95ca10 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/integral/IntegralFrozenTask.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/integral/IntegralFrozenTask.java @@ -1,14 +1,11 @@ package com.zbkj.admin.task.integral; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.service.service.UserIntegralRecordService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; -import org.springframework.scheduling.annotation.EnableScheduling; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; /** @@ -16,16 +13,14 @@ import org.springframework.stereotype.Component; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- * | Author: CRMEB Team * +---------------------------------------------------------------------- */ -@Component -@Configuration //读取配置 -@EnableScheduling // 2.开启定时任务 +@Component("IntegralFrozenTask") public class IntegralFrozenTask { //日志 @@ -34,15 +29,18 @@ public class IntegralFrozenTask { @Autowired private UserIntegralRecordService userIntegralRecordService; - @Scheduled(fixedDelay = 1000 * 60L) //1分钟同步一次数据 - public void init() { - logger.info("---IntegralFrozenTask task------produce Data with fixed rate task: Execution Time - {}", DateUtil.nowDateTime()); + /** + * 1分钟同步一次数据 + */ + public void integralFrozen() { + // cron : 0 */1 * * * ? + logger.info("---IntegralFrozenTask task------produce Data with fixed rate task: Execution Time - {}", CrmebDateUtil.nowDateTime()); try { userIntegralRecordService.integralThaw(); } catch (Exception e) { e.printStackTrace(); logger.error("IntegralFrozenTask.task" + " | msg : " + e.getMessage()); } - } + } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/log/AutoDeleteLogTask.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/log/AutoDeleteLogTask.java index 03446e1d..d614d8c9 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/log/AutoDeleteLogTask.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/log/AutoDeleteLogTask.java @@ -1,13 +1,11 @@ package com.zbkj.admin.task.log; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.admin.service.ScheduleJobLogService; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.service.service.WechatExceptionsService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; -import org.springframework.scheduling.annotation.EnableScheduling; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; /** @@ -15,36 +13,36 @@ import org.springframework.stereotype.Component; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- * | Author: CRMEB Team * +---------------------------------------------------------------------- */ -@Component -@Configuration //读取配置 -@EnableScheduling // 2.开启定时任务 +@Component("AutoDeleteLogTask") public class AutoDeleteLogTask { //日志 private static final Logger logger = LoggerFactory.getLogger(AutoDeleteLogTask.class); + @Autowired + private ScheduleJobLogService scheduleJobLogService; @Autowired private WechatExceptionsService wechatExceptionsService; /** * 每天0点执行 */ - @Scheduled(cron = "0 0 0 */1 * ?") public void autoDeleteLog() { // cron : 0 0 0 */1 * ? - logger.info("---AutoDeleteLogTask------bargain stop status change task: Execution Time - {}", DateUtil.nowDateTime()); + logger.info("---BargainStopChangeTask------bargain stop status change task: Execution Time - {}", CrmebDateUtil.nowDateTime()); try { + scheduleJobLogService.autoDeleteLog(); wechatExceptionsService.autoDeleteLog(); } catch (Exception e) { e.printStackTrace(); - logger.error("AutoDeleteLogTask" + " | msg : " + e.getMessage()); + logger.error("BargainStopChangeTask" + " | msg : " + e.getMessage()); } } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderAutoCancelTask.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderAutoCancelTask.java index aa77d543..83fc6fb7 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderAutoCancelTask.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderAutoCancelTask.java @@ -1,13 +1,10 @@ package com.zbkj.admin.task.order; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.service.service.OrderTaskService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; -import org.springframework.scheduling.annotation.EnableScheduling; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; /** @@ -15,16 +12,14 @@ import org.springframework.stereotype.Component; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- * | Author: CRMEB Team * +---------------------------------------------------------------------- */ -@Component -@Configuration //读取配置 -@EnableScheduling // 2.开启定时任务 +@Component("OrderAutoCancelTask") public class OrderAutoCancelTask { //日志 private static final Logger logger = LoggerFactory.getLogger(OrderAutoCancelTask.class); @@ -32,9 +27,12 @@ public class OrderAutoCancelTask { @Autowired private OrderTaskService orderTaskService; - @Scheduled(fixedDelay = 1000 * 60L) //1分钟同步一次数据 - public void init() { - logger.info("---OrderAutoCancelTask task------produce Data with fixed rate task: Execution Time - {}", DateUtil.nowDateTime()); + /** + * 1分钟同步一次数据 + */ + public void autoCancel() { + // cron : 0 */1 * * * ? + logger.info("---OrderAutoCancelTask task------produce Data with fixed rate task: Execution Time - {}", CrmebDateUtil.nowDateTime()); try { orderTaskService.autoCancel(); @@ -42,6 +40,5 @@ public class OrderAutoCancelTask { e.printStackTrace(); logger.error("OrderAutoCancelTask.task" + " | msg : " + e.getMessage()); } - } } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderAutoCompleteTask.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderAutoCompleteTask.java index 7abc5581..d893ea8b 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderAutoCompleteTask.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderAutoCompleteTask.java @@ -1,13 +1,10 @@ package com.zbkj.admin.task.order; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.service.service.OrderTaskService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; -import org.springframework.scheduling.annotation.EnableScheduling; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; /** @@ -15,16 +12,14 @@ import org.springframework.stereotype.Component; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- * | Author: CRMEB Team * +---------------------------------------------------------------------- */ -@Component -@Configuration //读取配置 -@EnableScheduling // 2.开启定时任务 +@Component("OrderAutoCompleteTask") public class OrderAutoCompleteTask { //日志 @@ -33,16 +28,18 @@ public class OrderAutoCompleteTask { @Autowired private OrderTaskService orderTaskService; - @Scheduled(fixedDelay = 1000 * 60L * 60) //每小时同步一次数据 - public void init() { - logger.info("---OrderAutoCompleteTask task------produce Data with fixed rate task: Execution Time - {}", DateUtil.nowDateTime()); + /** + * 每小时同步一次数据 + */ + public void autoComplete() { + // cron : 0 0 */1 * * ? + logger.info("---OrderAutoCompleteTask task------produce Data with fixed rate task: Execution Time - {}", CrmebDateUtil.nowDateTime()); try { orderTaskService.autoComplete(); } catch (Exception e) { e.printStackTrace(); logger.error("OrderAutoCompleteTask.task" + " | msg : " + e.getMessage()); } - } } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderCancelTask.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderCancelTask.java index c57343a6..87e48e4e 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderCancelTask.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderCancelTask.java @@ -1,13 +1,10 @@ package com.zbkj.admin.task.order; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.service.service.OrderTaskService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; -import org.springframework.scheduling.annotation.EnableScheduling; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; /** @@ -15,16 +12,14 @@ import org.springframework.stereotype.Component; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- * | Author: CRMEB Team * +---------------------------------------------------------------------- */ -@Component -@Configuration //读取配置 -@EnableScheduling // 2.开启定时任务 +@Component("OrderCancelTask") public class OrderCancelTask { //日志 private static final Logger logger = LoggerFactory.getLogger(OrderCancelTask.class); @@ -32,9 +27,12 @@ public class OrderCancelTask { @Autowired private OrderTaskService orderTaskService; - @Scheduled(fixedDelay = 1000 * 60L) //1分钟同步一次数据 - public void init() { - logger.info("---OrderCancelTask task------produce Data with fixed rate task: Execution Time - {}", DateUtil.nowDateTime()); + /** + * 1分钟同步一次数据 + */ + public void userCancel() { + // cron : 0 */1 * * * ? + logger.info("---OrderCancelTask task------produce Data with fixed rate task: Execution Time - {}", CrmebDateUtil.nowDateTime()); try { orderTaskService.cancelByUser(); @@ -42,6 +40,5 @@ public class OrderCancelTask { e.printStackTrace(); logger.error("OrderCancelTask.task" + " | msg : " + e.getMessage()); } - } } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderCompleteTask.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderCompleteTask.java index 2d9fada3..bd8bed83 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderCompleteTask.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderCompleteTask.java @@ -1,13 +1,10 @@ package com.zbkj.admin.task.order; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.service.service.OrderTaskService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; -import org.springframework.scheduling.annotation.EnableScheduling; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; /** @@ -15,16 +12,14 @@ import org.springframework.stereotype.Component; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- * | Author: CRMEB Team * +---------------------------------------------------------------------- */ -@Component -@Configuration //读取配置 -@EnableScheduling // 2.开启定时任务 +@Component("OrderCompleteTask") public class OrderCompleteTask { //日志 private static final Logger logger = LoggerFactory.getLogger(OrderCompleteTask.class); @@ -32,9 +27,12 @@ public class OrderCompleteTask { @Autowired private OrderTaskService orderTaskService; - @Scheduled(fixedDelay = 1000 * 60L) //1分钟同步一次数据 - public void init() { - logger.info("---OrderCompleteTask task------produce Data with fixed rate task: Execution Time - {}", DateUtil.nowDateTime()); + /** + * 1分钟同步一次数据 + */ + public void orderComplete() { + // cron : 0 */1 * * * ? + logger.info("---OrderCompleteTask task------produce Data with fixed rate task: Execution Time - {}", CrmebDateUtil.nowDateTime()); try { orderTaskService.complete(); @@ -42,6 +40,5 @@ public class OrderCompleteTask { e.printStackTrace(); logger.error("OrderCompleteTask.task" + " | msg : " + e.getMessage()); } - } } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderPaySuccessTask.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderPaySuccessTask.java index 4731e8d9..7f4215b3 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderPaySuccessTask.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderPaySuccessTask.java @@ -1,13 +1,10 @@ package com.zbkj.admin.task.order; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.service.service.OrderTaskService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; -import org.springframework.scheduling.annotation.EnableScheduling; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; /** @@ -15,16 +12,14 @@ import org.springframework.stereotype.Component; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- * | Author: CRMEB Team * +---------------------------------------------------------------------- */ -@Component -@Configuration //读取配置 -@EnableScheduling // 2.开启定时任务 +@Component("OrderPaySuccessTask") public class OrderPaySuccessTask { //日志 @@ -33,16 +28,18 @@ public class OrderPaySuccessTask { @Autowired private OrderTaskService orderTaskService; - @Scheduled(fixedDelay = 1000 * 60L) //1分钟同步一次数据 - public void init() { - logger.info("---OrderPaySuccessTask task------produce Data with fixed rate task: Execution Time - {}", DateUtil.nowDateTime()); + /** + * 1分钟同步一次数据 + */ + public void orderPayAfter() { + // cron : 0 */1 * * * ? + logger.info("---OrderPaySuccessTask task------produce Data with fixed rate task: Execution Time - {}", CrmebDateUtil.nowDateTime()); try { orderTaskService.orderPaySuccessAfter(); } catch (Exception e) { e.printStackTrace(); logger.error("OrderPaySuccessTask.task" + " | msg : " + e.getMessage()); } - } } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderReceiptTask.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderReceiptTask.java index 23ccb544..aeb7fa1f 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderReceiptTask.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderReceiptTask.java @@ -1,29 +1,24 @@ package com.zbkj.admin.task.order; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.service.service.OrderTaskService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; -import org.springframework.scheduling.annotation.EnableScheduling; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; /** 用户确认收货Task * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- * | Author: CRMEB Team * +---------------------------------------------------------------------- */ -@Component -@Configuration //读取配置 -@EnableScheduling // 2.开启定时任务 +@Component("OrderReceiptTask") public class OrderReceiptTask { //日志 private static final Logger logger = LoggerFactory.getLogger(OrderReceiptTask.class); @@ -31,9 +26,12 @@ public class OrderReceiptTask { @Autowired private OrderTaskService orderTaskService; - @Scheduled(fixedDelay = 1000 * 60L) //1分钟同步一次数据 - public void init() { - logger.info("---OrderReceiptTask task------produce Data with fixed rate task: Execution Time - {}", DateUtil.nowDateTime()); + /** + * 1分钟同步一次数据 + */ + public void orderReceipt() { + //cron : 0 */1 * * * ? + logger.info("---OrderReceiptTask task------produce Data with fixed rate task: Execution Time - {}", CrmebDateUtil.nowDateTime()); try { orderTaskService.orderReceiving(); @@ -41,6 +39,6 @@ public class OrderReceiptTask { e.printStackTrace(); logger.error("OrderReceiptTask.task" + " | msg : " + e.getMessage()); } - } + } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderRefundTask.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderRefundTask.java index 860ff34e..49130578 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderRefundTask.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderRefundTask.java @@ -1,12 +1,10 @@ package com.zbkj.admin.task.order; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.service.service.OrderTaskService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; -import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -15,16 +13,14 @@ import org.springframework.stereotype.Component; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- * | Author: CRMEB Team * +---------------------------------------------------------------------- */ -@Component -@Configuration //读取配置 -@EnableScheduling // 2.开启定时任务 +@Component("OrderRefundTask") public class OrderRefundTask { //日志 private static final Logger logger = LoggerFactory.getLogger(OrderRefundTask.class); @@ -32,9 +28,12 @@ public class OrderRefundTask { @Autowired private OrderTaskService orderTaskService; - @Scheduled(fixedDelay = 1000 * 60L) //1分钟同步一次数据 - public void init(){ - logger.info("---OrderRefundTask task------produce Data with fixed rate task: Execution Time - {}", DateUtil.nowDateTime()); + /** + * 1分钟同步一次数据 + */ + public void orderRefund() { + // cron : 0 */1 * * * ? + logger.info("---OrderRefundTask task------produce Data with fixed rate task: Execution Time - {}", CrmebDateUtil.nowDateTime()); try { orderTaskService.refundApply(); @@ -42,6 +41,12 @@ public class OrderRefundTask { e.printStackTrace(); logger.error("OrderRefundTask.task" + " | msg : " + e.getMessage()); } + } + + + @Scheduled(fixedDelay = 1000 * 60L) // + public void init(){ + } } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/pink/PinkStatusChangeTask.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/pink/PinkStatusChangeTask.java index 6e9ce6fb..c0846fa1 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/pink/PinkStatusChangeTask.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/pink/PinkStatusChangeTask.java @@ -1,12 +1,9 @@ package com.zbkj.admin.task.pink; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.service.service.StorePinkService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; -import org.springframework.scheduling.annotation.EnableScheduling; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; /** @@ -14,16 +11,14 @@ import org.springframework.stereotype.Component; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- * | Author: CRMEB Team * +---------------------------------------------------------------------- */ -@Component -@Configuration //读取配置 -@EnableScheduling // 2.开启定时任务 +@Component("PinkStatusChangeTask") public class PinkStatusChangeTask { //日志 @@ -32,15 +27,17 @@ public class PinkStatusChangeTask { @Autowired private StorePinkService storePinkService; - @Scheduled(cron = "0 */1 * * * ?") //每分钟执行一次 - public void init(){ - logger.info("---PinkStatusChange------bargain stop status change task: Execution Time - {}", DateUtil.nowDateTime()); + /** + * 每分钟执行一次 + */ + public void pinkStatusChage() { + // cron : 0 */1 * * * ? + logger.info("---PinkStatusChange------bargain stop status change task: Execution Time - {}", CrmebDateUtil.nowDateTime()); try { storePinkService.detectionStatus(); } catch (Exception e) { e.printStackTrace(); logger.error("PinkStatusChange" + " | msg : " + e.getMessage()); } - } } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/product/ProductStockTask.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/product/ProductStockTask.java index f6316a53..06e6a703 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/product/ProductStockTask.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/product/ProductStockTask.java @@ -1,6 +1,6 @@ package com.zbkj.admin.task.product; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.service.service.StoreBargainService; import com.zbkj.service.service.StoreCombinationService; import com.zbkj.service.service.StoreProductService; @@ -8,25 +8,21 @@ import com.zbkj.service.service.StoreSeckillService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; -import org.springframework.scheduling.annotation.EnableScheduling; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; /** 操作商品库存 * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- * | Author: CRMEB Team * +---------------------------------------------------------------------- */ -@Component -@Configuration //读取配置 -@EnableScheduling // 2.开启定时任务 + +@Component("ProductStockTask") public class ProductStockTask { //日志 private static final Logger logger = LoggerFactory.getLogger(ProductStockTask.class); @@ -43,9 +39,12 @@ public class ProductStockTask { @Autowired private StoreCombinationService storeCombinationService; - @Scheduled(fixedDelay = 1000 * 60L) //1分钟同步一次数据 - public void init(){ - logger.info("---OrderTakeByUser task------produce Data with fixed rate task: Execution Time - {}", DateUtil.nowDateTime()); + /** + * 1分钟同步一次数据 + */ + public void stockOperation() { + // cron : 0 */1 * * * ? + logger.info("---OrderTakeByUser task------produce Data with fixed rate task: Execution Time - {}", CrmebDateUtil.nowDateTime()); try { storeProductService.consumeProductStock(); // 商品本身库存任务 storeSeckillService.consumeProductStock(); // 秒杀本身库存任务 @@ -55,6 +54,6 @@ public class ProductStockTask { e.printStackTrace(); logger.error("OrderTakeByUser.task" + " | msg : " + e.getMessage()); } - } + } diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/wechat/AsyncWeChatProgramTempMessage.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/wechat/AsyncWeChatProgramTempMessage.java index 77d54a45..db6bc120 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/wechat/AsyncWeChatProgramTempMessage.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/wechat/AsyncWeChatProgramTempMessage.java @@ -1,13 +1,10 @@ package com.zbkj.admin.task.wechat; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.service.service.TemplateMessageService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; -import org.springframework.scheduling.annotation.EnableScheduling; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; /** @@ -15,16 +12,14 @@ import org.springframework.stereotype.Component; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- * | Author: CRMEB Team * +---------------------------------------------------------------------- */ -@Component -@Configuration //读取配置 -@EnableScheduling // 2.开启定时任务 +@Component("AsyncWeChatProgramTempMessage") public class AsyncWeChatProgramTempMessage { //日志 private static final Logger logger = LoggerFactory.getLogger(AsyncWeChatProgramTempMessage.class); @@ -32,9 +27,9 @@ public class AsyncWeChatProgramTempMessage { @Autowired private TemplateMessageService templateMessageService; - @Scheduled(fixedDelay = 1000 * 60L) //1分钟同步一次数据 + //1分钟同步一次数据 public void init(){ - logger.info("---AsyncWeChatProgramTempMessage task------produce Data with fixed rate task: Execution Time - {}", DateUtil.nowDate()); + logger.info("---AsyncWeChatProgramTempMessage task------produce Data with fixed rate task: Execution Time - {}", CrmebDateUtil.nowDate()); try { templateMessageService.consumeProgram(); } catch (Exception e) { diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/wechat/AsyncWeChatPublicTempMessage.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/wechat/AsyncWeChatPublicTempMessage.java index 01936b37..7a66fc14 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/wechat/AsyncWeChatPublicTempMessage.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/wechat/AsyncWeChatPublicTempMessage.java @@ -1,13 +1,10 @@ package com.zbkj.admin.task.wechat; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.service.service.TemplateMessageService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; -import org.springframework.scheduling.annotation.EnableScheduling; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; /** @@ -15,16 +12,14 @@ import org.springframework.stereotype.Component; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- * | Author: CRMEB Team * +---------------------------------------------------------------------- */ -@Component -@Configuration //读取配置 -@EnableScheduling // 2.开启定时任务 +@Component("AsyncWeChatPublicTempMessage") public class AsyncWeChatPublicTempMessage { //日志 private static final Logger logger = LoggerFactory.getLogger(AsyncWeChatPublicTempMessage.class); @@ -32,9 +27,9 @@ public class AsyncWeChatPublicTempMessage { @Autowired private TemplateMessageService templateMessageService; - @Scheduled(fixedDelay = 1000 * 60L) //1分钟同步一次数据 + //1分钟同步一次数据 public void init() { - logger.info("---AsyncWeChatPublicTempMessage task------produce Data with fixed rate task: Execution Time - {}", DateUtil.nowDate()); + logger.info("---AsyncWeChatPublicTempMessage task------produce Data with fixed rate task: Execution Time - {}", CrmebDateUtil.nowDate()); try { templateMessageService.consumePublic(); @@ -45,4 +40,3 @@ public class AsyncWeChatPublicTempMessage { } } - diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/vo/BaseMessageVo.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/vo/BaseMessageVo.java index 654d5581..699ad238 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/vo/BaseMessageVo.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/vo/BaseMessageVo.java @@ -1,6 +1,6 @@ package com.zbkj.admin.vo; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.common.utils.CrmebDateUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,7 +12,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相关版权 * +---------------------------------------------------------------------- @@ -31,7 +31,7 @@ public class BaseMessageVo{ protected String FromUserName; @ApiModelProperty(value = "消息创建时间 （整型）") - protected Long CreateTime = DateUtil.getTime(); + protected Long CreateTime = CrmebDateUtil.getTime(); @ApiModelProperty(value = "消息类型，文本为text") protected String MsgType = "text"; diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/vo/MessageImageItemVo.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/vo/MessageImageItemVo.java index fa5a4168..cde2fade 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/vo/MessageImageItemVo.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/vo/MessageImageItemVo.java @@ -11,7 +11,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/vo/MessageImageVo.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/vo/MessageImageVo.java index 5200e67c..8bc85859 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/vo/MessageImageVo.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/vo/MessageImageVo.java @@ -12,7 +12,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/vo/MessageReplyDataVo.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/vo/MessageReplyDataVo.java index 6337eb0a..70d94f44 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/vo/MessageReplyDataVo.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/vo/MessageReplyDataVo.java @@ -11,7 +11,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/vo/MessageTextVo.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/vo/MessageTextVo.java index 2431616d..d8d5bca6 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/vo/MessageTextVo.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/vo/MessageTextVo.java @@ -11,7 +11,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/vo/MessageVoiceItemVo.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/vo/MessageVoiceItemVo.java index 23479449..af2174df 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/vo/MessageVoiceItemVo.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/vo/MessageVoiceItemVo.java @@ -11,7 +11,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/vo/MessageVoiceVo.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/vo/MessageVoiceVo.java index 51bd60dc..624031b1 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/vo/MessageVoiceVo.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/vo/MessageVoiceVo.java @@ -12,7 +12,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/vo/ValidateCode.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/vo/ValidateCode.java index e7d40c8e..55109046 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/vo/ValidateCode.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/vo/ValidateCode.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-admin/src/main/resources/application-beta.yml b/crmeb/crmeb-admin/src/main/resources/application-beta.yml index 367d16cc..db6def31 100644 --- a/crmeb/crmeb-admin/src/main/resources/application-beta.yml +++ b/crmeb/crmeb-admin/src/main/resources/application-beta.yml @@ -1,13 +1,15 @@ # CRMEB 相关配置 crmeb: - version: CRMEB-JAVA-KY-v1.3.4 # 当前代码版本 + version: CRMEB-JAVA-KY-v1.4 # 当前代码版本 domain: #配合swagger使用 # 待部署域名 wechat-api-url: #请求微信接口中专服务器 wechat-js-api-debug: false #微信js api系列是否开启调试模式 wechat-js-api-beta: true #微信js api是否是beta版本 - asyncConfig: false #是否同步config表数据到redis + asyncConfig: true #是否同步config表数据到redis asyncWeChatProgramTempList: false #是否同步小程序公共模板库 - imagePath: /www/wwwroot/your Crmeb-admin.jar Path/ # 服务器图片路径配置 斜杠结尾 + imagePath: /你的站点绝对路径 建议jar包位置/ # 服务器图片路径配置 斜杠结尾 + captchaOn: false # 是否开启行为验证码 + demoSite: true # 是否演示站点 所有手机号码都会掩码 server: port: 20008 @@ -30,8 +32,8 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/crmeb?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 - username: crmeb + url: jdbc:mysql://127.0.0.1:3306/crmeb_java_beta?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 + username: crmeb_java_beta password: 111111 redis: host: 127.0.0.1 #地址 diff --git a/crmeb/crmeb-admin/src/main/resources/application-dev.yml b/crmeb/crmeb-admin/src/main/resources/application-dev.yml index 404a8158..64bfb3ef 100644 --- a/crmeb/crmeb-admin/src/main/resources/application-dev.yml +++ b/crmeb/crmeb-admin/src/main/resources/application-dev.yml @@ -1,16 +1,18 @@ # CRMEB 相关配置 crmeb: - version: CRMEB-JAVA-KY-v1.3.4 # 当前代码版本 + version: CRMEB-JAVA-KY-v1.4 # 当前代码版本 domain: #配合swagger使用 # 待部署域名 wechat-api-url: #请求微信接口中专服务器 wechat-js-api-debug: false #微信js api系列是否开启调试模式 wechat-js-api-beta: true #微信js api是否是beta版本 - asyncConfig: false #是否同步config表数据到redis + asyncConfig: true #是否同步config表数据到redis asyncWeChatProgramTempList: false #是否同步小程序公共模板库 - imagePath: /www/wwwroot/Crmeb-admin.jar path/ # 服务器图片路径配置 斜杠结尾 + imagePath: /JAVA_PROJECT/OPEN/dev/admin/ # 服务器图片路径配置 斜杠结尾 + captchaOn: false # 是否开启行为验证码 + demoSite: true # 是否演示站点 所有手机号码都会掩码 server: - port: 20010 + port: 20500 spring: profiles: @@ -24,15 +26,15 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/crmeb?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 - username: crmeb + url: jdbc:mysql://127.0.0.1:3306/single_open?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 + username: single_open password: 111111 redis: host: 127.0.0.1 #地址 port: 6379 #端口 password: 111111 timeout: 10000 # 连接超时时间（毫秒） - database: 10 #默认数据库 + database: 6 #默认数据库 jedis: pool: max-active: 200 # 连接池最大连接数（使用负值表示没有限制） diff --git a/crmeb/crmeb-admin/src/main/resources/application-prod.yml b/crmeb/crmeb-admin/src/main/resources/application-prod.yml index e1544e30..02dd6a06 100644 --- a/crmeb/crmeb-admin/src/main/resources/application-prod.yml +++ b/crmeb/crmeb-admin/src/main/resources/application-prod.yml @@ -1,16 +1,18 @@ # CRMEB 相关配置 crmeb: - version: CRMEB-JAVA-KY-v1.3.4 # 当前代码版本 + version: CRMEB-JAVA-KY-v1.4 # 当前代码版本 domain: #配合swagger使用 # 待部署域名 wechat-api-url: #请求微信接口中专服务器 wechat-js-api-debug: false #微信js api系列是否开启调试模式 wechat-js-api-beta: true #微信js api是否是beta版本 - asyncConfig: false #是否同步config表数据到redis + asyncConfig: true #是否同步config表数据到redis asyncWeChatProgramTempList: false #是否同步小程序公共模板库 - imagePath: /www/wwwroot/your Crmeb-admin.jar Path/ # 服务器图片路径配置 斜杠结尾 + imagePath: /JAVA_PROJECT/SINGLE/demo/admin/ # 服务器图片路径配置 斜杠结尾 + captchaOn: false # 是否开启行为验证码 + demoSite: true # 是否演示站点 所有手机号码都会掩码 server: - port: 20000 + port: 20400 spring: profiles: @@ -24,15 +26,15 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/crmeb?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 - username: crmeb - password: 1111111 + url: jdbc:mysql://127.0.0.1:3306/java_demo?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 + username: java_demo + password: 111111 redis: host: 127.0.0.1 #地址 port: 6379 #端口 password: 111111 timeout: 10000 # 连接超时时间（毫秒） - database: 15 #默认数据库 + database: 4 #默认数据库 jedis: pool: max-active: 200 # 连接池最大连接数（使用负值表示没有限制） @@ -53,7 +55,7 @@ logging: # mybatis 配置 mybatis-plus: - # 配置slq打印日志 + # 配置sql打印日志 configuration: log-impl: @@ -61,6 +63,6 @@ mybatis-plus: swagger: basic: enable: true #是否开启界面 - check: true #是否打开验证 - username: #访问swagger的账号 - password: #访问swagger的密码 + check: false #是否打开验证 + username: crmeb #访问swagger的账号 + password: crmeb.com #访问swagger的密码 diff --git a/crmeb/crmeb-admin/src/main/resources/application.yml b/crmeb/crmeb-admin/src/main/resources/application.yml index 02720d8f..df2e2ae4 100644 --- a/crmeb/crmeb-admin/src/main/resources/application.yml +++ b/crmeb/crmeb-admin/src/main/resources/application.yml @@ -1,14 +1,29 @@ # CRMEB 相关配置 crmeb: - version: CRMEB-JAVA-KY-v1.3.4 # 当前代码版本 + version: CRMEB-JAVA-KY-v1.4 # 当前代码版本 domain: #配合swagger使用 # 待部署域名 wechat-api-url: #请求微信接口中专服务器 wechat-js-api-debug: false #微信js api系列是否开启调试模式 wechat-js-api-beta: true #微信js api是否是beta版本 - asyncConfig: false #是否同步config表数据到redis + asyncConfig: true #是否同步config表数据到redis asyncWeChatProgramTempList: false #是否同步小程序公共模板库 - imagePath: /当前项目更根目录的素材文件(绝对路径)/crmebimage/ # 服务器图片路径配置 斜杠结尾 - database: mysql + imagePath: /Users/23730/Desktop/projectr/single_java/ # 服务器图片路径配置 斜杠结尾 + demoSite: true # 是否演示站点 所有手机号码都会掩码 + activityStyleCachedTime: 10 #活动边框缓存周期 秒为单位，生产环境适当5-10分钟即可 + ignored: #安全路径白名单 + - swagger-ui/ + - swagger-resources/** + - /**/v2/api-docs + - /**/*.html + - /**/*.js + - /**/*.css + - /**/*.png + - /**/*.map + - /favicon.ico + - /actuator/** + - /druid/** + - api/admin/pagediy/info + - api/public/** # 配置端口 server: @@ -23,6 +38,7 @@ server: spring: profiles: # 配置的环境 +# active: #spring.profiles.active# active: servlet: multipart: @@ -38,16 +54,41 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/crmeb?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 - username: crmeb + url: jdbc:mysql://127.0.0.1:3306/single_open?serverTimezone=UTC + username: single_open password: 111111 + # quartz + quartz: + properties: + org: + quartz: + scheduler: + instanceName: quartzScheduler + # instanceName: clusteredScheduler + instanceId: AUTO + jobStore: + class: org.quartz.impl.jdbcjobstore.JobStoreTX + driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate + tablePrefix: QRTZ_ + isClustered: false + clusterCheckinInterval: 10000 + useProperties: false + # dataSource: crmeb_java_beta + threadPool: + class: org.quartz.simpl.SimpleThreadPool + threadCount: 10 + threadPriority: 5 + threadsInheritContextClassLoaderOfInitializingThread: true + #数据库方式 + job-store-type: JDBC + redis: host: 127.0.0.1 #地址 port: 6379 #端口 password: 111111 timeout: 30000 # 连接超时时间（毫秒） - database: 15 #默认数据库 + database: 6 #默认数据库 jedis: pool: max-active: 200 # 连接池最大连接数（使用负值表示没有限制） @@ -55,7 +96,8 @@ spring: max-idle: 10 # 连接池中的最大空闲连接 min-idle: 0 # 连接池中的最小空闲连接 time-between-eviction-runs: -1 #逐出扫描的时间间隔(毫秒) 如果为负数,则不运行逐出线程, 默认-1 - + second: + database: 14 # 微信accessToken存储库 debug: true logging: @@ -88,3 +130,44 @@ swagger: check: false #是否打开验证 username: #访问swagger的账号 password: #访问swagger的密码 + +# 行为验证码 +aj: + captcha: + type: default # 验证码类型 + water-mark: CRMEB Java # 水印 + slip-offset: 15 # 校验滑动拼图允许误差偏移量(默认5像素) + aes-status: true # aes加密坐标开启或者禁用(true|false) + interference-options: 2 # 滑动干扰项(0/1/2) + font-style: 1 # 点选字体样式 默认Font.BOLD + font-size: 25 # 点选字体字体大小 + req-frequency-limit-enable: false # 接口请求次数一分钟限制是否开启 true|false + req-get-lock-limit: 5 # 验证失败5次，get接口锁定 + req-get-lock-seconds: 360 # 验证失败后，锁定时间间隔,s + req-get-minute-limit: 30 # get接口一分钟内请求数限制 + req-check-minute-limit: 60 # check接口一分钟内请求数限制 + req-verify-minute-limit: 60 # verify接口一分钟内请求数限制 + + # 滑动验证，底图路径，不配置将使用默认图片 + # 支持全路径 + # 支持项目路径,以classpath:开头,取resource目录下路径,例：classpath:images/jigsaw + jigsaw: classpath:images/jigsaw + #滑动验证，底图路径，不配置将使用默认图片 + ##支持全路径 + # 支持项目路径,以classpath:开头,取resource目录下路径,例：classpath:images/pic-click + pic-click: classpath:images/pic-click + # 对于分布式部署的应用，我们建议应用自己实现CaptchaCacheService，比如用Redis或者memcache， + # 参考CaptchaCacheServiceRedisImpl.java + # 如果应用是单点的，也没有使用redis，那默认使用内存。 + # 内存缓存只适合单节点部署的应用，否则验证码生产与验证在节点之间信息不同步，导致失败。 + # ！！！ 注意啦，如果应用有使用spring-boot-starter-data-redis， + # 请打开CaptchaCacheServiceRedisImpl.java注释。 + # redis -----> SPI： 在resources目录新建META-INF.services文件夹(两层)，参考当前服务resources。 + # 缓存local/redis... + cache-type: redis + # local缓存的阈值,达到这个值，清除缓存 + cache-number: 1000 + # local定时清除过期缓存(单位秒),设置为0代表不执行 + timing-clear: 3600 + + history-data-clear-enable: false \ No newline at end of file diff --git a/crmeb/crmeb-admin/src/main/resources/generator.properties b/crmeb/crmeb-admin/src/main/resources/generator.properties deleted file mode 100644 index 4660d509..00000000 --- a/crmeb/crmeb-admin/src/main/resources/generator.properties +++ /dev/null @@ -1,65 +0,0 @@ -#\u4EE3\u7801\u751F\u6210\u5668\uFF0C\u914D\u7F6E\u4FE1\u606F - -mainPath=com.zbkj -#\u5305\u540D -package=com.zbkj.modules -moduleName=autogencode -#\u4F5C\u8005 -author=\u5927\u7CBD\u5B50 -#Email -email=stivepeim@outlook.com -#\u8868\u524D\u7F00(\u7C7B\u540D\u4E0D\u4F1A\u5305\u542B\u8868\u524D\u7F00) -tablePrefix=tb_ - -#\u7C7B\u578B\u8F6C\u6362\uFF0C\u914D\u7F6E\u4FE1\u606F -tinyint=Integer -smallint=Integer -mediumint=Integer -int=Integer -integer=Integer -bigint=Long -float=Float -double=Double -decimal=BigDecimal -bit=Boolean - -char=String -varchar=String -tinytext=String -text=String -mediumtext=String -longtext=String - - -date=Date -datetime=Date -timestamp=Date - -NUMBER=Integer -INT=Integer -INTEGER=Integer -BINARY_INTEGER=Integer -LONG=String -FLOAT=Float -BINARY_FLOAT=Float -DOUBLE=Double -BINARY_DOUBLE=Double -DECIMAL=BigDecimal -CHAR=String -VARCHAR=String -VARCHAR2=String -NVARCHAR=String -NVARCHAR2=String -CLOB=String -BLOB=String -DATE=Date -DATETIME=Date -TIMESTAMP=Date -TIMESTAMP(6)=Date - -int8=Long -int4=Integer -int2=Integer -numeric=BigDecimal - -nvarchar=String diff --git a/crmeb/crmeb-admin/src/main/resources/logback-spring.xml b/crmeb/crmeb-admin/src/main/resources/logback-spring.xml index c087b233..7e8d5a19 100644 --- a/crmeb/crmeb-admin/src/main/resources/logback-spring.xml +++ b/crmeb/crmeb-admin/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + @@ -213,21 +213,12 @@ - - - - - ${LOG_HOME}/${APP_NAME}-%d{yyyy-MM-dd}.log - - - - - + + - diff --git a/crmeb/crmeb-common/pom.xml b/crmeb/crmeb-common/pom.xml index 01c3a9c4..bb1eef62 100644 --- a/crmeb/crmeb-common/pom.xml +++ b/crmeb/crmeb-common/pom.xml @@ -12,11 +12,6 @@ crmeb-common crmeb-common - - 1.10 - 1.7 - - org.springframework.boot @@ -54,17 +49,6 @@ tomcat-jsp-api - - commons-configuration - commons-configuration - ${commons.configuration.version} - - - velocity - org.apache.velocity - ${velocity.version} - - com.alibaba @@ -257,67 +241,81 @@ qiniu-java-sdk + + + com.amazonaws + aws-java-sdk-s3 + 1.12.99 + + dom4j dom4j + 1.6.1 com.thoughtworks.xstream xstream - 1.4.18 - - - - - - org.mongodb - mongodb-driver-core + 1.4.20 com.vaadin.external.google android-json + 0.0.20131108.vaadin1 org.apache.httpcomponents httpmime + 4.5.10 com.google.zxing core + 3.5.0 com.google.zxing javase + 3.5.0 - - - com.belerweb - pinyin4j - io.jsonwebtoken jjwt + 0.9.1 com.auth0 jwks-rsa + 0.9.0 + + + + + com.alipay.sdk + alipay-sdk-java + 4.15.20.ALL org.springframework.boot spring-boot-starter-security + 2.7.7 + + + + + com.anji-plus + spring-boot-starter-captcha + 1.3.0 diff --git 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 index 899fc9a6..b73050c9 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 12f21a52..09ef73e6 100644 --- 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 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 getIgnored() { + return ignored; + } + + public void setIgnored(List 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 + + '}'; + } } diff --git 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 index 1bc163e2..043f96bd 100644 --- 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 redisTemplate(RedisConnectionFactory redisConnectionFactory){ - //配置redisTemplate - RedisTemplate redisTemplate = new RedisTemplate<>(); - redisTemplate.setConnectionFactory(redisConnectionFactory); - // 使用StringRedisSerializer来序列化和反序列化redis的key值 - StringRedisSerializer stringSerializer = new StringRedisSerializer(); - // 用Jackson2JsonRedisSerializer来序列化和反序列化redis的value值 - Jackson2JsonRedisSerializer 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 serializer() { - //设置序列化 - Jackson2JsonRedisSerializer 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; } } diff --git 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 deleted file mode 100644 index a30cc4ca..00000000 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/AlipayConfig.java +++ /dev/null @@ -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 - * +---------------------------------------------------------------------- - */ -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"; -} diff --git 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 index 374878ca..fb62f98d 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 4abae487..288cb13d 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 4b3ff5e7..162bf864 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 1e15f3a5..4572e82d 100644 --- 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:{}"; } diff --git 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 index fea50fb9..dd75bdc6 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 09ea077c..1d0d74f4 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 06fd7bb8..d23c7f3f 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 08cb5277..f024ec68 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 83873f70..05464d94 100644 --- 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"; } diff --git 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 index 4793d321..bde75a69 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 26214176..4be41e15 100644 --- 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"; } diff --git 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 index 77f068d2..2d3bbd30 100644 --- 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"; } diff --git 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 index a58b45f1..cbd724a2 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 748a3c33..17121588 100644 --- 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:"; /** * --------------------- diff --git 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 index c7b2fade..e5caf6fd 100644 --- 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"; + } diff --git 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 index 4bc7f2b5..260e3ea9 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index e58c071f..67a889e1 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 95494f3d..9a6cab0e 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 14edfc05..bf5f9d7c 100644 --- 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"; } diff --git 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 index 9d98e659..ab5640db 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 03b5e597..211aa66b 100644 --- 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; } } diff --git 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 index fdea92b6..6e144859 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index db53bac8..9aba4d43 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 deleted file mode 100644 index 5dd172a0..00000000 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/exception/GlobalExceptionHandler.java +++ /dev/null @@ -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 - * +---------------------------------------------------------------------- - */ -@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 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()); - } -} diff --git 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 index 0660f318..fcf152f6 100644 --- 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); diff --git 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 index ff370fac..e31d9278 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 5a7cf605..25744e3e 100644 --- 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; diff --git 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 index 6584b749..a9de0e54 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 4f52fc8a..317feb3a 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 547ab7ee..4b0ef0cb 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index b28675b2..b0e3820c 100644 --- 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; + } diff --git 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 index 62361284..017aee1e 100644 --- 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; diff --git 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 index bbc68f58..1d82f734 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index a74acd90..ecc4bb8e 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 09af66e3..4aec916f 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 898700cf..37ef2e39 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 81e858a1..32665692 100644 --- 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; diff --git 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 index d9449e64..ab538311 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 9cac138a..7a755945 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 85678f9a..8afdd21a 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index a5d97d38..145cc9fb 100644 --- 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; } diff --git 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 deleted file mode 100644 index 873c9015..00000000 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/gencode/mysql/ColumnEntity.java +++ /dev/null @@ -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; - } -} diff --git 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 deleted file mode 100644 index 21482bda..00000000 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/gencode/mysql/TableEntity.java +++ /dev/null @@ -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 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 getColumns() { - return columns; - } - public void setColumns(List 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; - } -} diff --git 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 index bcfe3e71..25be162e 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index e5fd2b8f..780835fd 100644 --- 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; } diff --git 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 index 7c6752ef..0563bf59 100644 --- 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; } diff --git 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 index 68319144..aa6cb853 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index e15c161f..bcff515a 100644 --- 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; } diff --git 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 index 29e45bc2..8cb32030 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 29b453a4..caf816d9 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 4c30fff9..93d28101 100644 --- 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; } diff --git 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 deleted file mode 100644 index 3f1f8572..00000000 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/product/StoreProductCate.java +++ /dev/null @@ -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 - * +---------------------------------------------------------------------- - */ -@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; - - -} diff --git 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 index 0d8a99d5..bfe76e7f 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 02996ed3..80473b6c 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index c3aa8dc4..e63099e4 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index b41c471d..8abea7bb 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index e07bde26..a645b3cf 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index cdb5edd2..8db062dd 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 1cc20b82..02acb2fb 100644 --- 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; diff --git 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 index e6701760..31f497ed 100644 --- 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; diff --git 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 index 48b12ec5..514202b3 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 31c65e91..5bb4abec 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index d1844786..6ee90537 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 729a5aff..a1e92a5f 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 1c05d6b9..917819c6 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 15452e45..f516be82 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 54b93374..b89b6776 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 5c577230..bf6a4bb2 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 43043504..9ebcedf8 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index ddbf3c20..02356927 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 3148770f..d5fa7f51 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 75294788..ee8f3666 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 82b69854..c75a82ff 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 7a4076a9..3efa1286 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index a717c7f3..d804a8ba 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 53389416..300d7c08 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index b2e651ba..a9e83578 100644 --- 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; + + } diff --git 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 index fbcdfa4d..beaa61b0 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 0f9feac8..b8d41564 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index b865b9d9..c7989b24 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index e635f5bb..137f8ec2 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 0c3dd893..8b31b0fb 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 55e54e39..36f993f9 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index f31bf0ef..e76e450f 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 0c894858..bb3242bd 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 11ba2e9e..72cd5968 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 40562028..698f26e1 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 4dbc5052..ccd4202e 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 2b0ff99d..1faeaded 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 878fa1b3..dc431815 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 4b757573..fbec8855 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 29c1dc23..53798393 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 68f7104b..afb24ed6 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 85cd65fd..4cfc9456 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index 434b2fb7..156fa44a 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git 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 index cd647fd8..9adac301 100644 --- 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/BargainFrontRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/BargainFrontRequest.java index e8ad7b4f..c0b06efb 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/BargainFrontRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/BargainFrontRequest.java @@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/BrokerageRecordRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/BrokerageRecordRequest.java index 73334253..6f41027c 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/BrokerageRecordRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/BrokerageRecordRequest.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/CartNumRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/CartNumRequest.java index 4e292013..839b019d 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/CartNumRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/CartNumRequest.java @@ -17,7 +17,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/CartRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/CartRequest.java index 1737370f..5cbab2b1 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/CartRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/CartRequest.java @@ -16,7 +16,7 @@ import javax.validation.constraints.NotNull; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/CartResetRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/CartResetRequest.java index cb6289bc..c82117d3 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/CartResetRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/CartResetRequest.java @@ -11,7 +11,7 @@ import javax.validation.constraints.NotNull; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/CategoryRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/CategoryRequest.java index 9bc4f954..20c656eb 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/CategoryRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/CategoryRequest.java @@ -22,7 +22,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/CategorySearchRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/CategorySearchRequest.java index aba9559b..1bb81b69 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/CategorySearchRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/CategorySearchRequest.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ComponentProductSearchRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ComponentProductSearchRequest.java deleted file mode 100644 index 7099e74a..00000000 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ComponentProductSearchRequest.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.zbkj.common.request; - - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * 组件商品列表搜索Request对象 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value="ComponentProductSearchRequest对象", description="组件商品列表搜索Request对象") -public class ComponentProductSearchRequest implements Serializable { - - private static final long serialVersionUID = -2196197495866986580L; - - @ApiModelProperty(value = "商品ID") - private Integer proId; - - @ApiModelProperty(value = "模糊搜索内容，目前只支持商品名称") - private String search; -} diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/CreateOrderRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/CreateOrderRequest.java index 9ec8eaf0..f7a941b3 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/CreateOrderRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/CreateOrderRequest.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相关版权 * +---------------------------------------------------------------------- @@ -46,13 +46,13 @@ public class CreateOrderRequest implements Serializable { @ApiModelProperty(value = "优惠券编号") private Integer couponId; - @ApiModelProperty(value = "支付类型:weixin-微信支付，yue-余额支付,alipay-支付宝支付") - @NotBlank(message = "支付类型不能为空") - private String payType; - - @ApiModelProperty(value = "支付渠道:weixinh5-微信H5支付，public-公众号支付，routine-小程序支付，weixinAppIos-微信appios支付，weixinAppAndroid-微信app安卓支付,alipay-支付宝支付，appAliPay-App支付宝支付") - @NotBlank(message = "支付渠道不能为空") - private String payChannel; +// @ApiModelProperty(value = "支付类型:weixin-微信支付，yue-余额支付,alipay-支付宝支付") +// @NotBlank(message = "支付类型不能为空") +// private String payType; +// +// @ApiModelProperty(value = "支付渠道:weixinh5-微信H5支付，public-公众号支付，routine-小程序支付，weixinAppIos-微信appios支付，weixinAppAndroid-微信app安卓支付,alipay-支付宝支付，appAliPay-App支付宝支付") +// @NotBlank(message = "支付渠道不能为空") +// private String payChannel; @ApiModelProperty(value = "是否使用积分") @NotNull(message = "是否使用积分不能为空") diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ExpressSearchRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ExpressSearchRequest.java index 633d26f2..48d8def1 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ExpressSearchRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ExpressSearchRequest.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ExpressUpdateRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ExpressUpdateRequest.java index 24277bb9..fe04aec3 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ExpressUpdateRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ExpressUpdateRequest.java @@ -18,7 +18,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ExpressUpdateShowRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ExpressUpdateShowRequest.java index 8b42ab56..a031b34b 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ExpressUpdateShowRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ExpressUpdateShowRequest.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/FundsMonitorRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/FundsMonitorRequest.java index e3202424..db07e246 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/FundsMonitorRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/FundsMonitorRequest.java @@ -17,7 +17,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/FundsMonitorSearchRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/FundsMonitorSearchRequest.java index 0e4181da..2eadb967 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/FundsMonitorSearchRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/FundsMonitorSearchRequest.java @@ -16,7 +16,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/GetProductReply.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/GetProductReply.java index 4e404ecc..79f8e4b5 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/GetProductReply.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/GetProductReply.java @@ -12,7 +12,7 @@ import javax.validation.constraints.NotNull; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/IosBindingPhoneRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/IosBindingPhoneRequest.java deleted file mode 100644 index c3bb4774..00000000 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/IosBindingPhoneRequest.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.zbkj.common.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * 微信绑定手机号请求对象 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value="IosBindingPhoneRequest", description="Ios绑定手机号请求对象") -public class IosBindingPhoneRequest implements Serializable { - - private static final long serialVersionUID=1L; - - @ApiModelProperty(value = "手机号", required = true) - private String phone; - - @ApiModelProperty(value = "验证码", required = true) - private String captcha; -} diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/IosLoginRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/IosLoginRequest.java deleted file mode 100644 index 5aceb28c..00000000 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/IosLoginRequest.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.zbkj.common.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import javax.validation.constraints.NotBlank; - -/** - * ios登录请求体 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value="IosLoginRequest对象", description="ios登录请求体") -public class IosLoginRequest { - - @ApiModelProperty(value = "iosToken", required = true) -// @NotBlank(message = "identityToken不能为空") - private String identityToken; - - @ApiModelProperty(value = "App服务商唯一用户标识", required = true) - @NotBlank(message = "openId不能为空") - private String openId; - - @ApiModelProperty(value = "Ios用户电子邮箱") -// @NotBlank(message = "email不能为空") - private String email; -} diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/LoginMobileRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/LoginMobileRequest.java index 6a372904..f57038a5 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/LoginMobileRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/LoginMobileRequest.java @@ -17,7 +17,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/LoginRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/LoginRequest.java index 292a2db9..70b15d0c 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/LoginRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/LoginRequest.java @@ -17,7 +17,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/MealCodeRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/MealCodeRequest.java index ff81363a..08f22698 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/MealCodeRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/MealCodeRequest.java @@ -16,7 +16,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/NotificationInfoRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/NotificationInfoRequest.java index 0684ab13..c65d3d66 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/NotificationInfoRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/NotificationInfoRequest.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/NotificationSearchRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/NotificationSearchRequest.java index 2f43d886..2195badb 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/NotificationSearchRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/NotificationSearchRequest.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/NotificationUpdateRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/NotificationUpdateRequest.java index 60b04e5c..4bcf810b 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/NotificationUpdateRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/NotificationUpdateRequest.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/OnePassLoginRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/OnePassLoginRequest.java deleted file mode 100644 index 0ef79e4a..00000000 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/OnePassLoginRequest.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.zbkj.common.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - -/** - * 一号通用户登录请求对象 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value = "OnePassLoginRequest对象", description = "一号通用户登录请求对象") -public class OnePassLoginRequest { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "账号", required = true) - @NotBlank(message = "账号不能为空") - private String account; - - @ApiModelProperty(value = "password", required = true) - @NotBlank(message = "密码不能为空") - private String password; -} diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/OnePassRegisterRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/OnePassRegisterRequest.java deleted file mode 100644 index b9733c03..00000000 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/OnePassRegisterRequest.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.zbkj.common.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - * 一号通账号注册 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value = "OnePassRegisterRequest对象", description = "一号通账号注册") -public class OnePassRegisterRequest implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "账号", required = true) - @NotBlank(message = "账号不能为空") - private String account; - - @ApiModelProperty(value = "手机号", required = true) - @NotNull(message = "手机号不能为空") - private String phone; - - @ApiModelProperty(value = "密码", required = true) - @NotNull(message = "密码不能为空") - private String password; - - @ApiModelProperty(value = "域名", required = true) - @NotNull(message = "域名不能为空") - private String domain; - - @ApiModelProperty(value = "验证码") - @NotNull(message = "验证码不能为空") - private String code; -} diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/OnePassUpdateRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/OnePassUpdateRequest.java deleted file mode 100644 index ac3f532a..00000000 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/OnePassUpdateRequest.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.zbkj.common.request; - -import com.zbkj.common.constants.RegularConstants; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import java.io.Serializable; - -/** - * 一号通账号修改 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value = "OnePassUpdateRequest对象", description = "一号通账号修改") -public class OnePassUpdateRequest implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "账号", required = true) - @NotNull(message = "账号不能为空") - private String account; - - @ApiModelProperty(value = "手机号", required = true) - @NotNull(message = "手机号不能为空") - @Pattern(regexp = RegularConstants.PHONE_TWO, message = "请填写正确的手机号") - private String phone; - - @ApiModelProperty(value = "密码") - private String password; - - @ApiModelProperty(value = "验证码", required = true) - @NotNull(message = "验证码不能为空") - private String code; -} diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/OnePassUserRecordRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/OnePassUserRecordRequest.java deleted file mode 100644 index 96fbf241..00000000 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/OnePassUserRecordRequest.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.zbkj.common.request; - -import com.zbkj.common.annotation.StringContains; -import com.zbkj.common.constants.Constants; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.hibernate.validator.constraints.Range; - -import javax.validation.constraints.NotBlank; - -/** - * 一号通用量记录请求对象 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value = "OnePassUserRecordRequest对象", description = "一号通用量记录请求对象") -public class OnePassUserRecordRequest { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "记录类型:sms,短信;copy,产品复制;expr_query,物流查询;expr_dump,电子面单", required = true) - @NotBlank(message = "记录类型不能为空") - @StringContains(limitValues = {"sms","copy","expr_query","expr_dump"}, message = "未知的记录类型") - private String type; - - @ApiModelProperty(value = "短信状态(短信类型时必传)：0发送中，1成功，2失败，3全部") - @Range(min = 0, max = 3, message = "未知的短信状态") - private Integer status; - - @ApiModelProperty(value = "页码", example = Constants.DEFAULT_PAGE + "") - private int page = Constants.DEFAULT_PAGE; - - @ApiModelProperty(value = "每页数量", example = Constants.DEFAULT_LIMIT + "") - private int limit = Constants.DEFAULT_LIMIT; - -} diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/OrderComputedPriceRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/OrderComputedPriceRequest.java index 4067e60d..bd463615 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/OrderComputedPriceRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/OrderComputedPriceRequest.java @@ -15,7 +15,7 @@ import javax.validation.constraints.NotNull; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/OrderPayRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/OrderPayRequest.java index 09132119..0586df3a 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/OrderPayRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/OrderPayRequest.java @@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/OrderRefundApplyRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/OrderRefundApplyRequest.java index 1f37c277..db54ef22 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/OrderRefundApplyRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/OrderRefundApplyRequest.java @@ -18,7 +18,7 @@ import javax.validation.constraints.NotNull; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/PageParamRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/PageParamRequest.java index 567b29e9..7408f732 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/PageParamRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/PageParamRequest.java @@ -9,7 +9,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/PasswordRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/PasswordRequest.java index 66d4305f..cbfde834 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/PasswordRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/PasswordRequest.java @@ -17,7 +17,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/PayComponentProductAddRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/PayComponentProductAddRequest.java index 82a3e1f5..2e3bb0b7 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/PayComponentProductAddRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/PayComponentProductAddRequest.java @@ -16,7 +16,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/PreOrderDetailRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/PreOrderDetailRequest.java index 115b624f..15550c1d 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/PreOrderDetailRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/PreOrderDetailRequest.java @@ -11,7 +11,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/PreOrderRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/PreOrderRequest.java index e48072ca..92b5fe24 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/PreOrderRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/PreOrderRequest.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ProductListRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ProductListRequest.java index 94bc9ed4..9e28080d 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ProductListRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ProductListRequest.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ProductRankingRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ProductRankingRequest.java index 8a1c43b0..ea03297c 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ProductRankingRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ProductRankingRequest.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ProductRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ProductRequest.java index 7b463038..f4bcb972 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ProductRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ProductRequest.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- @@ -32,7 +32,7 @@ public class ProductRequest implements Serializable { private String keyword; @ApiModelProperty(value = "分类id") - private Integer cid; + private String cid; @ApiModelProperty(value = "价格排序", allowableValues = "range[asc,desc]") private String priceOrder; diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/RegisterAppWxRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/RegisterAppWxRequest.java index f06eaa52..c5f7906c 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/RegisterAppWxRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/RegisterAppWxRequest.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/RegisterThirdUserRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/RegisterThirdUserRequest.java index abf0b0a7..e4d3378f 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/RegisterThirdUserRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/RegisterThirdUserRequest.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/RetailShopRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/RetailShopRequest.java index 2b854a69..d6b57ec6 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/RetailShopRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/RetailShopRequest.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/RetailShopStairUserRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/RetailShopStairUserRequest.java index 0a3c3bdb..1e992d15 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/RetailShopStairUserRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/RetailShopStairUserRequest.java @@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SearchAndPageRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SearchAndPageRequest.java index 25c5ba83..0ec91ba6 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SearchAndPageRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SearchAndPageRequest.java @@ -9,7 +9,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ServiceOpenRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ServiceOpenRequest.java index 1799afb8..ebb2c46f 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ServiceOpenRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ServiceOpenRequest.java @@ -16,7 +16,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ShippingTemplatesFreeRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ShippingTemplatesFreeRequest.java index 76d4fe55..aaca162a 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ShippingTemplatesFreeRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ShippingTemplatesFreeRequest.java @@ -18,7 +18,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ShippingTemplatesRegionRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ShippingTemplatesRegionRequest.java index dee4433e..bf79bc67 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ShippingTemplatesRegionRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ShippingTemplatesRegionRequest.java @@ -1,6 +1,5 @@ package com.zbkj.common.request; -import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,27 +12,26 @@ import java.io.Serializable; import java.math.BigDecimal; /** - * 模板区域Reuqest - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- + * 运费模板区域请求对象 + * +---------------------------------------------------------------------- + * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] + * +---------------------------------------------------------------------- + * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved. + * +---------------------------------------------------------------------- + * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 + * +---------------------------------------------------------------------- + * | Author: CRMEB Team + * +---------------------------------------------------------------------- */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("eb_shipping_templates_region") -@ApiModel(value="ShippingTemplatesRegionRequest对象", description="付费") +@ApiModel(value = "ShippingTemplatesRegionRequest对象", description = "运费模板区域请求对象") public class ShippingTemplatesRegionRequest implements Serializable { - private static final long serialVersionUID=1L; + private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "城市ID, 多个逗号分割。全国 all", required = true, example = "1,2,3,4") + @ApiModelProperty(value = "城市ID（只要最后一级城市ID）, 多个逗号分割。全国 0", required = true, example = "1,2,3,4") @NotNull(message = "请选择城市") private String cityId; diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ShippingTemplatesRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ShippingTemplatesRequest.java index 5e732c0f..4c9fa2c6 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ShippingTemplatesRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ShippingTemplatesRequest.java @@ -1,6 +1,5 @@ package com.zbkj.common.request; -import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,56 +8,54 @@ import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Range; -import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.List; /** - * 模版Request - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- + * 运费模板请求对象 + * +---------------------------------------------------------------------- + * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] + * +---------------------------------------------------------------------- + * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved. + * +---------------------------------------------------------------------- + * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 + * +---------------------------------------------------------------------- + * | Author: CRMEB Team + * +---------------------------------------------------------------------- */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("eb_shipping_templates") -@ApiModel(value="ShippingTemplatesRequest对象", description="模板") +@ApiModel(value = "ShippingTemplatesRequest对象", description = "运费模板请求对象") public class ShippingTemplatesRequest implements Serializable { - private static final long serialVersionUID=1L; + private static final long serialVersionUID = 1L; @ApiModelProperty(value = "模板名称", required = true) @NotBlank(message = "模板名称必须填写") @Length(max = 200, message = "模板名称不能超过200个字符") private String name; - @ApiModelProperty(value = "计费方式 1(按件数), 2(按重量)，3(按体积)", example = "1", required = true) + @ApiModelProperty(value = "计费方式 0（未选择），1(按件数), 2(按重量)，3(按体积)", example = "0", required = true) @NotNull(message = "计费方式必须选择") - @Range(min = 1, max = 3, message = "计费方式选择区间 1(按件数), 2(按重量)，3(按体积)") + @Range(min = 0, max = 3, message = "计费方式选择区间 1(按件数), 2(按重量)，3(按体积)") private Integer type; - @ApiModelProperty(value = "配送区域及运费", required = true) - private List shippingTemplatesRegionRequestList; - - @ApiModelProperty(value = "指定包邮", example = "1", required = true) + @ApiModelProperty(value = "包邮类型：0-全国包邮，1-部分包邮，2-自定义", example = "0", required = true) @NotNull(message = "指定包邮必须选择") - private Boolean appoint; - - @ApiModelProperty(value = "指定包邮设置", required = true) - private List shippingTemplatesFreeRequestList; + @Range(min = 0, max = 2, message = "未知的包邮类型") + private Integer appoint; @ApiModelProperty(value = "排序", example = "0") @NotNull(message = "排序数字必须填写") - @Min(value = 0, message = "排序最小为0") + @Range(min = 0, max = 9999, message = "排序范围为0~9999") private Integer sort; + @ApiModelProperty(value = "配送区域及运费，部分包邮、自定义模板时必传") + private List shippingTemplatesRegionRequestList; + + @ApiModelProperty(value = "包邮区域设置，自定义模板时有值传递") + private List shippingTemplatesFreeRequestList; } diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ShippingTemplatesSearchRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ShippingTemplatesSearchRequest.java index a2c277aa..295ed81c 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ShippingTemplatesSearchRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ShippingTemplatesSearchRequest.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SmsApplyTempRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SmsApplyTempRequest.java index 9e22b3eb..0aea41f0 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SmsApplyTempRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SmsApplyTempRequest.java @@ -18,7 +18,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SmsModifySignRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SmsModifySignRequest.java index 7a4d2110..fae9cb59 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SmsModifySignRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SmsModifySignRequest.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreBargainRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreBargainRequest.java index bae331aa..c659b787 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreBargainRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreBargainRequest.java @@ -17,7 +17,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreBargainSearchRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreBargainSearchRequest.java index 0e400eba..f49d78a1 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreBargainSearchRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreBargainSearchRequest.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreBargainUserSearchRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreBargainUserSearchRequest.java index 5cb772c0..a9879e13 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreBargainUserSearchRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreBargainUserSearchRequest.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreCombinationRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreCombinationRequest.java index a71d61de..8eb9b5d4 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreCombinationRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreCombinationRequest.java @@ -9,6 +9,7 @@ import org.hibernate.validator.constraints.Length; import javax.validation.constraints.Max; import javax.validation.constraints.Min; +import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.List; @@ -18,7 +19,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相关版权 * +---------------------------------------------------------------------- @@ -61,9 +62,9 @@ public class StoreCombinationRequest implements Serializable { @Max(value = 99999, message = "拼团人数不能大于99999") private Integer people; - @ApiModelProperty(value = "简介") +// @ApiModelProperty(value = "简介") // @NotNull(message = "拼团简介不能为空") - private String info; +// private String info; @ApiModelProperty(value = "活动状态") @NotNull(message = "活动状态不能为空") @@ -107,6 +108,7 @@ public class StoreCombinationRequest implements Serializable { private List attr; @ApiModelProperty(value = "商品属性详情") + @NotEmpty(message = "商品属性不能为空") private List attrValue; @ApiModelProperty(value = "商品描述") diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreCombinationSearchRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreCombinationSearchRequest.java index 0db656a7..638e7225 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreCombinationSearchRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreCombinationSearchRequest.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreCopyProductRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreCopyProductRequest.java index 7c35709c..5bc758c8 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreCopyProductRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreCopyProductRequest.java @@ -14,7 +14,7 @@ import javax.validation.constraints.NotNull; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreCouponRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreCouponRequest.java index 6e0f7fe6..bc8315bd 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreCouponRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreCouponRequest.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相关版权 * +---------------------------------------------------------------------- @@ -60,6 +60,7 @@ public class StoreCouponRequest implements Serializable { private String primaryKey; @ApiModelProperty(value = "最低消费，0代表不限制", required = true) + @DecimalMax(value = "99999.99", message = "最低消费 面值不能大于99999.99") private BigDecimal minPrice; @ApiModelProperty(value = "是否固定领取时间， 默认0 否， 1是", required = true) diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreCouponSearchRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreCouponSearchRequest.java index b1286754..097bd0e5 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreCouponSearchRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreCouponSearchRequest.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreCouponUserRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreCouponUserRequest.java index f376dfbd..77674af1 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreCouponUserRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreCouponUserRequest.java @@ -22,7 +22,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreCouponUserSearchRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreCouponUserSearchRequest.java index 993312de..2279d458 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreCouponUserSearchRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreCouponUserSearchRequest.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreDateRangeSqlPram.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreDateRangeSqlPram.java index 5fde3686..25b4b91d 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreDateRangeSqlPram.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreDateRangeSqlPram.java @@ -7,7 +7,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreNearRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreNearRequest.java index 4b1a0eab..5f6c2fcc 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreNearRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreNearRequest.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- @@ -28,9 +28,9 @@ public class StoreNearRequest implements Serializable { private static final long serialVersionUID=1L; - @ApiModelProperty(value = "经度") + @ApiModelProperty(value = "纬度") private String latitude; - @ApiModelProperty(value = "纬度") + @ApiModelProperty(value = "经度") private String longitude; } diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreOrderRefundRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreOrderRefundRequest.java index bdd9a470..6f784dde 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreOrderRefundRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreOrderRefundRequest.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreOrderSearchRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreOrderSearchRequest.java index 6aea508d..af27c440 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreOrderSearchRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreOrderSearchRequest.java @@ -17,7 +17,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreOrderSendRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreOrderSendRequest.java index 36dcdbec..4c41bce2 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreOrderSendRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreOrderSendRequest.java @@ -1,25 +1,20 @@ package com.zbkj.common.request; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.zbkj.common.request.onepass.OnePassShipmentCreateOrderRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; -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相关版权 * +---------------------------------------------------------------------- @@ -40,9 +35,9 @@ public class StoreOrderSendRequest { @NotBlank(message = "订单编号不能为空") private String orderNo; - @ApiModelProperty(value = "类型， 1发货，2送货，3虚拟", allowableValues = "range[1,2,3]") + @ApiModelProperty(value = "类型， express 发货，send 送货，fictitious虚拟", allowableValues = "express,send,fictitious", required = true) @NotBlank(message = "请选择类型") - private String type; + private String deliveryType; @ApiModelProperty(value = "快递公司名,发货类型必传") private String expressName; @@ -53,7 +48,7 @@ public class StoreOrderSendRequest { @ApiModelProperty(value = "快递单号,发货类型必传") private String expressNumber; - @ApiModelProperty(value = "发货记录类型，1正常、2电子面单,发货类型必传") + @ApiModelProperty(value = "发货记录类型，1快递发货、2电子面单, 3一号通-商家发货") private String expressRecordType; @ApiModelProperty(value = "电子面单模板,电子面单必传") @@ -73,4 +68,7 @@ public class StoreOrderSendRequest { @ApiModelProperty(value = "送货人电话,送货类型必传") private String deliveryTel; + + @ApiModelProperty(value = "商家发货一号通内置功能") + private OnePassShipmentCreateOrderRequest shipment; } diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreOrderStaticsticsRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreOrderStaticsticsRequest.java index 16814996..1e9962c1 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreOrderStaticsticsRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreOrderStaticsticsRequest.java @@ -10,7 +10,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreOrderStatusSearchRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreOrderStatusSearchRequest.java index 36acb5bc..f3eb522f 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreOrderStatusSearchRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreOrderStatusSearchRequest.java @@ -11,7 +11,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreOrderUpdatePriceRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreOrderUpdatePriceRequest.java index e111887b..b3443d1d 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreOrderUpdatePriceRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreOrderUpdatePriceRequest.java @@ -20,7 +20,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StorePinkRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StorePinkRequest.java index 85e113a9..d4beceaa 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StorePinkRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StorePinkRequest.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StorePinkSearchRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StorePinkSearchRequest.java index 6e51506b..59fe6909 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StorePinkSearchRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StorePinkSearchRequest.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductAddRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductAddRequest.java index 07115bb7..976ed753 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductAddRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductAddRequest.java @@ -19,7 +19,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相关版权 * +---------------------------------------------------------------------- @@ -53,10 +53,10 @@ public class StoreProductAddRequest implements Serializable { @Length(max = 128, message = "商品名称长度不能超过128个字符") private String storeName; - @ApiModelProperty(value = "商品简介", required = true) - @NotBlank(message = "商品简介不能为空") - @Length(max = 256, message = "商品简介长度不能超过256个字符") - private String storeInfo; +// @ApiModelProperty(value = "商品简介", required = true) +// @NotBlank(message = "商品简介不能为空") +// @Length(max = 256, message = "商品简介长度不能超过256个字符") +// private String storeInfo; @ApiModelProperty(value = "关键字", required = true) @Length(max = 255, message = "关键字长度不能超过255个字符") diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductAttrAddRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductAttrAddRequest.java index 278e8776..dae17237 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductAttrAddRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductAttrAddRequest.java @@ -16,7 +16,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductAttrValueAddRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductAttrValueAddRequest.java index aa1c6bfd..1f83e958 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductAttrValueAddRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductAttrValueAddRequest.java @@ -18,7 +18,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相关版权 * +---------------------------------------------------------------------- @@ -107,4 +107,7 @@ public class StoreProductAttrValueAddRequest implements Serializable { @ApiModelProperty(value = "砍价商品最低价|砍价专用") private BigDecimal minPrice; + + @ApiModelProperty(value = "商品条码") + private String barCode; } diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductAttrValueRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductAttrValueRequest.java index 9a692f03..77e8b445 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductAttrValueRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductAttrValueRequest.java @@ -17,7 +17,7 @@ import java.util.LinkedHashMap; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductReplyAddRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductReplyAddRequest.java index 8f7b8c96..d8250f32 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductReplyAddRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductReplyAddRequest.java @@ -17,7 +17,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductReplyCommentRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductReplyCommentRequest.java index cf2781d1..08ba682d 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductReplyCommentRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductReplyCommentRequest.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductReplySearchRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductReplySearchRequest.java index 84dd897b..200c1eec 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductReplySearchRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductReplySearchRequest.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductRequest.java index 0c956dfc..b7506b65 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductRequest.java @@ -18,7 +18,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相关版权 * +---------------------------------------------------------------------- @@ -52,9 +52,9 @@ public class StoreProductRequest implements Serializable { @NotNull(message = "商品名称不能为空") private String storeName; - @ApiModelProperty(value = "商品简介") - @NotNull(message = "商品简介不能为空") - private String storeInfo; +// @ApiModelProperty(value = "商品简介") +// @NotNull(message = "商品简介不能为空") +// private String storeInfo; @ApiModelProperty(value = "关键字") @NotNull(message = "关键字不能为空") diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductRuleRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductRuleRequest.java index 028ee41d..3abe6bf0 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductRuleRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductRuleRequest.java @@ -17,7 +17,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductRuleSearchRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductRuleSearchRequest.java index f9199cd8..8d920e17 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductRuleSearchRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductRuleSearchRequest.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductSearchRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductSearchRequest.java index 5cdc5557..be02d892 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductSearchRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductSearchRequest.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相关版权 * +---------------------------------------------------------------------- @@ -40,7 +40,13 @@ public class StoreProductSearchRequest implements Serializable { @ApiModelProperty(value = "分类ID， 多个逗号分隔") private String cateId; - @ApiModelProperty(value = "关键字搜索， 支持(商品名称, 商品简介, 关键字, 商品条码)") + @ApiModelProperty(value = "关键字搜索， 支持(商品名称, 关键字, 商品条码)") private String keywords; + @ApiModelProperty(value = "价格排序", allowableValues = "range[asc,desc]") + private String priceOrder; + + @ApiModelProperty(value = "销量排序", allowableValues = "range[asc,desc]") + private String salesOrder; + } diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductStockRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductStockRequest.java index 92dea39f..99c5c4fb 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductStockRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreProductStockRequest.java @@ -18,7 +18,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreSeckillAddRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreSeckillAddRequest.java index edccb157..7586f6a2 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreSeckillAddRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreSeckillAddRequest.java @@ -18,7 +18,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相关版权 * +---------------------------------------------------------------------- @@ -53,10 +53,10 @@ public class StoreSeckillAddRequest { @Length(max = 255, message = "活动标题长度不能超过255个字符") private String title; - @ApiModelProperty(value = "简介", required = true) - @NotBlank(message = "简介不能为空") - @Length(max = 255, message = "简介长度不能超过255个字符") - private String info; +// @ApiModelProperty(value = "简介", required = true) +// @NotBlank(message = "简介不能为空") +// @Length(max = 255, message = "简介长度不能超过255个字符") +// private String info; @ApiModelProperty(value = "单位名", required = true) @NotBlank(message = "单位名不能为空") diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreSeckillMangerRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreSeckillMangerRequest.java index fd88d3b8..8a9ebf7a 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreSeckillMangerRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreSeckillMangerRequest.java @@ -20,7 +20,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相关版权 * +---------------------------------------------------------------------- @@ -61,10 +61,9 @@ public class StoreSeckillMangerRequest { @ApiModelProperty(value = "排序") private Integer sort; - @ApiModelProperty(value = "状态 0=关闭 1=开启") + @ApiModelProperty(value = "状态 '0'=关闭 '1'=开启") @NotNull(message = "状态不能为空") - @Range(min = 0, max = 1, message = "未知的状态") - private Integer status; + private String status; @ApiModelProperty(value = "0未删除1已删除") private Boolean isDel; diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreSeckillMangerSearchRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreSeckillMangerSearchRequest.java index 8066090b..a285135d 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreSeckillMangerSearchRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreSeckillMangerSearchRequest.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相关版权 * +---------------------------------------------------------------------- @@ -35,6 +35,6 @@ public class StoreSeckillMangerSearchRequest { @ApiModelProperty(value = "秒杀名称") private String name; - @ApiModelProperty(value = "状态 0=关闭 1=开启") - private Integer status; + @ApiModelProperty(value = "状态 '0'=关闭 '1'=开启") + private String status; } diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreSeckillSearchRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreSeckillSearchRequest.java index b6ff6cbb..2bdbdefe 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreSeckillSearchRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/StoreSeckillSearchRequest.java @@ -8,7 +8,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemAdminAddRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemAdminAddRequest.java index e241ea9e..b6fc2beb 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemAdminAddRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemAdminAddRequest.java @@ -19,7 +19,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemAdminLoginCaptchaRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemAdminLoginCaptchaRequest.java index 7ca4c350..81688956 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemAdminLoginCaptchaRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemAdminLoginCaptchaRequest.java @@ -8,7 +8,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemAdminLoginRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemAdminLoginRequest.java index ffef2950..66a5ed23 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemAdminLoginRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemAdminLoginRequest.java @@ -1,17 +1,19 @@ package com.zbkj.common.request; +import com.anji.captcha.model.vo.CaptchaVO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; /** * PC登录请求对象 * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -30,11 +32,6 @@ public class SystemAdminLoginRequest { @Length(min = 6, max = 30 ,message = "密码长度在6-30个字符") private String pwd; - @ApiModelProperty(value = "key", required = true) - @NotEmpty(message = "验证码key 不能为空") - private String key; - - @ApiModelProperty(value = "code", required = true) - @NotEmpty(message = "验证码 不能为空") - private String code; + @ApiModelProperty(value = "行为验证码对象") + private CaptchaVO captchaVO; } diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemAdminRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemAdminRequest.java index bd777ff7..c14d559f 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemAdminRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemAdminRequest.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemAdminUpdateRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemAdminUpdateRequest.java index e2cc342e..a0272e5a 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemAdminUpdateRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemAdminUpdateRequest.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemAttachmentMoveRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemAttachmentMoveRequest.java index 8d51a5a8..5f3cbe1d 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemAttachmentMoveRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemAttachmentMoveRequest.java @@ -11,7 +11,7 @@ import javax.validation.constraints.NotNull; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemAttachmentRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemAttachmentRequest.java index 09634101..6426f80f 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemAttachmentRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemAttachmentRequest.java @@ -10,7 +10,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemCityRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemCityRequest.java index ffd4afdf..324be816 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemCityRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemCityRequest.java @@ -19,7 +19,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemCitySearchRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemCitySearchRequest.java index f46650f9..cf31b32c 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemCitySearchRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemCitySearchRequest.java @@ -17,7 +17,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemConfigAdminRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemConfigAdminRequest.java index 76541a69..e18be0d1 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemConfigAdminRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemConfigAdminRequest.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemFormCheckRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemFormCheckRequest.java index 51c6a3a1..e1892f56 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemFormCheckRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemFormCheckRequest.java @@ -17,7 +17,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemFormItemCheckRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemFormItemCheckRequest.java index 00400899..ab5a4266 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemFormItemCheckRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemFormItemCheckRequest.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemFormTempRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemFormTempRequest.java index c7e09777..9a836709 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemFormTempRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemFormTempRequest.java @@ -20,7 +20,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemFormTempSearchRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemFormTempSearchRequest.java index 30db6e63..a2ce6382 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemFormTempSearchRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemFormTempSearchRequest.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemGroupDataRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemGroupDataRequest.java index a64e41dd..f7c673cb 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemGroupDataRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemGroupDataRequest.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemGroupDataSearchRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemGroupDataSearchRequest.java index ff9b002a..507c011f 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemGroupDataSearchRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemGroupDataSearchRequest.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemGroupRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemGroupRequest.java index 95ff89a4..10a9ebc7 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemGroupRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemGroupRequest.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemGroupSearchRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemGroupSearchRequest.java index 4480427a..bdd2201f 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemGroupSearchRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemGroupSearchRequest.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemMenuSearchRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemMenuSearchRequest.java index dd301a44..4c835509 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemMenuSearchRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemMenuSearchRequest.java @@ -10,7 +10,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemRoleRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemRoleRequest.java index 3b07f828..9c021dd5 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemRoleRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemRoleRequest.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemRoleSearchRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemRoleSearchRequest.java index e9760315..6d01fdbc 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemRoleSearchRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemRoleSearchRequest.java @@ -8,7 +8,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemStoreRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemStoreRequest.java index 24d54e3e..66311466 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemStoreRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemStoreRequest.java @@ -17,7 +17,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemStoreSearchRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemStoreSearchRequest.java index b1be919a..c8ab1a6b 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemStoreSearchRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemStoreSearchRequest.java @@ -16,7 +16,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemStoreStaffRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemStoreStaffRequest.java index 7d648998..23fc8cc2 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemStoreStaffRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemStoreStaffRequest.java @@ -20,7 +20,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemUserLevelRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemUserLevelRequest.java index 7b375504..b2fe62c9 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemUserLevelRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemUserLevelRequest.java @@ -19,7 +19,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemUserLevelUpdateShowRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemUserLevelUpdateShowRequest.java index 52c5cb82..2ff6ce72 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemUserLevelUpdateShowRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemUserLevelUpdateShowRequest.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemWriteOffOrderSearchRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemWriteOffOrderSearchRequest.java index ba05038f..ef978edd 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemWriteOffOrderSearchRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/SystemWriteOffOrderSearchRequest.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UpdateUserLevelRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UpdateUserLevelRequest.java index 34e35ca9..e3dbeb32 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UpdateUserLevelRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UpdateUserLevelRequest.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserAddressCityRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserAddressCityRequest.java index d18df0b2..dd4885d6 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserAddressCityRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserAddressCityRequest.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserAddressDelRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserAddressDelRequest.java index 00db12d0..f8d6f92e 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserAddressDelRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserAddressDelRequest.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserAddressRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserAddressRequest.java index 5271c205..c931d094 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserAddressRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserAddressRequest.java @@ -18,7 +18,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserBindingPhoneUpdateRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserBindingPhoneUpdateRequest.java index 7e723854..a979f1ca 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserBindingPhoneUpdateRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserBindingPhoneUpdateRequest.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserCollectAllRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserCollectAllRequest.java index 4bae59cc..86497915 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserCollectAllRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserCollectAllRequest.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserCollectRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserCollectRequest.java index 27bdee81..f12ae7fb 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserCollectRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserCollectRequest.java @@ -17,7 +17,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserCouponReceiveRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserCouponReceiveRequest.java index e625423f..577fcd31 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserCouponReceiveRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserCouponReceiveRequest.java @@ -17,7 +17,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserEditRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserEditRequest.java index c9f5d1c9..bcd4514c 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserEditRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserEditRequest.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserExtractRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserExtractRequest.java index 75f8a87c..cfeae0d2 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserExtractRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserExtractRequest.java @@ -19,7 +19,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相关版权 * +---------------------------------------------------------------------- @@ -29,10 +29,10 @@ import java.math.BigDecimal; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@ApiModel(value="UserExtractRequest对象", description="用户提现") +@ApiModel(value = "UserExtractRequest对象", description = "用户提现") public class UserExtractRequest implements Serializable { - private static final long serialVersionUID=1L; + private static final long serialVersionUID = 1L; @ApiModelProperty(value = "姓名") @NotBlank(message = "提现用户名称必须填写") @@ -57,7 +57,7 @@ public class UserExtractRequest implements Serializable { @ApiModelProperty(value = "提现金额") @JsonProperty(value = "money") @NotNull(message = "请输入提现金额") - @DecimalMin(value = "0.1", message = "提现金额不能小于0.1") + @DecimalMin(value = "0.01", message = "提现金额不能小于0.01") private BigDecimal extractPrice; @ApiModelProperty(value = "微信号") diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserExtractSearchRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserExtractSearchRequest.java index 2057559e..66181111 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserExtractSearchRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserExtractSearchRequest.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserGroupRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserGroupRequest.java index 783ed934..8ce4678b 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserGroupRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserGroupRequest.java @@ -18,7 +18,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserOperateIntegralMoneyRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserOperateIntegralMoneyRequest.java index 12ff9201..79ecd972 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserOperateIntegralMoneyRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserOperateIntegralMoneyRequest.java @@ -16,7 +16,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserRechargeRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserRechargeRequest.java index 028b6f3f..93fc9f3e 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserRechargeRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserRechargeRequest.java @@ -16,7 +16,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserRechargeSearchRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserRechargeSearchRequest.java index 1ee51649..aa26beb2 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserRechargeSearchRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserRechargeSearchRequest.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserSearchRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserSearchRequest.java index 10912ae5..10fd7944 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserSearchRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserSearchRequest.java @@ -17,7 +17,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserSpreadPeopleRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserSpreadPeopleRequest.java index 0d89a0c9..839db286 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserSpreadPeopleRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserSpreadPeopleRequest.java @@ -1,5 +1,6 @@ package com.zbkj.common.request; +import com.zbkj.common.annotation.StringContains; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,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相关版权 * +---------------------------------------------------------------------- @@ -39,8 +40,10 @@ public class UserSpreadPeopleRequest implements Serializable { private String keyword; @ApiModelProperty(value = "排序, 排序|childCount=团队排序,numberCount=金额排序,orderCount=订单排序", allowableValues = "range[childCount,numberCount,orderCount]") + @StringContains(limitValues = {"childCount", "numberCount", "orderCount"}, message = "未知的排序规则") private String sortKey; @ApiModelProperty(value = "排序值 DESC ASC") + @StringContains(limitValues = {"DESC", "ASC"}, message = "未知的排序值") private String isAsc = "DESC"; } diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserTagRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserTagRequest.java index 2841b08e..c34070c6 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserTagRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserTagRequest.java @@ -19,7 +19,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserUpdateRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserUpdateRequest.java index ec8d4cf4..09cbb3dc 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserUpdateRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserUpdateRequest.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserUpdateSpreadRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserUpdateSpreadRequest.java index 34c37cc2..6dba387e 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserUpdateSpreadRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/UserUpdateSpreadRequest.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/VideoOrderSendRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/VideoOrderSendRequest.java index d264f9b6..9579c4cb 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/VideoOrderSendRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/VideoOrderSendRequest.java @@ -13,7 +13,7 @@ import javax.validation.constraints.NotBlank; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/WechatProgramMyTempSearchRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/WechatProgramMyTempSearchRequest.java index c29ce205..5ce7a62a 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/WechatProgramMyTempSearchRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/WechatProgramMyTempSearchRequest.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/WechatReplyRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/WechatReplyRequest.java index 9b8d579e..c3ff1da8 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/WechatReplyRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/WechatReplyRequest.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/WechatReplySearchRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/WechatReplySearchRequest.java index 871b8d93..f4972edc 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/WechatReplySearchRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/WechatReplySearchRequest.java @@ -18,7 +18,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/WxBindingPhoneRequest.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/WxBindingPhoneRequest.java index 84cba0f1..e7bc9cd8 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/WxBindingPhoneRequest.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/WxBindingPhoneRequest.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/ApplyRefundOrderInfoResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/ApplyRefundOrderInfoResponse.java index 8bee7e1d..9d534fc7 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/ApplyRefundOrderInfoResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/ApplyRefundOrderInfoResponse.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/ArticleResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/ArticleResponse.java index 22708c14..1f773aa8 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/ArticleResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/ArticleResponse.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/AttrValueResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/AttrValueResponse.java index 63ef0146..9f450962 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/AttrValueResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/AttrValueResponse.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相关版权 * +---------------------------------------------------------------------- @@ -84,4 +84,7 @@ public class AttrValueResponse implements Serializable { @ApiModelProperty(value = "砍价商品最低价|砍价专用字段") private BigDecimal minPrice; + + @ApiModelProperty(value = "商品条码") + private String barCode; } diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/BalanceResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/BalanceResponse.java index a4c09a61..a2161429 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/BalanceResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/BalanceResponse.java @@ -14,7 +14,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/BargainDetailH5Response.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/BargainDetailH5Response.java index 5d8e2ec0..1769f4b6 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/BargainDetailH5Response.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/BargainDetailH5Response.java @@ -14,7 +14,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相关版权 * +---------------------------------------------------------------------- @@ -63,8 +63,8 @@ public class BargainDetailH5Response implements Serializable { // 单个活动每个用户发起砍价次数限制 private Integer num; - @ApiModelProperty(value = "砍价活动简介") - private String info; +// @ApiModelProperty(value = "砍价活动简介") +// private String info; // @ApiModelProperty(value = "砍价规则") // private String rule; diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/BargainHeaderResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/BargainHeaderResponse.java index bc295ad2..730df6d0 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/BargainHeaderResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/BargainHeaderResponse.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/BargainIndexResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/BargainIndexResponse.java index 541a2aac..51836d90 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/BargainIndexResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/BargainIndexResponse.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/BargainRecordResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/BargainRecordResponse.java index 5ea389a8..42e9f2a7 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/BargainRecordResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/BargainRecordResponse.java @@ -17,7 +17,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/BargainUserInfoResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/BargainUserInfoResponse.java index 61f552a0..78b98a89 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/BargainUserInfoResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/BargainUserInfoResponse.java @@ -16,7 +16,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/CartInfoResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/CartInfoResponse.java index 6349d00d..b83f3517 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/CartInfoResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/CartInfoResponse.java @@ -14,7 +14,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/CombinationDetailH5Response.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/CombinationDetailH5Response.java index 731d96cb..a37fef32 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/CombinationDetailH5Response.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/CombinationDetailH5Response.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相关版权 * +---------------------------------------------------------------------- @@ -50,8 +50,8 @@ public class CombinationDetailH5Response implements Serializable { @ApiModelProperty(value = "参团人数") private Integer people; - @ApiModelProperty(value = "简介") - private String storeInfo; +// @ApiModelProperty(value = "简介") +// private String storeInfo; @ApiModelProperty(value = "价格") private BigDecimal price; diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/CombinationDetailResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/CombinationDetailResponse.java index 4de89079..d6959ab7 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/CombinationDetailResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/CombinationDetailResponse.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/CombinationHeaderResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/CombinationHeaderResponse.java index 163c9065..5528aa82 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/CombinationHeaderResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/CombinationHeaderResponse.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/CombinationIndexResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/CombinationIndexResponse.java index ed62ea83..5ddf3e1b 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/CombinationIndexResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/CombinationIndexResponse.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/CommonResult.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/CommonResult.java deleted file mode 100644 index c0e64983..00000000 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/CommonResult.java +++ /dev/null @@ -1,192 +0,0 @@ -package com.zbkj.common.response; - -import com.zbkj.common.vo.MyRecord; -import com.zbkj.common.exception.ExceptionCodeEnum; -import com.zbkj.common.exception.ExceptionHandler; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - * 公共返回对象 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - */ -public class CommonResult { - private long code; - private String message; - private T data; - - protected CommonResult() { - } - - protected CommonResult(long code, String message, T data) { - this.code = code; - this.message = message; - this.data = data; - } - - /** - * 成功返回结果 - */ - public static CommonResult success() { - return new CommonResult(ExceptionCodeEnum.SUCCESS.getCode(), ExceptionCodeEnum.SUCCESS.getMessage(), null); - } - - /** - * 成功返回结果 - */ - public static CommonResult success(String message) { - return new CommonResult(ExceptionCodeEnum.SUCCESS.getCode(), message, null); - } - - /** - * 成功返回结果 - * - * @param data 获取的数据 - */ - public static CommonResult success(T data) { - return new CommonResult(ExceptionCodeEnum.SUCCESS.getCode(), ExceptionCodeEnum.SUCCESS.getMessage(), data); - } - - /** - * 成功返回结果 - * - * @param record 获取的数据 - */ - public static CommonResult> success(MyRecord record) { - return new CommonResult<>(ExceptionCodeEnum.SUCCESS.getCode(), ExceptionCodeEnum.SUCCESS.getMessage(), record.getColumns()); - } - - /** - * 成功返回结果 - * - * @param recordList 获取的数据 - */ - public static CommonResult>> success(List recordList) { - List> list = new ArrayList<>(); - recordList.forEach(i -> { - list.add(i.getColumns()); - }); - return new CommonResult<>(ExceptionCodeEnum.SUCCESS.getCode(), ExceptionCodeEnum.SUCCESS.getMessage(), list); - } - - /** - * 成功返回结果 - * - * @param data 获取的数据 - * @param message 提示信息 - */ - public static CommonResult success(T data, String message) { - return new CommonResult(ExceptionCodeEnum.SUCCESS.getCode(), message, data); - } - - /** - * 失败返回结果 - * @param errorCode 错误码 - */ - public static CommonResult failed(ExceptionHandler errorCode) { - System.out.println("errorCode1:" + errorCode); - return new CommonResult(errorCode.getCode(), errorCode.getMessage(), null); - } - - /** - * 失败返回结果 - * @param errorCode 错误码 - * @param message 错误信息 - */ - public static CommonResult failed(ExceptionHandler errorCode,String message) { - System.out.println("errorCode2:" + errorCode); - return new CommonResult(errorCode.getCode(), message, null); - } - - /** - * 失败返回结果 - * @param message 提示信息 - */ - public static CommonResult failed(String message) { - return new CommonResult(ExceptionCodeEnum.FAILED.getCode(), message, null); - } - - /** - * 失败返回结果 - */ - public static CommonResult failed() { - return failed(ExceptionCodeEnum.FAILED); - } - - /** - * 参数验证失败返回结果 - */ - public static CommonResult validateFailed() { - return failed(ExceptionCodeEnum.VALIDATE_FAILED); - } - - /** - * 参数验证失败返回结果 - * @param message 提示信息 - */ - public static CommonResult validateFailed(String message) { - return new CommonResult(ExceptionCodeEnum.VALIDATE_FAILED.getCode(), message, null); - } - - /** - * 未登录返回结果 - */ - public static CommonResult unauthorized(T data) { - return new CommonResult(ExceptionCodeEnum.UNAUTHORIZED.getCode(), ExceptionCodeEnum.UNAUTHORIZED.getMessage(), data); - } - - /** - * 未登录返回结果 - */ - public static CommonResult unauthorized() { - return new CommonResult(ExceptionCodeEnum.UNAUTHORIZED.getCode(), ExceptionCodeEnum.UNAUTHORIZED.getMessage(), null); - } - - /** - * 没有权限查看 - */ - public static CommonResult forbidden() { - return new CommonResult(ExceptionCodeEnum.FORBIDDEN.getCode(), ExceptionCodeEnum.FORBIDDEN.getMessage(), null); - } - - /** - * 未授权返回结果 - */ - public static CommonResult forbidden(T data) { - return new CommonResult(ExceptionCodeEnum.FORBIDDEN.getCode(), ExceptionCodeEnum.FORBIDDEN.getMessage(), data); - } - - public long getCode() { - return code; - } - - public void setCode(long code) { - this.code = code; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public T getData() { - return data; - } - - public void setData(T data) { - this.data = data; - } -} diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/ComputedOrderPriceResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/ComputedOrderPriceResponse.java index 5ed4a137..9b428194 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/ComputedOrderPriceResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/ComputedOrderPriceResponse.java @@ -14,7 +14,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/GoPinkResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/GoPinkResponse.java index 253dfd81..9502518d 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/GoPinkResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/GoPinkResponse.java @@ -11,7 +11,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/HomeOperatingDataResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/HomeOperatingDataResponse.java index 6eda5ff2..cadadadb 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/HomeOperatingDataResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/HomeOperatingDataResponse.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/HomeRateResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/HomeRateResponse.java index a4d67299..870a9111 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/HomeRateResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/HomeRateResponse.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/IndexInfoResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/IndexInfoResponse.java index cb4f8d95..8fdace74 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/IndexInfoResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/IndexInfoResponse.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- @@ -68,4 +68,7 @@ public class IndexInfoResponse implements Serializable { @ApiModelProperty(value = "首页商品列表模板配置") private String homePageSaleListStyle; + + @ApiModelProperty(value = "微信小程序客服额外开关") + private String wxChatIndependent; } diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/IndexProductResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/IndexProductResponse.java index b99ef989..52553a30 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/IndexProductResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/IndexProductResponse.java @@ -1,5 +1,6 @@ package com.zbkj.common.response; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,7 +14,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相关版权 * +---------------------------------------------------------------------- @@ -48,6 +49,12 @@ public class IndexProductResponse { @ApiModelProperty(value = "虚拟销量") private Integer ficti; + @ApiModelProperty(value = "好评率") + private String positiveRatio; + + @ApiModelProperty(value = "评论数量") + private Integer replyNum; + @ApiModelProperty(value = "单位名") private String unitName; @@ -65,4 +72,8 @@ public class IndexProductResponse { @ApiModelProperty(value = "展示图") private String flatPattern; + + @ApiModelProperty(value = "活动边框 列表中是边框 详情中是背景图") + @TableField(exist = false) + private String activityStyle; } diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/IntegralUserResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/IntegralUserResponse.java index 38e813a8..e26a5014 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/IntegralUserResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/IntegralUserResponse.java @@ -14,7 +14,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/LoginResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/LoginResponse.java index 19b08cc5..85dae679 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/LoginResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/LoginResponse.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/MenusResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/MenusResponse.java index 74310393..00b8a5fd 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/MenusResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/MenusResponse.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/MonitorResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/MonitorResponse.java index e369a622..2d613395 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/MonitorResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/MonitorResponse.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/NotificationInfoResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/NotificationInfoResponse.java index 66c0078c..af79dfe6 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/NotificationInfoResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/NotificationInfoResponse.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/OrderBrokerageData.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/OrderBrokerageData.java index 97fe3fe7..352982d9 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/OrderBrokerageData.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/OrderBrokerageData.java @@ -9,7 +9,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/OrderDataResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/OrderDataResponse.java index a032233d..d2cc31e4 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/OrderDataResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/OrderDataResponse.java @@ -14,7 +14,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/OrderDetailResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/OrderDetailResponse.java index 62d62f4d..78c2aa7a 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/OrderDetailResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/OrderDetailResponse.java @@ -18,7 +18,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/OrderInfoResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/OrderInfoResponse.java index 9367b0a0..ca521c8c 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/OrderInfoResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/OrderInfoResponse.java @@ -14,7 +14,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相关版权 * +---------------------------------------------------------------------- @@ -32,7 +32,7 @@ public class OrderInfoResponse implements Serializable { // @ApiModelProperty(value = "订单id") // private Integer orderId; @ApiModelProperty(value = "attrId") - private Integer attrId; + private String attrId; @ApiModelProperty(value = "商品ID") private Integer productId; diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/OrderPayResultResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/OrderPayResultResponse.java index dc1300c2..9017d1de 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/OrderPayResultResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/OrderPayResultResponse.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- @@ -40,9 +40,4 @@ public class OrderPayResultResponse { @ApiModelProperty(value = "订单编号") private String orderNo; - @ApiModelProperty(value = "订单支付宝支付") - private String alipayRequest; - - @ApiModelProperty(value = "支付宝调起支付参数对象（app支付专用）") - private AliPayJsResultVo aliPayConfig; } diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/OrderProductReplyResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/OrderProductReplyResponse.java index d650a1da..cc408faf 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/OrderProductReplyResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/OrderProductReplyResponse.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/PreOrderResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/PreOrderResponse.java index 4023d44c..129fe54c 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/PreOrderResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/PreOrderResponse.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/ProductActivityItemResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/ProductActivityItemResponse.java index b4aed070..010e8210 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/ProductActivityItemResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/ProductActivityItemResponse.java @@ -8,7 +8,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/ProductDetailReplyResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/ProductDetailReplyResponse.java index c70ab377..923e52fe 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/ProductDetailReplyResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/ProductDetailReplyResponse.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/ProductDetailResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/ProductDetailResponse.java index 9b12e401..c7b36e74 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/ProductDetailResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/ProductDetailResponse.java @@ -17,7 +17,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/ProductRankingResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/ProductRankingResponse.java deleted file mode 100644 index 8055be79..00000000 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/ProductRankingResponse.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.zbkj.common.response; - -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. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value="ProductRankingResponse对象", description="商品排行响应对象") -public class ProductRankingResponse implements Serializable { - - private static final long serialVersionUID = 3362714265772774491L; - - @ApiModelProperty(value = "顺序") - private Integer sort; - - @ApiModelProperty(value = "商品id") - private Integer productId; - - @ApiModelProperty(value = "浏览量") - private Integer pageView; - - @ApiModelProperty(value = "收藏量") - private Integer collectNum; - - @ApiModelProperty(value = "加购件数") - private Integer addCartNum; - - @ApiModelProperty(value = "下单商品数（销售件数）") - private Integer salesNum; - - @ApiModelProperty(value = "销售额") - private BigDecimal salesAmount; - - @ApiModelProperty(value = "商品名称") - private String proName; - - @ApiModelProperty(value = "商品图片") - private String image; -} diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/ProductReplyResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/ProductReplyResponse.java index 662c7e90..2220a8c6 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/ProductReplyResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/ProductReplyResponse.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/RoleInfoResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/RoleInfoResponse.java index eb6928d0..626e0cd1 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/RoleInfoResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/RoleInfoResponse.java @@ -16,7 +16,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SecKillDetailH5Response.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SecKillDetailH5Response.java index 5a04d7ae..06afba57 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SecKillDetailH5Response.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SecKillDetailH5Response.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相关版权 * +---------------------------------------------------------------------- @@ -48,8 +48,8 @@ public class SecKillDetailH5Response implements Serializable { @ApiModelProperty(value = "秒杀商品名称") private String storeName; - @ApiModelProperty(value = "简介") - private String storeInfo; +// @ApiModelProperty(value = "简介") +// private String storeInfo; @ApiModelProperty(value = "价格") private BigDecimal price; diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SecKillResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SecKillResponse.java index 615d84be..d040e6ac 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SecKillResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SecKillResponse.java @@ -11,7 +11,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SeckillIndexResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SeckillIndexResponse.java index 20106d56..a0628006 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SeckillIndexResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SeckillIndexResponse.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/ShoppingProductDataResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/ShoppingProductDataResponse.java deleted file mode 100644 index 1b46cca5..00000000 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/ShoppingProductDataResponse.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.zbkj.common.response; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * 商城商品统计数据对象 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value="ShoppingProductDataResponse对象", description="商城商品统计数据对象") -public class ShoppingProductDataResponse implements Serializable { - - private static final long serialVersionUID = -2853994865375523003L; - - @ApiModelProperty(value = "新增商品数量") - private Integer newProductNum; - - @ApiModelProperty(value = "新增商品数量环比") - private String newProductNumRatio; - - @ApiModelProperty(value = "浏览量") - private Integer pageView; - - @ApiModelProperty(value = "浏览量环比") - private String pageViewRatio; - - @ApiModelProperty(value = "收藏量") - private Integer collectNum; - - @ApiModelProperty(value = "收藏量环比") - private String collectNumRatio; - - @ApiModelProperty(value = "加购件数") - private Integer addCartNum; - - @ApiModelProperty(value = "加购件数环比") - private String addCartNumRatio; - - @ApiModelProperty(value = "交易总件数") - private Integer orderProductNum; - - @ApiModelProperty(value = "交易总件数环比") - private String orderProductNumRatio; - - @ApiModelProperty(value = "交易成功件数") - private Integer orderSuccessProductNum; - - @ApiModelProperty(value = "交易成功件数环比") - private String orderSuccessProductNumRatio; - -} diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SpreadCommissionDetailResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SpreadCommissionDetailResponse.java index 1678d4ee..3f4ae0c7 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SpreadCommissionDetailResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SpreadCommissionDetailResponse.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SpreadOrderResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SpreadOrderResponse.java index d18d2561..420c87a4 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SpreadOrderResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SpreadOrderResponse.java @@ -2,6 +2,9 @@ package com.zbkj.common.response; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.zbkj.common.utils.CustomerBigDecimalSerialize; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,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相关版权 * +---------------------------------------------------------------------- @@ -41,6 +44,7 @@ public class SpreadOrderResponse { @ApiModelProperty(value = "用户电话") private String userPhone; + @JsonSerialize(using = CustomerBigDecimalSerialize.class) @ApiModelProperty(value = "佣金金额") private BigDecimal price; diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SpreadUserResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SpreadUserResponse.java index 467e99bb..40693868 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SpreadUserResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SpreadUserResponse.java @@ -14,7 +14,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreBargainDetailResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreBargainDetailResponse.java index f7cfb398..88b37828 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreBargainDetailResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreBargainDetailResponse.java @@ -14,7 +14,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreBargainResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreBargainResponse.java index 090bcd31..cb5d7c57 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreBargainResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreBargainResponse.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- @@ -80,8 +80,8 @@ public class StoreBargainResponse { @ApiModelProperty(value = "反多少积分") private Integer giveIntegral; - @ApiModelProperty(value = "砍价活动简介") - private String info; +// @ApiModelProperty(value = "砍价活动简介") +// private String info; @ApiModelProperty(value = "成本价") private BigDecimal cost; diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreBargainUserHelpResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreBargainUserHelpResponse.java index df5039e4..2615ed87 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreBargainUserHelpResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreBargainUserHelpResponse.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreBargainUserResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreBargainUserResponse.java index 87f2a798..8bd21954 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreBargainUserResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreBargainUserResponse.java @@ -16,7 +16,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreCategoryTreeList.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreCategoryTreeList.java index 9adbb8d5..7622059e 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreCategoryTreeList.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreCategoryTreeList.java @@ -10,7 +10,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreCombinationH5Response.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreCombinationH5Response.java index 3d15b796..2f5505d4 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreCombinationH5Response.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreCombinationH5Response.java @@ -14,7 +14,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreCombinationResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreCombinationResponse.java index 023d3c19..6f080b3e 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreCombinationResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreCombinationResponse.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- @@ -49,8 +49,8 @@ public class StoreCombinationResponse implements Serializable { @ApiModelProperty(value = "参团人数") private Integer people; - @ApiModelProperty(value = "简介") - private String info; +// @ApiModelProperty(value = "简介") +// private String info; @ApiModelProperty(value = "价格") private BigDecimal price; diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreCouponFrontResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreCouponFrontResponse.java index 79bb993b..b24767ba 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreCouponFrontResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreCouponFrontResponse.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreCouponInfoResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreCouponInfoResponse.java index 2989df9c..0550c560 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreCouponInfoResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreCouponInfoResponse.java @@ -17,7 +17,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreCouponUserOrder.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreCouponUserOrder.java index c3033e03..3a3dcd83 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreCouponUserOrder.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreCouponUserOrder.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreCouponUserResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreCouponUserResponse.java index 48ded196..0b0b3b75 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreCouponUserResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreCouponUserResponse.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreNearResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreNearResponse.java index 034ec02e..8ff00a95 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreNearResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreNearResponse.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- @@ -30,9 +30,6 @@ public class StoreNearResponse implements Serializable { private static final long serialVersionUID=1L; - @ApiModelProperty(value = "腾讯地图key") - private String tengXunMapKey; - @ApiModelProperty(value = "附近的门店列表", required = true) private List list; diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderCountItemResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderCountItemResponse.java index 39706035..e697b834 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderCountItemResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderCountItemResponse.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderDetailInfoResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderDetailInfoResponse.java index 663ae29a..0d4cd292 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderDetailInfoResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderDetailInfoResponse.java @@ -17,7 +17,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相关版权 * +---------------------------------------------------------------------- @@ -198,8 +198,6 @@ public class StoreOrderDetailInfoResponse implements Serializable { // private List pVerifyCodes; @ApiModelProperty(value = "系统门店信息") private SystemStore systemStore; - @ApiModelProperty(value = "腾讯地图key") - private String mapKey; @ApiModelProperty(value = "订单状态图标") private String statusPic; @ApiModelProperty(value = "订单详情") diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderDetailResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderDetailResponse.java index 5073f411..96f856b4 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderDetailResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderDetailResponse.java @@ -19,7 +19,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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,11 +94,14 @@ public class StoreOrderDetailResponse implements Serializable { @ApiModelProperty(value = "用户姓名") private String realName; -// @ApiModelProperty(value = "备注") -// private String mark; + @ApiModelProperty(value = "商品总价") + private BigDecimal proTotalPrice; -// @ApiModelProperty(value = "订单总价") -// private BigDecimal totalPrice; + @ApiModelProperty(value = "优惠券金额") + private BigDecimal couponPrice; + + @ApiModelProperty(value = "改价前支付金额") + private BigDecimal beforePayPrice; @ApiModelProperty(value = "支付状态") private Boolean paid; @@ -108,4 +111,13 @@ public class StoreOrderDetailResponse implements Serializable { @ApiModelProperty(value = "是否改价,0-否，1-是") private Boolean isAlterPrice; + + @ApiModelProperty(value = "商家寄件单号图片") + private String shipmentPic; + + @ApiModelProperty(value = "商家寄件订单任务id") + private String shipmentTaskId; + + @ApiModelProperty(value = "商家寄件订单单号") + private String shipmentOrderId; } diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderInfoResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderInfoResponse.java index c8415994..be417cb6 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderInfoResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderInfoResponse.java @@ -19,7 +19,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -82,15 +82,21 @@ public class StoreOrderInfoResponse implements Serializable { @ApiModelProperty(value = "0 未退款 1 申请中 2 已退款") private Integer refundStatus; + @ApiModelProperty(value = "发货记录类型，1正常、2电子面单,3商家发货 发货类型必传 =3 时根据描述填写必填字段，注意为了方便本身不做必填校验") + private String expressRecordType; + @ApiModelProperty(value = "快递名称/送货人姓名") private String deliveryName; - @ApiModelProperty(value = "发货类型") + @ApiModelProperty(value = "发货类型 express 发货，send 送货，fictitious虚拟") private String deliveryType; @ApiModelProperty(value = "快递单号/手机号") private String deliveryId; + @ApiModelProperty(value = "快递公司简称") + private String deliveryCode; + @ApiModelProperty(value = "备注") private String mark; @@ -141,4 +147,22 @@ public class StoreOrderInfoResponse implements Serializable { @ApiModelProperty(value = "退款时间") private Date refundReasonTime; + + @ApiModelProperty(value = "退款图片") + private String refundReasonWapImg; + + @ApiModelProperty(value = "商家寄件单号图片") + private String shipmentPic; + + @ApiModelProperty(value = "商家寄件订单任务id") + private String shipmentTaskId; + + @ApiModelProperty(value = "商家寄件订单单号") + private String shipmentOrderId; + + @ApiModelProperty(value = "商家寄件快递单号") + private String shipmentNum; + + @ApiModelProperty(value = "订单类型") + private String orderTypeText; } diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderItemResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderItemResponse.java index f7cafb80..0d639e37 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderItemResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderItemResponse.java @@ -19,7 +19,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderSpreadInfoResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderSpreadInfoResponse.java index 9fc93297..6571dcf5 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderSpreadInfoResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderSpreadInfoResponse.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderStatisticsChartItemResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderStatisticsChartItemResponse.java index 52d771c0..1373f2a5 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderStatisticsChartItemResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderStatisticsChartItemResponse.java @@ -8,7 +8,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderStatisticsResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderStatisticsResponse.java index 9951869f..ec8a0a5d 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderStatisticsResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderStatisticsResponse.java @@ -11,7 +11,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderTopItemResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderTopItemResponse.java index b4768f86..180d333e 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderTopItemResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderTopItemResponse.java @@ -14,7 +14,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderVerificationConfirmResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderVerificationConfirmResponse.java index d8095b44..67f7c510 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderVerificationConfirmResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreOrderVerificationConfirmResponse.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StorePinkAdminListResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StorePinkAdminListResponse.java index f8371a77..9121cd54 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StorePinkAdminListResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StorePinkAdminListResponse.java @@ -10,7 +10,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StorePinkDetailResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StorePinkDetailResponse.java index 9260c3f8..dd701e3e 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StorePinkDetailResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StorePinkDetailResponse.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StorePinkResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StorePinkResponse.java index 6f5c6c71..aaeecfda 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StorePinkResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StorePinkResponse.java @@ -10,7 +10,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreProductAttrValueResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreProductAttrValueResponse.java index ba40896b..98960589 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreProductAttrValueResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreProductAttrValueResponse.java @@ -21,7 +21,7 @@ import java.util.HashMap; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreProductInfoResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreProductInfoResponse.java index 3ad687dd..3d1a2e5d 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreProductInfoResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreProductInfoResponse.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- @@ -42,8 +42,8 @@ public class StoreProductInfoResponse implements Serializable { @ApiModelProperty(value = "商品名称") private String storeName; - @ApiModelProperty(value = "商品简介") - private String storeInfo; +// @ApiModelProperty(value = "商品简介") +// private String storeInfo; @ApiModelProperty(value = "关键字") private String keyword; @@ -158,8 +158,8 @@ public class StoreProductInfoResponse implements Serializable { @ApiModelProperty(value = "商品状态|拼团专用") private Boolean isShow; - @ApiModelProperty(value = "简介|拼团专用") - private String info; +// @ApiModelProperty(value = "简介|拼团专用") +// private String info; @ApiModelProperty(value = "展示图") private String flatPattern; diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreProductReplayCountResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreProductReplayCountResponse.java index ccc20344..afa2fe6d 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreProductReplayCountResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreProductReplayCountResponse.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreProductReplyResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreProductReplyResponse.java index 915a0432..dc92c04c 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreProductReplyResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreProductReplyResponse.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreProductResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreProductResponse.java index 7226782f..275af073 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreProductResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreProductResponse.java @@ -22,7 +22,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相关版权 * +---------------------------------------------------------------------- @@ -52,8 +52,8 @@ public class StoreProductResponse implements Serializable { @ApiModelProperty(value = "商品名称") private String storeName; - @ApiModelProperty(value = "商品简介") - private String storeInfo; +// @ApiModelProperty(value = "商品简介") +// private String storeInfo; @ApiModelProperty(value = "关键字") private String keyword; @@ -196,8 +196,8 @@ public class StoreProductResponse implements Serializable { @ApiModelProperty(value = "活动标题") private String title; - @ApiModelProperty(value = "简介") - private String info; +// @ApiModelProperty(value = "简介") +// private String info; @ApiModelProperty(value = "时间段ID") private Integer timeId; diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreProductTabsHeader.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreProductTabsHeader.java index 7a8930de..274d413e 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreProductTabsHeader.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreProductTabsHeader.java @@ -7,7 +7,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreSecKillH5Response.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreSecKillH5Response.java index 034a413b..e59c398c 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreSecKillH5Response.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreSecKillH5Response.java @@ -14,7 +14,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreSeckillDetailResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreSeckillDetailResponse.java index c1a118a5..70d964c0 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreSeckillDetailResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreSeckillDetailResponse.java @@ -16,7 +16,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreSeckillManagerResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreSeckillManagerResponse.java index a993565a..13779f0b 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreSeckillManagerResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreSeckillManagerResponse.java @@ -2,18 +2,19 @@ package com.zbkj.common.response; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.common.utils.CrmebDateUtil; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; +import java.util.Objects; /** * StoreSeckillMsnsgerResponse * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -32,17 +33,17 @@ public class StoreSeckillManagerResponse { // 秒杀状态【仅仅前端用】 killStatus 1=即将开始 0=关闭 2=进行中 -1=已结束 public String getStatusName() { String _statusName = null; - int currentHour = DateUtil.getCurrentHour(); - if(status == 1 && currentHour < startTime){ + int currentHour = CrmebDateUtil.getCurrentHour(); + if(Objects.equals(status, "'1'") && currentHour < startTime){ _statusName = "即将开始"; } - else if(status == 0) { + else if(Objects.equals(status, "'0'")) { _statusName = "关闭"; } - else if(status == 1 && currentHour < endTime) { + else if(Objects.equals(status, "'1'") && currentHour < endTime) { _statusName = "进行中"; } - else if(status == 1 && currentHour >= endTime) { + else if(Objects.equals(status, "'1'") && currentHour >= endTime) { _statusName = "已结束"; } return _statusName; @@ -50,22 +51,23 @@ public class StoreSeckillManagerResponse { public Integer getKillStatus() { Integer _killStatus = null; - if(status == 1 && DateUtil.getCurrentHour() < startTime){ + if(Objects.equals(status, "'1'") && CrmebDateUtil.getCurrentHour() < startTime){ _killStatus = 1; } - else if(status == 0) { + else if(Objects.equals(status, "'0'")) { _killStatus = 0; } - else if(status == 1 && DateUtil.getCurrentHour() >= startTime - && DateUtil.getCurrentHour() < endTime) { + else if(Objects.equals(status, "'1'") && CrmebDateUtil.getCurrentHour() >= startTime + && CrmebDateUtil.getCurrentHour() < endTime) { _killStatus = 2; } - else if(status == 1 && DateUtil.getCurrentHour() >= endTime) { + else if(Objects.equals(status, "'1'") && CrmebDateUtil.getCurrentHour() >= endTime) { _killStatus = -1; } return _killStatus; } + @TableId(value = "id", type = IdType.AUTO) private Integer id; @@ -93,7 +95,7 @@ public class StoreSeckillManagerResponse { private Integer sort; @ApiModelProperty(value = "状态 0=关闭 1=开启") - private Integer status; + private String status; @ApiModelProperty(value = "创建时间") private Date createTime; @@ -106,4 +108,5 @@ public class StoreSeckillManagerResponse { @ApiModelProperty(value = "秒杀状态String 未开始/进行中/活动已结束") private String statusName; + } diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreSeckillResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreSeckillResponse.java index a9f9bc34..e1387e40 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreSeckillResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreSeckillResponse.java @@ -17,7 +17,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相关版权 * +---------------------------------------------------------------------- @@ -43,8 +43,8 @@ public class StoreSeckillResponse { @ApiModelProperty(value = "活动标题") private String title; - @ApiModelProperty(value = "简介") - private String info; +// @ApiModelProperty(value = "简介") +// private String info; @ApiModelProperty(value = "价格") private BigDecimal price; diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreStaffDetail.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreStaffDetail.java index bebd642b..460f02c9 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreStaffDetail.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreStaffDetail.java @@ -9,7 +9,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreStaffTopDetail.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreStaffTopDetail.java index 3aded6e7..e3f2a290 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreStaffTopDetail.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/StoreStaffTopDetail.java @@ -9,7 +9,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SystemAdminResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SystemAdminResponse.java index 0a596fd8..dd22c6fd 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SystemAdminResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SystemAdminResponse.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SystemGroupDataAdminLoginBannerResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SystemGroupDataAdminLoginBannerResponse.java index e981044c..5deceb18 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SystemGroupDataAdminLoginBannerResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SystemGroupDataAdminLoginBannerResponse.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SystemGroupDataOrderStatusPicResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SystemGroupDataOrderStatusPicResponse.java index d5f40bff..94d32d7e 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SystemGroupDataOrderStatusPicResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SystemGroupDataOrderStatusPicResponse.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SystemLoginResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SystemLoginResponse.java index ab375a75..e7c93bd9 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SystemLoginResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SystemLoginResponse.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SystemStoreStaffResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SystemStoreStaffResponse.java index 9ef9c75d..2f291200 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SystemStoreStaffResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SystemStoreStaffResponse.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SystemWriteOffOrderResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SystemWriteOffOrderResponse.java index bdd5bf0f..f3e689c4 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SystemWriteOffOrderResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/SystemWriteOffOrderResponse.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/TopDetail.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/TopDetail.java index d58eba78..081fbdf7 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/TopDetail.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/TopDetail.java @@ -10,7 +10,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/TradeDataResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/TradeDataResponse.java deleted file mode 100644 index 76dcf2fb..00000000 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/TradeDataResponse.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.zbkj.common.response; - -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. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value="TradeDataResponse对象", description="交易统计数据对象") -public class TradeDataResponse implements Serializable { - - private static final long serialVersionUID = -6332062115310922579L; - - @ApiModelProperty(value = "今日订单数量") - private Integer todayOrderNum; - - @ApiModelProperty(value = "昨日订单数量") - private Integer yesterdayOrderNum; - - @ApiModelProperty(value = "昨日交易数量日环比") - private String yesterdayOrderNumRatio; - - @ApiModelProperty(value = "昨日交易金额") - private BigDecimal yesterdayOrderSales; - - @ApiModelProperty(value = "昨日交易金额日环比") - private String yesterdayOrderSalesRatio; - - @ApiModelProperty(value = "本月交易数量") - private Integer monthOrderNum; - - @ApiModelProperty(value = "本月交易数量月环比") - private String monthOrderNumRatio; - - @ApiModelProperty(value = "本月交易金额") - private BigDecimal monthOrderSales; - - @ApiModelProperty(value = "本月交易金额月环比") - private String monthOrderSalesRatio; - -} diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/TradingDataResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/TradingDataResponse.java deleted file mode 100644 index 0002edcf..00000000 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/TradingDataResponse.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.zbkj.common.response; - -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. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value="TradingDataResponse对象", description="交易概览数据对象") -public class TradingDataResponse implements Serializable { - - private static final long serialVersionUID = -6332062115310922579L; - - @ApiModelProperty(value = "营业额") - private BigDecimal turnover; - - @ApiModelProperty(value = "营业额环比") - private String turnoverRatio; - - @ApiModelProperty(value = "商品支付金额") - private BigDecimal proPayAmount; - - @ApiModelProperty(value = "商品支付金额环比") - private String proPayAmountRatio; - - @ApiModelProperty(value = "充值金额") - private BigDecimal rechargeAmount; - - @ApiModelProperty(value = "充值金额环比") - private String rechargeAmountRatio; - - @ApiModelProperty(value = "支出金额") - private BigDecimal payoutAmount; - - @ApiModelProperty(value = "支出金额环比") - private String payoutAmountRatio; - - @ApiModelProperty(value = "余额支付金额") - private BigDecimal balanceAmount; - - @ApiModelProperty(value = "余额支付金额月环比") - private String balanceAmountRatio; - - @ApiModelProperty(value = "支付佣金金额") - private BigDecimal payoutBrokerageAmount; - - @ApiModelProperty(value = "支付佣金金额环比") - private String payoutBrokerageAmountRatio; - - @ApiModelProperty(value = "商品退款金额") - private BigDecimal proRefundAmount; - - @ApiModelProperty(value = "商品退款金额环比") - private String proRefundAmountRatio; - -} diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/TrandeTrendDateResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/TrandeTrendDateResponse.java deleted file mode 100644 index f0c6710b..00000000 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/TrandeTrendDateResponse.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.zbkj.common.response; - -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. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value="TradingDataResponse对象", description="交易概览数据对象") -public class TrandeTrendDateResponse implements Serializable { - - private static final long serialVersionUID = -6332062115310922579L; - - @ApiModelProperty(value = "日期") - private String date; - - @ApiModelProperty(value = "营业额") - private BigDecimal turnover; - - @ApiModelProperty(value = "商品支付金额") - private BigDecimal proPayAmount; - - @ApiModelProperty(value = "充值金额") - private BigDecimal rechargeAmount; - - @ApiModelProperty(value = "支出金额") - private BigDecimal payoutAmount; - -} diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserAreaDataResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserAreaDataResponse.java deleted file mode 100644 index ebad2fe1..00000000 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserAreaDataResponse.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.zbkj.common.response; - -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. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value="UserAreaDataResponse对象", description="用户区域数据对象") -public class UserAreaDataResponse implements Serializable { - - private static final long serialVersionUID = -6332062115310922579L; - - @ApiModelProperty(value = "区域（省份+其他）") - private String area; - - @ApiModelProperty(value = "累计用户数量") - private Integer userNum; - - @ApiModelProperty(value = "成交用户数量") - private Integer payUserNum; - - @ApiModelProperty(value = "支付金额") - private BigDecimal payAmount; - -} diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserBalanceResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserBalanceResponse.java index e71daec9..697f0e1d 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserBalanceResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserBalanceResponse.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserBillResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserBillResponse.java index b5f4c918..60256311 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserBillResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserBillResponse.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserCenterResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserCenterResponse.java index 1e49fa5c..57cc746e 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserCenterResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserCenterResponse.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserChannelDataResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserChannelDataResponse.java index acb48a3d..902ad982 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserChannelDataResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserChannelDataResponse.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserCommissionResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserCommissionResponse.java index 97921495..72c61649 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserCommissionResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserCommissionResponse.java @@ -14,7 +14,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserExtractCashResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserExtractCashResponse.java index 9ef0dec2..1458eae5 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserExtractCashResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserExtractCashResponse.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserExtractRecordResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserExtractRecordResponse.java index 09589145..707d8167 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserExtractRecordResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserExtractRecordResponse.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserExtractResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserExtractResponse.java index e9ed2780..12a06cfd 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserExtractResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserExtractResponse.java @@ -10,7 +10,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserIntegralRecordResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserIntegralRecordResponse.java index 432161b2..db2703d2 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserIntegralRecordResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserIntegralRecordResponse.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserOverviewDateResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserOverviewDateResponse.java index a4b5f66b..79c9b9c1 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserOverviewDateResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserOverviewDateResponse.java @@ -14,7 +14,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserOverviewResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserOverviewResponse.java index e0323cc0..78d75363 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserOverviewResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserOverviewResponse.java @@ -14,7 +14,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserRechargeBillRecordResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserRechargeBillRecordResponse.java index 59335f23..98f7bd2b 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserRechargeBillRecordResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserRechargeBillRecordResponse.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserRechargeFrontResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserRechargeFrontResponse.java index c6a0350b..96579da7 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserRechargeFrontResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserRechargeFrontResponse.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserRechargeItemResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserRechargeItemResponse.java index 02009843..46890816 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserRechargeItemResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserRechargeItemResponse.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserRechargeResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserRechargeResponse.java index 552cc533..4dd27257 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserRechargeResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserRechargeResponse.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserRelationResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserRelationResponse.java index 380769a6..f0028a5a 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserRelationResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserRelationResponse.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserResponse.java index 3df0b5da..bb2f3a57 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserResponse.java @@ -14,7 +14,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserSexDataResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserSexDataResponse.java deleted file mode 100644 index a68a1234..00000000 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserSexDataResponse.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.zbkj.common.response; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * 用户性别数据对象 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value="UserSexDataResponse对象", description="用户性别数据对象") -public class UserSexDataResponse implements Serializable { - - private static final long serialVersionUID = -6004724917253583732L; - - @ApiModelProperty(value = "性别,0未知，1男，2女，3保密") - private Integer sex; - - @ApiModelProperty(value = "数量") - private Integer num; -} diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserSignInfoResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserSignInfoResponse.java index f0a95bea..c8e0441e 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserSignInfoResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserSignInfoResponse.java @@ -14,7 +14,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserSpreadBannerResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserSpreadBannerResponse.java index 079f8c60..a5df09b2 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserSpreadBannerResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserSpreadBannerResponse.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserSpreadOrderItemChildResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserSpreadOrderItemChildResponse.java index 48a1c4b8..61fc0376 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserSpreadOrderItemChildResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserSpreadOrderItemChildResponse.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserSpreadOrderItemResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserSpreadOrderItemResponse.java index 84c98bb9..80041ade 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserSpreadOrderItemResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserSpreadOrderItemResponse.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserSpreadOrderResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserSpreadOrderResponse.java index 8f5d2458..5393465b 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserSpreadOrderResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserSpreadOrderResponse.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserSpreadPeopleItemResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserSpreadPeopleItemResponse.java index ef982998..9acb22bd 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserSpreadPeopleItemResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserSpreadPeopleItemResponse.java @@ -14,7 +14,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserSpreadPeopleResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserSpreadPeopleResponse.java index a87a93d0..ac17932e 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserSpreadPeopleResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserSpreadPeopleResponse.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserTotalResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserTotalResponse.java deleted file mode 100644 index dd0aadf6..00000000 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/UserTotalResponse.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.zbkj.common.response; - -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. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value="UserTotalResponse对象", description="用户总数据对象") -public class UserTotalResponse implements Serializable { - - private static final long serialVersionUID = -6332062115310922579L; - - @ApiModelProperty(value = "累计用户数") - private Integer userNum; - - @ApiModelProperty(value = "累计充值人数") - private Integer rechargePeopleNum; - - @ApiModelProperty(value = "累计充值金额（佣金转余额也算）") - private BigDecimal rechargeTotalAmount; - - @ApiModelProperty(value = "累计消费金额") - private BigDecimal consumptionAmount; - -} diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/WeChatJsSdkConfigResponse.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/WeChatJsSdkConfigResponse.java index be34c31e..c9cae89c 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/WeChatJsSdkConfigResponse.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/response/WeChatJsSdkConfigResponse.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/token/FrontTokenComponent.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/token/FrontTokenComponent.java index f75cfab6..22a61cdd 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/token/FrontTokenComponent.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/token/FrontTokenComponent.java @@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -166,15 +166,24 @@ public class FrontTokenComponent { "api/front/index", "api/front/bargain/list", "api/front/combination/list", + "api/front/seckill/list", "api/front/index/product", "api/front/combination/index", "api/front/bargain/index", + "api/front/seckill/index", "api/front/index/color/config", "api/front/product/list", "api/front/product/sku/detail", "api/front/index/get/version", "api/front/image/domain", - "api/front/product/leaderboard" + "api/front/product/leaderboard", + "api/front/menu/user", + "api/front/combination/header", + "api/front/combination/detail", + "api/front/bargain/header", + "api/front/bargain/detail", + "api/front/seckill/header", + "api/front/seckill/detail" }; return ArrayUtils.contains(routerList, uri); @@ -196,4 +205,5 @@ public class FrontTokenComponent { return false; } } + } diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/token/WeChatOauthToken.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/token/WeChatOauthToken.java index 084ae78b..9fe0b777 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/token/WeChatOauthToken.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/token/WeChatOauthToken.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/AESUtil.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/AESUtil.java index 33373049..28d3c6dd 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/AESUtil.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/AESUtil.java @@ -16,7 +16,7 @@ import java.security.*; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/AppleUtil.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/AppleUtil.java index 1068f4d2..7fef227c 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/AppleUtil.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/AppleUtil.java @@ -18,7 +18,7 @@ import java.security.PublicKey; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/ArrayUtil.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/ArrayUtil.java index a07efb19..65759e86 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/ArrayUtil.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/ArrayUtil.java @@ -12,7 +12,7 @@ import java.util.Set; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/CommonUtil.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/CommonUtil.java index 894d021c..37c8b990 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/CommonUtil.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/CommonUtil.java @@ -7,7 +7,7 @@ import org.apache.commons.codec.digest.DigestUtils; * +---------------------------------------------------------------------- * | 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,7 +35,7 @@ public class CommonUtil { * @return 昵称 */ public static String createNickName(String phone) { - return DigestUtils.md5Hex(phone + DateUtil.getNowTime()). + return DigestUtils.md5Hex(phone + CrmebDateUtil.getNowTime()). subSequence(0, 12). toString(); } diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/CrmebUtil.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/CrmebUtil.java index d7b2129b..f7411f01 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/CrmebUtil.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/CrmebUtil.java @@ -1,21 +1,34 @@ package com.zbkj.common.utils; -import cn.hutool.core.codec.Base64; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.SecureUtil; -import cn.hutool.crypto.symmetric.DES; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.zbkj.common.config.CrmebConfig; import com.zbkj.common.constants.Constants; +import com.zbkj.common.exception.CrmebException; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import javax.crypto.Cipher; +import javax.crypto.SecretKey; +import javax.crypto.spec.SecretKeySpec; import javax.servlet.http.HttpServletRequest; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; +import java.math.RoundingMode; +import java.net.Inet4Address; +import java.net.InetAddress; +import java.net.NetworkInterface; +import java.net.SocketException; import java.nio.charset.StandardCharsets; +import java.security.Key; +import java.security.Security; import java.text.NumberFormat; import java.util.*; +import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -24,35 +37,56 @@ import java.util.regex.Pattern; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- * | Author: CRMEB Team * +---------------------------------------------------------------------- */ +@Component public class CrmebUtil { - public static String encryptPassword(String pwd, String key) { - DES des = new DES(getDESSercretKey(key)); - byte[] result = des.encrypt(pwd); - return Base64.encode(result); + @Autowired + CrmebConfig crmebConfig; + + public static String encryptPassword(String pwd, String key){ + try { + Security.addProvider(new com.sun.crypto.provider.SunJCE()); + Key _key = getDESSercretKey(key); + Cipher cipher = Cipher.getInstance("DES"); + cipher.init(Cipher.ENCRYPT_MODE, _key); + byte[] data = pwd.getBytes(StandardCharsets.UTF_8); + byte[] result = cipher.doFinal(data); + return java.util.Base64.getEncoder().encodeToString(result); + }catch (Exception e){ + throw new CrmebException("密码处理异常"); + } } /** * 解密密码 */ - public static String decryptPassowrd(String pwd, String key) { - DES des = new DES(getDESSercretKey(key)); - return des.decryptStr(pwd); + public static String decryptPassowrd(String pwd, String key) + throws Exception { + Security.addProvider(new com.sun.crypto.provider.SunJCE()); + Key aKey = getDESSercretKey(key); + Cipher cipher = Cipher.getInstance("DES"); + cipher.init(Cipher.DECRYPT_MODE, aKey); + + byte[] data = java.util.Base64.getDecoder().decode(pwd); + byte[] result = cipher.doFinal(data); + + return new String(result, StandardCharsets.UTF_8); } /** * 获得DES加密秘钥 * @param key * @return + * @throws UnsupportedEncodingException */ - public static byte[] getDESSercretKey(String key) { + public static SecretKey getDESSercretKey(String key) throws UnsupportedEncodingException { byte[] result = new byte[8]; byte[] keys = null; keys = key.getBytes(StandardCharsets.UTF_8); @@ -63,7 +97,7 @@ public class CrmebUtil { result[i] = 0x01; } } - return result; + return new SecretKeySpec(result, "DES"); } /** @@ -113,24 +147,8 @@ public class CrmebUtil { * @param args String[] 字符串数组 */ public static void main(String[] args) throws Exception { -// System.out.println(encryptPassword("123456", "admin")); -// System.out.println(decryptPassowrd("", "")); - - String key = "123456"; - String data = "中国123ABCabc"; - System.out.println("原始数据：" + data); - String encryptPassword = encryptPassword(data, key); - System.out.println("加密结果：" + encryptPassword); - String decryptPassowrd = decryptPassowrd(encryptPassword, key); - System.out.println("解密结果：" + decryptPassowrd); - // 执行结果如下： - // 原始数据：中国123ABCabc - // 加密结果：5JNGj04iE/XUuTZM75zMrA== - // 解密结果：中国123ABCabc - - System.out.println(encryptPassword("crmeb@123456", "18292417675")); - // 执行结果：f6mcpGQ8NEmwbab2TlkpUg== - // 与 SQL 中的数据一致 + //System.out.println(encryptPassword("crmeb@123456", "18292417675")); + System.out.println(decryptPassowrd("9n8S0bwrG6iXHK3vXWqppA==", "admin")); } /** @@ -391,7 +409,7 @@ public class CrmebUtil { } ip = request.getRemoteAddr(); - if("0:0:0:0:0:0:0:1".equals(ip)){ + if(ip.equals("0:0:0:0:0:0:0:1")){ //本地 localhost访问 ipv6 ip = "127.0.0.1"; } @@ -414,11 +432,11 @@ public class CrmebUtil { return false; } - if("unKnown".equals(ip)){ + if(ip.equals("unKnown")){ return false; } - if("unknown".equals(ip)){ + if(ip.equals("unknown")){ return false; } @@ -729,7 +747,7 @@ public class CrmebUtil { /** * unicode编码转换为汉字 * @param unicodeStr 待转化的编码 - * @return 返回转化后的汉子 + * @return 返回转化后的汉字 */ public static String UnicodeToCN(String unicodeStr) { Pattern pattern = Pattern.compile("(\\\\u(\\p{XDigit}{4}))"); @@ -877,10 +895,14 @@ public class CrmebUtil { * 手机号脱敏处理 * @param phone 手机号 */ - public static String maskMobile(String phone) { + public String maskMobile(String phone) { if (StrUtil.isBlank(phone)) { return ""; } - return phone.replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2"); + if(crmebConfig.getDemoSite()){ + return phone.replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2"); + } + return phone; } + } diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/DateUtil.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/DateUtil.java deleted file mode 100644 index e863a519..00000000 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/DateUtil.java +++ /dev/null @@ -1,635 +0,0 @@ -package com.zbkj.common.utils; - -import cn.hutool.core.date.DateTime; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.zbkj.common.constants.Constants; -import com.zbkj.common.exception.CrmebException; -import com.zbkj.common.vo.dateLimitUtilVo; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; - -/** - * Date工具类 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - **/ -public final class DateUtil { - - private static final Logger LOGGER = LoggerFactory.getLogger(DateUtil.class); - - private DateUtil() { - throw new IllegalStateException("Utility class"); - } - - /** - * 获取当前日期,指定格式 - * 描述:<描述函数实现的功能>. - * - * @return - */ - public static String nowDate() { - return nowDate(Constants.DATE_FORMAT_NUM); - } - - /** - * 获取当前年,指定格式 - * 描述:<描述函数实现的功能>. - * - * @return - */ - public static String nowYear() { - Calendar cal = Calendar.getInstance(); - return cal.get(Calendar.YEAR) + ""; - } - - /** - * 获取上一年,指定格式 - * 描述:<描述函数实现的功能>. - * - * @return - */ - public static String lastYear() { - Calendar cal = Calendar.getInstance(); - cal.add(Calendar.YEAR, -1); - return cal.get(Calendar.YEAR) + ""; - } - - /** - * 获取当前日期,指定格式 - * 描述:<描述函数实现的功能>. - * - * @return - */ - public static Date nowDateTime() { - return strToDate(nowDateTimeStr(), Constants.DATE_FORMAT); - } - - /** - * 获取当前日期,指定格式 - * 描述:<描述函数实现的功能>. - * - * @return - */ - public static String nowDateTimeStr() { - return nowDate(Constants.DATE_FORMAT); - } - - /** - * 获取当前日期,指定格式 - * 描述:<描述函数实现的功能>. - * - * @return - */ - public static String nowDate(String DATE_FORMAT) { - SimpleDateFormat dft = new SimpleDateFormat(DATE_FORMAT); - return dft.format(new Date()); - } - - /** - * 获取当前日期,指定格式 - * 描述:<描述函数实现的功能>. - * - * @return - */ - public static String nowDateTime(String DATE_FORMAT) { - SimpleDateFormat dft = new SimpleDateFormat(DATE_FORMAT); - return dft.format(new Date()); - } - - /** - * 获取当前日期,指定格式 - * 描述:<描述函数实现的功能>. - * - * @return - */ - public static Integer getNowTime() { - long t = (System.currentTimeMillis()/1000L); - return Integer.parseInt(String.valueOf(t)); - } - - /** - * 获取当前时间戳（秒级） - * @return - */ - public static Long getTime() { - return (System.currentTimeMillis()/1000L); - } - - /** - * 获取当前日期,指定格式 - * 描述:<描述函数实现的功能>. - * - * @return - */ - public static Date nowDateTimeReturnDate(String DATE_FORMAT) { - SimpleDateFormat dft = new SimpleDateFormat(DATE_FORMAT); - return strToDate(dft.format(new Date()), DATE_FORMAT); - } - - /** - * convert a date to string in a specifies fromat. - * - * @param date - * @param DATE_FORMAT - * @return - */ - public static String dateToStr(Date date, String DATE_FORMAT) { - if (date == null) { - return null; - } - SimpleDateFormat myFormat = new SimpleDateFormat(DATE_FORMAT); - return myFormat.format(date); - } - - /** - * parse a String to Date in a specifies fromat. - * - * @param dateStr - * @param DATE_FORMAT - * @return - * @throws ParseException - */ - public static Date strToDate(String dateStr, String DATE_FORMAT) { - SimpleDateFormat myFormat = new SimpleDateFormat(DATE_FORMAT); - try { - return myFormat.parse(dateStr); - } catch (ParseException e) { - return null; - } - } - - - /** - * date add Second - * - * @param date - * @param num - * @return - */ - public static Date addSecond(Date date, int num) { - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - calendar.add(Calendar.SECOND, num); - return calendar.getTime(); - } - - /** - * date add Second return String - * - * @param date - * @param num - * @return - */ - public static String addSecond(Date date, int num, String DATE_FORMAT) { - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - calendar.add(Calendar.SECOND, num); - return dateToStr(calendar.getTime(), DATE_FORMAT); - } - - /** - * 指定日期加上天数后的日期 - * - * @param num 为增加的天数 - * @param newDate 创建时间 - * @return - */ - public static final String addDay(String newDate, int num, String pattern) { - SimpleDateFormat format = new SimpleDateFormat(pattern); - try { - Date currdate = format.parse(newDate); - Calendar ca = Calendar.getInstance(); - ca.setTime(currdate); - ca.add(Calendar.DATE, num); - return format.format(ca.getTime()); - } catch (ParseException e) { - LOGGER.error("转化时间出错,", e); - return null; - } - } - - /** - * 指定日期加上天数后的日期 - * - * @param num 为增加的天数 - * @param newDate 创建时间 - * @return - */ - public static final String addDay(Date newDate, int num, String pattern) { - SimpleDateFormat format = new SimpleDateFormat(pattern); - Calendar ca = Calendar.getInstance(); - ca.setTime(newDate); - ca.add(Calendar.DATE, num); - return format.format(ca.getTime()); - } - - /** - * convert long to date - * - * @param date 待转换时间戳 - * @return 转换后时间 - */ - public static Date timeStamp11ToDate(Integer date) { - return new Date(date); - } - - /** - * convert long to date string - * - * @param date 待转换时间戳 - * @param DATE_FORMAT 格式化时间 - * @return 格式化后的时间 - */ - public static String timeStamp11ToDate(Integer date, String DATE_FORMAT) { - return dateToStr(new Date(date), DATE_FORMAT); - } - - /** - * compare two date String with a pattern - * - * @param date1 - * @param date2 - * @param pattern - * @return - */ - public static int compareDate(String date1, String date2, String pattern) { - SimpleDateFormat DATE_FORMAT = new SimpleDateFormat(pattern); - try { - Date dt1 = DATE_FORMAT.parse(date1); - Date dt2 = DATE_FORMAT.parse(date2); - if (dt1.getTime() > dt2.getTime()) { - return 1; - } else if (dt1.getTime() < dt2.getTime()) { - return -1; - } else { - return 0; - } - - } catch (ParseException e) { - e.printStackTrace(); - return 0; - } - } - - /** - * 检查日期格式是否合法 - * @param date - * @param style - * @return - */ - public static boolean checkDateFormat(String date, String style) { - SimpleDateFormat DATE_FORMAT = new SimpleDateFormat(style); - try { - // 设置lenient为false. - // 否则SimpleDateFormat会比较宽松地验证日期，比如2007/02/29会被接受，并转换成2007/03/01 - DATE_FORMAT.setLenient(false); - DATE_FORMAT.parse(date); - return true; - } catch (ParseException e) { - return false; - } - } - - /** - * 计算两个时间之间的天数差 - * @param beforeDay 开始时间 - * @param afterDay 结束时间 - * @return 相差天数 - */ - public static long getTwoDateDays(Date beforeDay, Date afterDay) { - SimpleDateFormat sm = new SimpleDateFormat(Constants.DATE_FORMAT_NUM); - long days = -1; - try { - days = (sm.parse(sm.format(afterDay)).getTime() - sm.parse(sm.format(beforeDay)).getTime()) / (1000 * 3600 * 24); - } catch (Exception e) { - e.printStackTrace(); - } - - return days; - } - - - //获取时间戳11位 - public static int getSecondTimestamp(Date date){ - if (null == date) { - return 0; - } - String timestamp = String.valueOf(date.getTime()/1000); - return Integer.parseInt(timestamp); - } - - //获取时间戳11位 - public static int getSecondTimestamp(String date){ - if (null == date) { - return 0; - } - Date date1 = strToDate(date, Constants.DATE_FORMAT); - if(date1 == null){ - return 0; - } - String timestamp = String.valueOf(date1.getTime()/1000); - return Integer.parseInt(timestamp); - } - - //获取时间戳10位 - public static int getSecondTimestamp(Long timeMillis){ - if (null == timeMillis) { - return 0; - } - String timestamp = String.valueOf(timeMillis / 1000); - return Integer.parseInt(timestamp); - } - - //获取时间戳11位 - public static int getSecondTimestamp(){ - Date date = strToDate(nowDateTime(Constants.DATE_FORMAT), Constants.DATE_FORMAT); - if (null == date) { - return 0; - } - String timestamp = String.valueOf(date.getTime()/1000); - return Integer.parseInt(timestamp); - } - - /** 获得昨天日期:yyyy-MM-dd HH:mm:ss */ - public static String getYesterdayStr() { - Calendar c = Calendar.getInstance(); - c.add(Calendar.DATE, -1); - SimpleDateFormat startSdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - return startSdf.format(c.getTime()); - } - - /** 获得本周第一天:yyyy-MM-dd HH:mm:ss */ - public static String getWeekStartDay() { - Calendar c = Calendar.getInstance(); - c.add(Calendar.WEEK_OF_MONTH, 0); - c.set(Calendar.DAY_OF_WEEK, 2); - SimpleDateFormat startSdf = new SimpleDateFormat("yyyy-MM-dd 00:00:00"); - return startSdf.format(c.getTime()); - } - - /** 获得本周最后一天:yyyy-MM-dd HH:mm:ss */ - public static String getWeekEndDay() { - return addDay(getWeekStartDay(), 7, Constants.DATE_FORMAT); - } - - /** 获得上周第一天:yyyy-MM-dd HH:mm:ss */ - public static String getLastWeekStartDay() { - return addDay(getWeekStartDay(), -7, Constants.DATE_FORMAT); - } - - /** 获得上周最后一天:yyyy-MM-dd HH:mm:ss */ - public static String getLastWeekEndDay() { - return addDay(getLastWeekStartDay(), 7, Constants.DATE_FORMAT); - } - - /** 获得本月最后一天:yyyy-MM-dd HH:mm:ss */ - public static String getMonthEndDay() { - Calendar c = Calendar.getInstance(); - c.set(Calendar.DAY_OF_MONTH, c.getActualMaximum(Calendar.DAY_OF_MONTH)); - SimpleDateFormat endSdf = new SimpleDateFormat("yyyy-MM-dd 23:59:59"); - return endSdf.format(c.getTime()); - } - - /** 获得上月第一天:yyyy-MM-dd HH:mm:ss */ - public static String getLastMonthStartDay() { - Calendar c = Calendar.getInstance(); - c.add(Calendar.MONTH, -1); - c.set(Calendar.DAY_OF_MONTH, 1); - SimpleDateFormat startSdf = new SimpleDateFormat("yyyy-MM-01 00:00:00"); - return startSdf.format(c.getTime()); - } - - /** 获得上月最后一天:yyyy-MM-dd HH:mm:ss */ - public static String getLastMonthEndDay() { - Calendar c = Calendar.getInstance(); - c.add(Calendar.MONTH, -1); - c.set(Calendar.DAY_OF_MONTH, c.getActualMaximum(Calendar.DAY_OF_MONTH)); - SimpleDateFormat endSdf = new SimpleDateFormat("yyyy-MM-dd 23:59:59"); - return endSdf.format(c.getTime()); - } - - /** 获得上年第一天:yyyy-MM-dd HH:mm:ss */ - public static String getLastYearStartDay() { - Calendar c = Calendar.getInstance(); - c.add(Calendar.YEAR, -1); - SimpleDateFormat startSdf = new SimpleDateFormat("yyyy-01-01 00:00:00"); - return startSdf.format(c.getTime()); - } - - /** 获得上年最后一天:yyyy-MM-dd HH:mm:ss */ - public static String getLastYearEndDay() { - Calendar c = Calendar.getInstance(); - c.add(Calendar.YEAR, -1); - SimpleDateFormat endSdf = new SimpleDateFormat("yyyy-12-31 23:59:59"); - return endSdf.format(c.getTime()); - } - - /** - * 计算时间范围 - * @param data string 类型 - * @author Mr.Zhang - * @since 2020-05-06 - * @return dateLimitUtilVo - */ - public static dateLimitUtilVo getDateLimit(String data){ - //时间计算 - String startTime = null; - String endTime = DateUtil.nowDateTime(Constants.DATE_FORMAT); - String day = DateUtil.nowDateTime(Constants.DATE_FORMAT_START); - String end = DateUtil.nowDateTime(Constants.DATE_FORMAT_END); - - if(!StringUtils.isBlank(data)){ - switch (data){ - case Constants.SEARCH_DATE_DAY: - startTime = day; - break; - case Constants.SEARCH_DATE_YESTERDAY: - startTime = DateUtil.addDay(day, -1, Constants.DATE_FORMAT_START); - endTime = DateUtil.addDay(end, -1, Constants.DATE_FORMAT_END); - break; - case Constants.SEARCH_DATE_LATELY_7: - startTime = DateUtil.addDay(day, -6, Constants.DATE_FORMAT_START); - break; - case Constants.SEARCH_DATE_WEEK: - startTime = getWeekStartDay(); - endTime = getWeekEndDay(); - break; - case Constants.SEARCH_DATE_PRE_WEEK: - startTime = getLastWeekStartDay(); - endTime = getLastWeekEndDay(); - break; - case Constants.SEARCH_DATE_LATELY_30: - startTime = DateUtil.addDay(day, -30, Constants.DATE_FORMAT_START); - break; - case Constants.SEARCH_DATE_MONTH: - startTime = DateUtil.nowDateTime(Constants.DATE_FORMAT_MONTH_START); - endTime = getMonthEndDay(); - break; - case Constants.SEARCH_DATE_PRE_MONTH: - startTime = getLastMonthStartDay(); - endTime = getLastMonthEndDay(); - break; - case Constants.SEARCH_DATE_YEAR: - startTime = DateUtil.nowDateTime(Constants.DATE_FORMAT_YEAR_START); - endTime = DateUtil.nowDateTime(Constants.DATE_FORMAT_YEAR_END); - break; - case Constants.SEARCH_DATE_PRE_YEAR: - startTime = getLastYearStartDay(); - endTime = getLastYearEndDay(); - break; - default: - List list = CrmebUtil.stringToArrayStr(data); - if(list.size() == 1){ - throw new CrmebException("选择时间参数格式错误，请在 " + - Constants.SEARCH_DATE_DAY + "|" + - Constants.SEARCH_DATE_YESTERDAY + "|" + - Constants.SEARCH_DATE_LATELY_7 + "|" + - Constants.SEARCH_DATE_LATELY_30 + "|" + - Constants.SEARCH_DATE_MONTH + "|" + - Constants.SEARCH_DATE_YEAR + "|自定义时间范围（格式：yyyy-MM-dd HH:mm:ss，两个时间范围用逗号分割）"); - } - startTime = list.get(0); - endTime = list.get(1); - -// if (startTime.equals(endTime)) { - startTime = DateUtil.appointedDayStrToFormatStr(startTime, Constants.DATE_FORMAT_DATE, Constants.DATE_FORMAT_START); - endTime = DateUtil.appointedDayStrToFormatStr(endTime, Constants.DATE_FORMAT_DATE, Constants.DATE_FORMAT_END); -// } - break; - } - } - return new dateLimitUtilVo(startTime, endTime); - } - - /** - * 获取某一时间段内的时间集合 - * @param data string 类型 - * @author Mr.Zhang - * @since 2020-05-06 - * @return List - */ - public static List getListDate(String data) { - - //获取30天的开始结束日期 - dateLimitUtilVo dateLimit = DateUtil.getDateLimit(data); - - //定义日期集合 - List date = new ArrayList<>(); - - //开始日期 - Date startDate = DateUtil.strToDate(dateLimit.getStartTime(), Constants.DATE_FORMAT); - - //结束日期 - Date endDate = DateUtil.strToDate(dateLimit.getEndTime(), Constants.DATE_FORMAT); - - while (endDate.after(startDate)){ - date.add(DateUtil.dateToStr(startDate, Constants.DATE_FORMAT_DATE)); // 放入集合 - startDate = DateUtil.strToDate(DateUtil.addDay(startDate, 1, Constants.DATE_FORMAT), Constants.DATE_FORMAT); //循环一次 加一天 - } - - return date; - } - - /** - * 两个日期之前的相差天数 - * @param starDate 开始日期 - * @param endDate 结束日期 - * @return 相差天数 - */ - public static int daysBetween(Date starDate,Date endDate){ - - Calendar cal = Calendar.getInstance(); - - cal.setTime(starDate); - - long time1 = cal.getTimeInMillis(); - - cal.setTime(endDate); - - long time2 = cal.getTimeInMillis(); - - long between_days=(time2-time1)/(1000*3600*24); - - return Integer.parseInt(String.valueOf(between_days)); - - } - - /** - * 获取指定日期指定格式字符串 - * - * @param dateStr - * @param DATE_FORMAT - * @return - * @throws ParseException - */ - public static String appointedDayStrToFormatStr(String dateStr, String STR_DATE_FORMAT, String DATE_FORMAT) { - Date date = DateUtil.strToDate(dateStr, STR_DATE_FORMAT); - return DateUtil.dateToStr(date, DATE_FORMAT); - } - - /** - * 获取当前时间小时 - * @return 当前时间小时 默认24小时 - */ - public static int getCurrentHour(){ - int hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY); - return hour; - } - - /** - * 13位时间戳转字符串 - * @param timestamp - * @param dateFormat - * @return - */ - public static String timestamp2DateStr(Long timestamp, String dateFormat) { - if (ObjectUtil.isNull(timestamp)) { - return ""; - } - if (StrUtil.isBlank(dateFormat)) { - dateFormat = Constants.DATE_FORMAT; - } - Date date = new Date(timestamp); - SimpleDateFormat simpleDateFormat = new SimpleDateFormat(dateFormat); - return simpleDateFormat.format(date); - } - - /** - * 字符串转13位时间戳 - */ - public static Long dateStr2Timestamp(String dateStr, String type) { - DateTime parse = cn.hutool.core.date.DateUtil.parse(dateStr); - if (StrUtil.isNotBlank(type)) { - if (type.equals(Constants.DATE_TIME_TYPE_BEGIN)) { - parse = cn.hutool.core.date.DateUtil.beginOfDay(parse); - } - if (type.equals(Constants.DATE_TIME_TYPE_END)) { - parse = cn.hutool.core.date.DateUtil.endOfDay(parse); - } - } - return parse.getTime(); - } - - public static void main(String[] args) { - dateLimitUtilVo dateLimit = getDateLimit(Constants.SEARCH_DATE_LATELY_7); - System.out.println(dateLimit.getStartTime()); - System.out.println(dateLimit.getEndTime()); - } - -} diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/ExportUtil.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/ExportUtil.java index 7ea50bbe..52c12ec8 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/ExportUtil.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/ExportUtil.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.poi.excel.ExcelUtil; import cn.hutool.poi.excel.ExcelWriter; import com.zbkj.common.constants.Constants; +import com.zbkj.common.constants.UploadConstants; import com.zbkj.common.exception.CrmebException; import org.apache.poi.ss.usermodel.CellStyle; import org.apache.poi.ss.usermodel.Font; @@ -18,7 +19,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相关版权 * +---------------------------------------------------------------------- @@ -72,7 +73,7 @@ public class ExportUtil { aliasMap.forEach((key, value) -> writer.addHeaderAlias(key, value)); // 合并单元格后的标题行，使用默认标题样式 writer.merge(aliasMap.size() - 1, title); - writer.merge(aliasMap.size() - 1, StrUtil.format("生成时间:{}", DateUtil.nowDateTimeStr())); + writer.merge(aliasMap.size() - 1, StrUtil.format("生成时间:{}", CrmebDateUtil.nowDateTimeStr())); //设置宽度自适应 writer.setColumnWidth(-1, 22); // 一次性写出内容，使用默认样式，强制输出标题 @@ -91,7 +92,7 @@ public class ExportUtil { throw new CrmebException("请检查上传参数，上传参数不能为空"); } UploadUtil.setRootPath(rootPath); - UploadUtil.setModelPath(Constants.UPLOAD_TYPE_IMAGE +"/"+Constants.UPLOAD_TYPE_FILE+"/"+modelPath); + UploadUtil.setModelPath(UploadConstants.UPLOAD_FILE_KEYWORD +"/"+UploadConstants.DOWNLOAD_FILE_KEYWORD+"/"+modelPath); // UploadUtil.setType(type); } diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/ImageMergeUtil.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/ImageMergeUtil.java index c5c72f9d..7e54b143 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/ImageMergeUtil.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/ImageMergeUtil.java @@ -1,15 +1,16 @@ package com.zbkj.common.utils; +import com.zbkj.common.constants.Constants; import com.zbkj.common.exception.CrmebException; import com.zbkj.common.vo.ImageMergeUtilVo; import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; -import javax.imageio.ImageIO; import java.awt.*; -import java.awt.image.BufferedImage; import java.io.*; +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; import java.net.URL; import java.net.URLConnection; import java.util.List; @@ -18,7 +19,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相关版权 * +---------------------------------------------------------------------- @@ -48,7 +49,6 @@ public class ImageMergeUtil { try { UploadUtil.setModelPath(model); UploadUtil.setExtStr(ext); -// UploadUtil.setType(Constants.UPLOAD_TYPE_IMAGE); //文件名 String newFileName = UploadUtil.fileName(ext); @@ -73,7 +73,7 @@ public class ImageMergeUtil { File file = new File(fileName); BufferedImage read = ImageIO.read(file); - if(bufferedImage == null || "".equals(bufferedImage)){ + if(bufferedImage == null || bufferedImage.equals("")){ imageMergeUtilVo.setX(0); imageMergeUtilVo.setY(0); //创建新的画布，宽高以第一个图为准 diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/QRCodeUtil.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/QRCodeUtil.java index 76783600..236133cb 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/QRCodeUtil.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/QRCodeUtil.java @@ -21,7 +21,7 @@ import java.util.HashMap; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/RedisUtil.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/RedisUtil.java index 961aaea0..ad3ca08c 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/RedisUtil.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/RedisUtil.java @@ -1,13 +1,23 @@ package com.zbkj.common.utils; -import org.springframework.data.redis.core.ListOperations; +import cn.hutool.core.util.StrUtil; +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.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.core.SetOperations; import org.springframework.data.redis.core.ZSetOperations; +import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer; +import org.springframework.data.redis.serializer.StringRedisSerializer; import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; -import javax.annotation.Resource; import java.util.List; +import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; @@ -15,7 +25,7 @@ import java.util.concurrent.TimeUnit; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -27,22 +37,86 @@ import java.util.concurrent.TimeUnit; @Component public class RedisUtil { - @Resource - private RedisTemplate redisTemplate; + private final RedisConnectionFactory redisConnectionFactory; + private final RedisConnectionFactory secondRedisConnectionFactory; -// private static RedisTemplate redisTemplate = SpringUtil.getBean("redisTemplate", RedisTemplate.class); + @Autowired + public RedisUtil(RedisConnectionFactory redisConnectionFactory, + @Qualifier("secondRedisConnectionFactory") RedisConnectionFactory secondRedisConnectionFactory) { + this.redisConnectionFactory = redisConnectionFactory; + this.secondRedisConnectionFactory = secondRedisConnectionFactory; + } + + public RedisTemplate getRedisTemplate() { + RedisTemplate redisTemplate = new RedisTemplate<>(); + redisTemplate.setConnectionFactory(redisConnectionFactory); + + // 使用StringRedisSerializer来序列化和反序列化redis的key值 + StringRedisSerializer stringSerializer = new StringRedisSerializer(); + // 用Jackson2JsonRedisSerializer来序列化和反序列化redis的value值 + Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = serializer(); + + redisTemplate.setKeySerializer(stringSerializer);//key序列化 + redisTemplate.setValueSerializer(jackson2JsonRedisSerializer);//value序列化 + redisTemplate.setHashKeySerializer(stringSerializer);//Hash key序列化 + redisTemplate.setHashValueSerializer(jackson2JsonRedisSerializer);//Hash value序列化 + redisTemplate.afterPropertiesSet(); + + return redisTemplate; + } + + public RedisTemplate getSecondRedisTemplate() { + RedisTemplate redisTemplate = new RedisTemplate<>(); + redisTemplate.setConnectionFactory(secondRedisConnectionFactory); + + // 使用StringRedisSerializer来序列化和反序列化redis的key值 + StringRedisSerializer stringSerializer = new StringRedisSerializer(); + // 用Jackson2JsonRedisSerializer来序列化和反序列化redis的value值 + Jackson2JsonRedisSerializer 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 serializer() { + //设置序列化 + Jackson2JsonRedisSerializer 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; + } + + +// @Resource +// private RedisTemplate redisTemplate; + + // ============================ common ============================ - // =============== common ========================== /** * 指定缓存失效时间 - * @param key 键 + * + * @param key 键 * @param time 时间(秒) * @return boolean */ public boolean expire(String key, long time) { try { if (time > 0) { - redisTemplate.expire(key, time, TimeUnit.SECONDS); + getRedisTemplate().expire(key, time, TimeUnit.SECONDS); } return true; } catch (Exception e) { @@ -53,21 +127,23 @@ public class RedisUtil { /** * 根据key 获取过期时间 + * * @param key 键 不能为null * @return 时间(秒) 返回0代表为永久有效 失效时间为负数，说明该主键未设置失效时间（失效时间默认为-1） */ - public long getExpire(String key) { - return redisTemplate.getExpire(key, TimeUnit.SECONDS); + public Long getExpire(String key) { + return getRedisTemplate().getExpire(key, TimeUnit.SECONDS); } /** * 判断key是否存在 + * * @param key 键 * @return true 存在 false 不存在 */ - public boolean exists(String key){ + public Boolean exists(String key) { try { - return redisTemplate.hasKey(key); + return getRedisTemplate().hasKey(key); } catch (Exception e) { e.printStackTrace(); return false; @@ -75,24 +151,45 @@ public class RedisUtil { } /** - * 删除对应的value - * @param key string key + * 删除缓存 + * + * @param key 可以传一个值 或多个 */ - public void delete(String key) { - if (exists(key)) { - redisTemplate.delete(key); + @SuppressWarnings("unchecked") + public void delete(String... key) { + if (key != null && key.length > 0) { + if (key.length == 1) { + if (exists(key[0])) { + getRedisTemplate().delete(key[0]); + } + } else { + getRedisTemplate().delete(CollectionUtils.arrayToList(key)); + } } } - // =============== string ========================== + // ============================ String ============================= + + /** + * 读取缓存 + * + * @param key 键 + * @return T + */ + @SuppressWarnings("unchecked") + public T get(String key) { + return key == null ? null : (T) getRedisTemplate().opsForValue().get(key); + } + /** * 写入缓存 - * @param key string key - * @param value string value + * + * @param key 键 + * @param value 值 */ public boolean set(String key, Object value) { try { - redisTemplate.opsForValue().set(key, value); + getRedisTemplate().opsForValue().set(key, value); return true; } catch (Exception e) { e.printStackTrace(); @@ -102,15 +199,16 @@ public class RedisUtil { /** * 写入缓存带有效期(默认时间单位:秒) - * @param key string key - * @param value string value - * @param expireTime Long 过期时间 + * + * @param key key + * @param value value + * @param expireTime 过期时间 time要大于0 如果time小于等于0 将设置无限期 * @return boolean */ public boolean set(String key, Object value, Long expireTime) { try { if (expireTime > 0) { - redisTemplate.opsForValue().set(key, value, expireTime, TimeUnit.SECONDS); + getRedisTemplate().opsForValue().set(key, value, expireTime, TimeUnit.SECONDS); } else { set(key, value); } @@ -123,15 +221,16 @@ public class RedisUtil { /** * 写入缓存带有效期 - * @param key string key - * @param value string value - * @param expireTime Long 过期时间 - * @param timeUnit TimeUnit 时间格式 + * + * @param key key + * @param value value + * @param expireTime 过期时间 + * @param timeUnit 时间格式 * @return boolean */ public boolean set(String key, Object value, Long expireTime, TimeUnit timeUnit) { try { - redisTemplate.opsForValue().set(key, value, expireTime, timeUnit); + getRedisTemplate().opsForValue().set(key, value, expireTime, timeUnit); return true; } catch (Exception e) { e.printStackTrace(); @@ -139,163 +238,548 @@ public class RedisUtil { } } - /** - * 读取缓存 - * @param key string key - * @return T - */ - @SuppressWarnings("unchecked") - public T get(String key) { - return (T) redisTemplate.opsForValue().get(key); - } - - /** - * 哈希添加 - * @param key string key - * @param hashKey Object hashKey - * @param value Object value - */ - - public void hmSet(String key, Object hashKey, Object value) { - redisTemplate.opsForHash().put(key, hashKey, value); - } - - /** - * 哈希删除 - * @param key string key - * @param hashKey Object hashKey - */ - - public void hmDelete(String key, Object hashKey) { - redisTemplate.opsForHash().delete(key, hashKey); - } - - /** - * 哈希获取数据 - * @param key string key - * @param hashKey Object hashKey - */ - public Object hmGet(String key, Object hashKey) { - return redisTemplate.opsForHash().get(key, hashKey); - } - - /** - * 哈希数量 - * @param key string key - */ - public Long getHashSize(String key) { - return redisTemplate.opsForHash().size(key); - } - - /** - * 列表添加左边添加 - * @param k string key - * @param v Object v - * @author Mr.Zhang - * @since 2020-04-13 - */ - public void lPush(String k, Object v) { - ListOperations list = redisTemplate.opsForList(); - list.leftPush(k, v); - } - - /** - * 从右边拿出来一个 - * @param k string key - * @param t Long 超时秒数 - */ - public Object getRightPop(String k, Long t){ - return redisTemplate.opsForList().rightPop(k, t, TimeUnit.SECONDS); - } - - /** - * 列表获取数量 - * @param k string key - * @return Long - */ - public Long getListSize(String k) { - return redisTemplate.opsForList().size(k); - } - - /** - * 列表获取 - * @param k string key - * @param l long l - * @param l1 long l1 - * @return List - */ - public List lRange(String k, long l, long l1) { - ListOperations list = redisTemplate.opsForList(); - return list.range(k, l, l1); - } - - /** - * 集合添加 - * @param key string key - * @param value Object value - */ - public void add(String key, Object value) { - SetOperations set = redisTemplate.opsForSet(); - set.add(key, value); - } - - /** - * 集合获取 - * @param key string key - * @return Set - */ - public Set setMembers(String key) { - SetOperations set = redisTemplate.opsForSet(); - return set.members(key); - } - - /** - * 有序集合添加 排行榜使用 - * @param key string key - * @param value Object value - * @param score double scoure - */ - public void zAdd(String key, Object value, double score) { - ZSetOperations zset = redisTemplate.opsForZSet(); - zset.add(key, value, score); - } - - - /** - * 有序集合获取 排行榜使用 - * @param key string key - * @param score double scoure - * @return Set - */ - public Set rangeByScore(String key, double score, double score1) { - ZSetOperations zset = redisTemplate.opsForZSet(); - return zset.rangeByScore(key, score, score1); - } - /** * 递增 + * * @param key 键 * @return long */ - public long incrAndCreate(String key){ + public Long incrAndCreate(String key) { if (!exists(key)) { set(key, 1); - return 1; + return 1L; } return incr(key, 1L); } /** * 递增 - * @param key 键 + * + * @param key 键 * @param delta 要增加几(大于0) * @return long */ - public long incr(String key, long delta){ + public Long incrAndCreate(String key, long delta) { + if (!exists(key)) { + set(key, delta); + return delta; + } + return incr(key, delta); + } + + /** + * 递增 + * + * @param key 键 + * @param delta 要增加几(大于0) + * @return long + */ + public Long incr(String key, long delta) { if (delta < 0) { throw new RuntimeException("递增因子必须大于0"); } - return redisTemplate.opsForValue().increment(key, delta); + return getRedisTemplate().opsForValue().increment(key, delta); } + /** + * 递减 + * + * @param key 键 + * @param delta 要减少几(小于0) + * @return Long + */ + public Long decr(String key, long delta) { + if (delta < 0) { + throw new RuntimeException("递减因子必须大于0"); + } + return getRedisTemplate().opsForValue().increment(key, -delta); + } + + // ================================Map================================= + + /** + * 哈希获取数据 HashGet + * + * @param key 键 不能为null + * @param item 项 不能为nul + * @return 值 + */ + public Object hget(String key, String item) { + return getRedisTemplate().opsForHash().get(key, item); + } + + /** + * 获取hashKey对应的所有键值 + * + * @param key 键 + * @return 对应的多个键值 + */ + public Map hmget(String key) { + return getRedisTemplate().opsForHash().entries(key); + } + + /** + * 向一张hash表中放入数据,如果不存在将创建 + * + * @param key 键 + * @param item 项 + * @param value 值 + * @return true 成功 false失败 + */ + public boolean hset(String key, String item, Object value) { + try { + getRedisTemplate().opsForHash().put(key, item, value); + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 向一张hash表中放入数据,如果不存在将创建 + * + * @param key 键 + * @param item 项 + * @param value 值 + * @param time 时间(秒) 注意:如果已存在的hash表有时间,这里将会替换原有的时间 + * @return true 成功 false失败 + */ + public boolean hset(String key, String item, Object value, long time) { + try { + getRedisTemplate().opsForHash().put(key, item, value); + if (time > 0) { + expire(key, time); + } + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * HashSet + * + * @param key 键 + * @param map 对应多个键值 + * @return true 成功 false 失败 + */ + public boolean hmSet(String key, Map map) { + try { + getRedisTemplate().opsForHash().putAll(key, map); + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * HashSet 并设置时间 + * + * @param key 键 + * @param map 对应多个键值 + * @param time 时间(秒) + * @return true成功 false失败 + */ + public boolean hmset(String key, Map map, long time) { + try { + getRedisTemplate().opsForHash().putAll(key, map); + if (time > 0) { + expire(key, time); + } + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 哈希删除 + * + * @param key 键 不能为null + * @param hashKey 项 不能为null + */ + public void hmDelete(String key, Object hashKey) { + getRedisTemplate().opsForHash().delete(key, hashKey); + } + + /** + * 删除hash表中的值 + * + * @param key 键 不能为null + * @param item 项 可以使多个 不能为null + */ + public void hmDelete(String key, Object... item) { + getRedisTemplate().opsForHash().delete(key, item); + } + + /** + * 判断hash表中是否有该项的值 + * + * @param key 键 不能为null + * @param item 项 不能为null + * @return true 存在 false不存在 + */ + public boolean hHasKey(String key, String item) { + return getRedisTemplate().opsForHash().hasKey(key, item); + } + + /** + * hash递增 如果不存在,就会创建一个 并把新增后的值返回 + * + * @param key 键 + * @param item 项 + * @param by 要增加几(大于0) + * @return 递增后的值 + */ + public long hincr(String key, String item, long by) { + return getRedisTemplate().opsForHash().increment(key, item, by); + } + + /** + * hash递减 + * + * @param key 键 + * @param item 项 + * @param by 要减少几(小于0) + * @return 递减后的值 + */ + public long hdecr(String key, String item, long by) { + return getRedisTemplate().opsForHash().increment(key, item, -by); + } + + /** + * 哈希数量 + * + * @param key 键 + * @return 键下的数量 + */ + public Long getHashSize(String key) { + return getRedisTemplate().opsForHash().size(key); + } + + // ===============================list================================= + + /** + * 列表添加左边添加 + * + * @param key 键 + * @param value 值 + */ + public boolean lPush(String key, Object value) { + try { + getRedisTemplate().opsForList().leftPush(key, value); + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 列表添加左边添加 + * + * @param key 键 + * @param value 值 + * @param time 时间(秒) + */ + public boolean lSet(String key, Object value, long time) { + try { + getRedisTemplate().opsForList().leftPush(key, value); + if (time > 0) + expire(key, time); + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 从右边拿出来一个 + * + * @param k string key + * @param t Long 超时秒数 + */ + public Object getRightPop(String k, Long t) { + return getRedisTemplate().opsForList().rightPop(k, t, TimeUnit.SECONDS); + } + + /** + * 列表获取数量 + * + * @param key 键 + * @return Long + */ + public Long getListSize(String key) { + try { + return getRedisTemplate().opsForList().size(key); + } catch (Exception e) { + e.printStackTrace(); + return 0L; + } + } + + /** + * 获取list缓存的内容 + * + * @param key 键 + * @param start 开始 + * @param end 结束 0 到 -1代表所有值 + * @return list缓存的内容 + */ + public List lGet(String key, long start, long end) { + try { + return getRedisTemplate().opsForList().range(key, start, end); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + /** + * 通过索引 获取list中的值 + * + * @param key 键 + * @param index 索引 index>=0时， 0 表头，1 第二个元素，依次类推；index<0时，-1，表尾，-2倒数第二个元素，依次类推 + */ + public Object lGetIndex(String key, long index) { + try { + return getRedisTemplate().opsForList().index(key, index); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + /** + * 根据索引修改list中的某条数据 + * + * @param key 键 + * @param index 索引 + * @param value 值 + */ + public boolean lUpdateIndex(String key, long index, Object value) { + try { + getRedisTemplate().opsForList().set(key, index, value); + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 移除N个值为value + * + * @param key 键 + * @param count 移除多少个 + * @param value 值 + * @return 移除的个数 + */ + public Long lRemove(String key, long count, Object value) { + try { + return getRedisTemplate().opsForList().remove(key, count, value); + } catch (Exception e) { + e.printStackTrace(); + return 0L; + } + } + + // ============================set============================= + + /** + * 根据key获取Set中的所有值 + * + * @param key 键 + * @return key对应的所有值 + */ + public Set sGet(String key) { + try { + return getRedisTemplate().opsForSet().members(key); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + /** + * 根据value从一个set中查询,是否存在 + * + * @param key 键 + * @param value 值 + * @return true 存在 false不存在 + */ + public Boolean sHasKey(String key, Object value) { + try { + return getRedisTemplate().opsForSet().isMember(key, value); + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 将数据放入set缓存 + * + * @param key 键 + * @param values 值 可以是多个 + * @return 成功个数 + */ + public Long sSet(String key, Object... values) { + try { + return getRedisTemplate().opsForSet().add(key, values); + } catch (Exception e) { + e.printStackTrace(); + return 0L; + } + } + + /** + * 将set数据放入缓存 + * + * @param key 键 + * @param time 时间(秒) + * @param values 值 可以是多个 + * @return 成功个数 + */ + public Long sSetAndTime(String key, long time, Object... values) { + try { + Long count = getRedisTemplate().opsForSet().add(key, values); + if (time > 0) + expire(key, time); + return count; + } catch (Exception e) { + e.printStackTrace(); + return 0L; + } + } + + /** + * 获取set缓存的长度 + * + * @param key 键 + * @return set缓存的长度 + */ + public Long sGetSetSize(String key) { + try { + return getRedisTemplate().opsForSet().size(key); + } catch (Exception e) { + e.printStackTrace(); + return 0L; + } + } + + /** + * 移除值为value的 + * + * @param key 键 + * @param values 值 可以是多个 + * @return 移除的个数 + */ + public Long setRemove(String key, Object... values) { + try { + return getRedisTemplate().opsForSet().remove(key, values); + } catch (Exception e) { + e.printStackTrace(); + return 0L; + } + } + + + /** + * 有序集合添加 排行榜使用 + * + * @param key string key + * @param value Object value + * @param score double scoure + */ + public void zAdd(String key, Object value, double score) { + ZSetOperations zset = getRedisTemplate().opsForZSet(); + zset.add(key, value, score); + } + + + /** + * 有序集合获取 排行榜使用 + * + * @param key string key + * @param score double scoure + * @return Set + */ + public Set rangeByScore(String key, double score, double score1) { + ZSetOperations zset = getRedisTemplate().opsForZSet(); + return zset.rangeByScore(key, score, score1); + } + + + // =================第二数据源部分=========================== + + /** + * 判断key是否存在 + * + * @param key 键 + * @return true 存在 false 不存在 + */ + public Boolean secondKeyExists(String key) { + try { + return getSecondRedisTemplate().hasKey(key); + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 读取缓存 + * + * @param key 键 + * @return T + */ + public T getSecondObject(String key) { + if (StrUtil.isBlank(key)) { + return null; + } + return (T) getSecondRedisTemplate().opsForValue().get(key); + } + + /** + * 写入缓存带有效期 + * + * @param key key + * @param value value + * @param expireTime 过期时间 + * @param timeUnit 时间格式 + * @return boolean + */ + public boolean setSecondObject(String key, Object value, Long expireTime, TimeUnit timeUnit) { + try { + getSecondRedisTemplate().opsForValue().set(key, value, expireTime, timeUnit); + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 删除缓存 + * + * @param key 可以传一个值 或多个 + */ + @SuppressWarnings("unchecked") + public void secondDelete(String... key) { + if (key != null && key.length > 0) { + if (key.length == 1) { + if (exists(key[0])) { + getSecondRedisTemplate().delete(key[0]); + } + } else { + getSecondRedisTemplate().delete(CollectionUtils.arrayToList(key)); + } + } + } } diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/RequestUtil.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/RequestUtil.java index b5d7e49b..fa82a52d 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/RequestUtil.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/RequestUtil.java @@ -16,7 +16,7 @@ import java.util.Objects; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/RestTemplateUtil.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/RestTemplateUtil.java index 8cf338bc..f7541f02 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/RestTemplateUtil.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/RestTemplateUtil.java @@ -21,14 +21,17 @@ import org.springframework.stereotype.Component; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.client.RestTemplate; +import org.springframework.web.util.UriComponentsBuilder; import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContext; import java.io.FileInputStream; +import java.net.URI; import java.nio.charset.StandardCharsets; import java.security.KeyStore; import java.security.SecureRandom; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Objects; @@ -37,7 +40,7 @@ import java.util.Objects; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -78,8 +81,11 @@ public class RestTemplateUtil { public String getData(String url, Map param) { // 请勿轻易改变此提交方式，大部分的情况下，提交方式都是表单提交 HttpHeaders headers = new HttpHeaders(); - headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED); - return restTemplate.getForEntity(url, String.class, param).getBody(); + for (Map.Entry entry : param.entrySet()) { + headers.add(entry.getKey(), entry.getValue()); + } + RequestEntity requestEntity = new RequestEntity<>(headers, HttpMethod.GET, URI.create(url)); + return restTemplate.exchange(requestEntity, String.class).getBody(); } /** @@ -443,4 +449,36 @@ public class RestTemplateUtil { // restTemplate = new RestTemplate(requestFactory); return restTemplate.postForEntity(url, requestEntity, String.class).getBody(); } + + /** + * 发送GET请求 支持header + * @param url + * @return + */ + + public JSONObject getDataForm(String url, MultiValueMap params, Map header) { + // 构建带参数的 URL + UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(url); + if (CollUtil.isNotEmpty(params)) { + for (Map.Entry> entry : params.entrySet()) { + for (Object value : entry.getValue()) { + builder.queryParam(entry.getKey(), value); + } + } + } + String finalUrl = builder.build().toUriString(); + + // 设置请求头 + HttpHeaders headers = new HttpHeaders(); + headers.add("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.99 Safari/537.36"); + if (CollUtil.isNotEmpty(header)) { + for (Map.Entry entry : header.entrySet()) { + headers.add(entry.getKey(), entry.getValue()); + } + } + + // 发送 GET 请求 + HttpEntity requestEntity = new HttpEntity<>(headers); + return restTemplate.exchange(finalUrl, HttpMethod.GET, requestEntity, JSONObject.class).getBody(); + } } diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/SecurityUtil.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/SecurityUtil.java index 837e8a35..7b4c1697 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/SecurityUtil.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/SecurityUtil.java @@ -11,7 +11,7 @@ import org.springframework.security.core.context.SecurityContextHolder; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/SpringUtil.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/SpringUtil.java index c2649a1d..aa3d528c 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/SpringUtil.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/SpringUtil.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Component; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/UploadUtil.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/UploadUtil.java index 4f25f5a5..c10f611e 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/UploadUtil.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/UploadUtil.java @@ -2,6 +2,7 @@ package com.zbkj.common.utils; import cn.hutool.core.util.RandomUtil; import com.zbkj.common.constants.Constants; +import com.zbkj.common.constants.UploadConstants; import com.zbkj.common.exception.CrmebException; import org.apache.commons.io.FilenameUtils; @@ -13,7 +14,7 @@ import java.io.IOException; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -27,7 +28,7 @@ public class UploadUtil { private static String rootPath = ""; //类型 - private static String type = "/" + Constants.UPLOAD_TYPE_IMAGE; + private static String type = "/" + UploadConstants.UPLOAD_FILE_KEYWORD; //模块 @@ -139,7 +140,8 @@ public class UploadUtil { */ public static String getWebPath() { // 文件分隔符转化为当前系统的格式 - return getModelPath() + DateUtil.nowDate(Constants.DATE_FORMAT_DATE).replace("-", "/") + "/"; + return getModelPath() + CrmebDateUtil.nowDate(Constants.DATE_FORMAT_DATE).replace("-", "/") + "/"; + // return getType() + getModelPath() + DateUtil.nowDate(Constants.DATE_FORMAT_DATE).replace("-", "/") + "/"; } } diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/UploadWeChatMediaUtil.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/UploadWeChatMediaUtil.java index f101dea8..664b7318 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/UploadWeChatMediaUtil.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/UploadWeChatMediaUtil.java @@ -22,7 +22,7 @@ import java.io.InputStream; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/UrlUtil.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/UrlUtil.java index e12d333d..26b20069 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/UrlUtil.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/UrlUtil.java @@ -10,7 +10,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -41,7 +41,7 @@ public class UrlUtil { return entity; } url = url.trim(); - if ("".equals(url)) { + if (url.equals("")) { return entity; } String[] urlParts = url.split("\\?"); diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/ValidateCodeUtil.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/ValidateCodeUtil.java index 774e29d9..d7914057 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/ValidateCodeUtil.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/ValidateCodeUtil.java @@ -17,7 +17,7 @@ import java.util.Random; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/ValidateFormUtil.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/ValidateFormUtil.java index 0c1da7ac..e77a2d6c 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/ValidateFormUtil.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/ValidateFormUtil.java @@ -14,7 +14,7 @@ import java.util.regex.Pattern; * +---------------------------------------------------------------------- * | 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,37 +40,37 @@ public class ValidateFormUtil { List val = CrmebUtil.stringToArrayStrRegex(value, ":"); ////必填 - if("required".equals(val.get(0)) && "true".equals(val.get(1))){ + if(val.get(0).equals("required") && val.get(1).equals("true")){ isRequire(systemConfig.getValue(), systemConfig.getTitle()); continue; } //数字 - if("number".equals(val.get(0)) && "true".equals(val.get(1))){ + if(val.get(0).equals("number") && val.get(1).equals("true")){ isNumber(systemConfig.getValue(), systemConfig.getTitle()); continue; } //最大值 - if("max".equals(val.get(0))){ + if(val.get(0).equals("max")){ isNumber(systemConfig.getValue(), systemConfig.getTitle()); continue; } //最小值 - if("min".equals(val.get(0))){ + if(val.get(0).equals("min")){ isNumber(systemConfig.getValue(), systemConfig.getTitle()); continue; } //邮箱 - if("email".equals(val.get(0)) && "true".equals(val.get(1))){ + if(val.get(0).equals("email") && val.get(1).equals("true")){ isEmail(systemConfig.getValue(), systemConfig.getTitle()); continue; } //手机 - if("phone".equals(val.get(0)) && "true".equals(val.get(1))){ + if(val.get(0).equals("phone") && val.get(1).equals("true")){ isPhone(systemConfig.getValue(), systemConfig.getTitle()); } } diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/WXPayXmlUtil.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/WXPayXmlUtil.java index c27cd69e..fb5039e7 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/WXPayXmlUtil.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/WXPayXmlUtil.java @@ -12,7 +12,7 @@ import javax.xml.parsers.ParserConfigurationException; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/WxPKCS7Encoder.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/WxPKCS7Encoder.java index 6617112d..0dbf4eb0 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/WxPKCS7Encoder.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/WxPKCS7Encoder.java @@ -8,7 +8,7 @@ import java.util.Arrays; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/WxPayUtil.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/WxPayUtil.java index c86960b1..bbb9e815 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/WxPayUtil.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/WxPayUtil.java @@ -23,7 +23,7 @@ import java.util.*; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/WxUtil.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/WxUtil.java index 31ebc8e0..73263a30 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/WxUtil.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/WxUtil.java @@ -10,7 +10,7 @@ import org.apache.commons.codec.binary.Base64; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -55,7 +55,7 @@ public class WxUtil { if(ObjectUtil.isNull(result)){ throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if(result.containsKey("errcode") && "0".equals(result.getString("errcode"))){ + if(result.containsKey("errcode") && result.getString("errcode").equals("0")){ return result; } if(result.containsKey("errmsg")){ diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/XmlUtil.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/XmlUtil.java index 6e96e526..330e9ca1 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/XmlUtil.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/XmlUtil.java @@ -12,7 +12,6 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.w3c.dom.Text; import org.xml.sax.InputSource; -import org.xml.sax.SAXException; import javax.servlet.http.HttpServletRequest; import javax.xml.parsers.DocumentBuilder; @@ -32,7 +31,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved. + * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved. * +---------------------------------------------------------------------- * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 * +---------------------------------------------------------------------- @@ -47,14 +46,13 @@ public class XmlUtil { InputStream in = null; try { in = request.getInputStream(); - setReaderFeature(reader); Document doc = reader.read(in); Element root = doc.getRootElement(); List list = root.elements(); for (Element element : list) { map.put(element.getName(), element.getText()); } - } catch (IOException | DocumentException | SAXException e) { + } catch (IOException | DocumentException e) { e.printStackTrace(); } finally { try { @@ -93,12 +91,6 @@ public class XmlUtil { // return map; // } - public static void setReaderFeature(SAXReader reader) throws SAXException { - reader.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true); - reader.setFeature("http://xml.org/sax/features/external-general-entities", false); - reader.setFeature("http://xml.org/sax/features/external-parameter-entities", false); - reader.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); - } public static HashMap xmlToMap(String strxml) { strxml = strxml.replaceFirst("encoding=\".*\"", "encoding=\"UTF-8\""); diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/genutils/CommonResult.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/genutils/CommonResult.java deleted file mode 100644 index 50b9bab8..00000000 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/genutils/CommonResult.java +++ /dev/null @@ -1,165 +0,0 @@ -package com.zbkj.common.utils.genutils; - -import com.zbkj.common.exception.ExceptionCodeEnum; -import com.zbkj.common.exception.ExceptionHandler; - -/** - * 公共返回对象 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - */ -public class CommonResult { - private long code; - private String message; - private T data; - - protected CommonResult() { - } - - protected CommonResult(long code, String message, T data) { - this.code = code; - this.message = message; - this.data = data; - } - - /** - * 成功返回结果 - */ - public static CommonResult success() { - return new CommonResult(ExceptionCodeEnum.SUCCESS.getCode(), ExceptionCodeEnum.SUCCESS.getMessage(), null); - } - - /** - * 成功返回结果 - */ - public static CommonResult success(String message) { - return new CommonResult(ExceptionCodeEnum.SUCCESS.getCode(), message, null); - } - - /** - * 成功返回结果 - * - * @param data 获取的数据 - */ - public static CommonResult success(T data) { - return new CommonResult(ExceptionCodeEnum.SUCCESS.getCode(), ExceptionCodeEnum.SUCCESS.getMessage(), data); - } - - /** - * 成功返回结果 - * - * @param data 获取的数据 - * @param message 提示信息 - */ - public static CommonResult success(T data, String message) { - return new CommonResult(ExceptionCodeEnum.SUCCESS.getCode(), message, data); - } - - /** - * 失败返回结果 - * @param errorCode 错误码 - */ - public static CommonResult failed(ExceptionHandler errorCode) { - System.out.println("errorCode1:" + errorCode); - return new CommonResult(errorCode.getCode(), errorCode.getMessage(), null); - } - - /** - * 失败返回结果 - * @param errorCode 错误码 - * @param message 错误信息 - */ - public static CommonResult failed(ExceptionHandler errorCode,String message) { - System.out.println("errorCode2:" + errorCode); - return new CommonResult(errorCode.getCode(), message, null); - } - - /** - * 失败返回结果 - * @param message 提示信息 - */ - public static CommonResult failed(String message) { - return new CommonResult(ExceptionCodeEnum.FAILED.getCode(), message, null); - } - - /** - * 失败返回结果 - */ - public static CommonResult failed() { - return failed(ExceptionCodeEnum.FAILED); - } - - /** - * 参数验证失败返回结果 - */ - public static CommonResult validateFailed() { - return failed(ExceptionCodeEnum.VALIDATE_FAILED); - } - - /** - * 参数验证失败返回结果 - * @param message 提示信息 - */ - public static CommonResult validateFailed(String message) { - return new CommonResult(ExceptionCodeEnum.VALIDATE_FAILED.getCode(), message, null); - } - - /** - * 未登录返回结果 - */ - public static CommonResult unauthorized(T data) { - return new CommonResult(ExceptionCodeEnum.UNAUTHORIZED.getCode(), ExceptionCodeEnum.UNAUTHORIZED.getMessage(), data); - } - - /** - * 未登录返回结果 - */ - public static CommonResult unauthorized() { - return new CommonResult(ExceptionCodeEnum.UNAUTHORIZED.getCode(), ExceptionCodeEnum.UNAUTHORIZED.getMessage(), null); - } - - /** - * 没有权限查看 - */ - public static CommonResult forbidden() { - return new CommonResult(ExceptionCodeEnum.FORBIDDEN.getCode(), ExceptionCodeEnum.FORBIDDEN.getMessage(), null); - } - - /** - * 未授权返回结果 - */ - public static CommonResult forbidden(T data) { - return new CommonResult(ExceptionCodeEnum.FORBIDDEN.getCode(), ExceptionCodeEnum.FORBIDDEN.getMessage(), data); - } - - public long getCode() { - return code; - } - - public void setCode(long code) { - this.code = code; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public T getData() { - return data; - } - - public void setData(T data) { - this.data = data; - } -} diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/genutils/GenCodePageListUtils.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/genutils/GenCodePageListUtils.java deleted file mode 100644 index dab7171a..00000000 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/genutils/GenCodePageListUtils.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.zbkj.common.utils.genutils; - -import java.io.Serializable; -import java.util.List; - -/** - * 代码生成对象 仅仅用于代码生成 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - */ -public class GenCodePageListUtils implements Serializable { - private static final long serialVersionUID = 1L; - //总记录数 - private int totalCount; - //每页记录数 - private int pageSize; - //总页数 - private int totalPage; - //当前页数 - private int currPage; - //列表数据 - private List list; - - /** - * 分页 - * @param list 列表数据 - * @param totalCount 总记录数 - * @param pageSize 每页记录数 - * @param currPage 当前页数 - */ - public GenCodePageListUtils(List list, int totalCount, int pageSize, int currPage) { - this.list = list; - this.totalCount = totalCount; - this.pageSize = pageSize; - this.currPage = currPage; - this.totalPage = (int)Math.ceil((double)totalCount/pageSize); - } - - public int getTotalCount() { - return totalCount; - } - - public void setTotalCount(int totalCount) { - this.totalCount = totalCount; - } - - public int getPageSize() { - return pageSize; - } - - public void setPageSize(int pageSize) { - this.pageSize = pageSize; - } - - public int getTotalPage() { - return totalPage; - } - - public void setTotalPage(int totalPage) { - this.totalPage = totalPage; - } - - public int getCurrPage() { - return currPage; - } - - public void setCurrPage(int currPage) { - this.currPage = currPage; - } - - public List getList() { - return list; - } - - public void setList(List list) { - this.list = list; - } - -} diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/genutils/GenCodePageQueryUtils.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/genutils/GenCodePageQueryUtils.java deleted file mode 100644 index 35e84d1f..00000000 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/genutils/GenCodePageQueryUtils.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.zbkj.common.utils.genutils; - - -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.LinkedHashMap; -import java.util.Map; - -/** - * 用于代码生成 数据库查询分页对象 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class GenCodePageQueryUtils extends LinkedHashMap { - private int page; - private int limit; - public GenCodePageQueryUtils(Map params){ - this.putAll(params); - - //分页参数 - this.page = Integer.parseInt(params.get("page").toString()); - this.limit = Integer.parseInt(params.get("limit").toString()); - this.put("offset", (page - 1) * limit); - this.put("page", page); - this.put("limit", limit); - } - -} diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/genutils/GenCodeUtils.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/genutils/GenCodeUtils.java deleted file mode 100644 index 6928e3e3..00000000 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/genutils/GenCodeUtils.java +++ /dev/null @@ -1,243 +0,0 @@ -package com.zbkj.common.utils.genutils; - - -import com.zbkj.common.exception.CrmebException; -import com.zbkj.common.model.gencode.mysql.ColumnEntity; -import com.zbkj.common.model.gencode.mysql.TableEntity; -import com.zbkj.common.utils.DateUtil; -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.ConfigurationException; -import org.apache.commons.configuration.PropertiesConfiguration; -import org.apache.commons.lang.WordUtils; -import org.apache.velocity.Template; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.Velocity; -import java.io.File; -import java.io.IOException; -import java.io.StringWriter; -import java.util.*; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; - -/** - * 代码生成工具类 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - */ -public class GenCodeUtils { - public static List getTemplatesLocationConfig() { - List templates = new ArrayList(); - - templates.add("template/xml/Dao.xml.vm"); - - templates.add("template/sql/eb_system_menu.sql.vm"); - - templates.add("template/java/Entity.java.vm"); - templates.add("template/java/Service.java.vm"); - templates.add("template/java/ServiceImpl.java.vm"); - templates.add("template/java/Controller.java.vm"); - templates.add("template/java/Dao.java.vm"); - - templates.add("template/vue/index.vue.vm"); - templates.add("template/vue/api.js.vm"); - templates.add("template/vue/add-and-update.vue.vm"); - return templates; - } - - - /** - * 生成代码 - */ - public static void generatorCode(Map table, - List> columns, ZipOutputStream zip) { - //配置信息 - Configuration config = getConfig(); - boolean hasBigDecimal = false; - boolean hasList = false; - //表信息 - TableEntity tableEntity = new TableEntity(); - tableEntity.setTableName(table.get("tableName")); - tableEntity.setComments(table.get("tableComment")); - //表名转换成Java类名 - String className = tableToJava(tableEntity.getTableName(), config.getStringArray("tablePrefix")); - tableEntity.setClassName(className); - tableEntity.setClassname(StringUtils.uncapitalize(className)); - - //列信息 - List columsList = new ArrayList<>(); - for (Map column : columns) { - ColumnEntity columnEntity = new ColumnEntity(); - columnEntity.setColumnName(column.get("columnName")); - columnEntity.setDataType(column.get("dataType")); - columnEntity.setComments(column.get("columnComment")); - columnEntity.setExtra(column.get("extra")); - - //列名转换成Java属性名 - String attrName = columnToJava(columnEntity.getColumnName()); - columnEntity.setAttrName(attrName); - columnEntity.setAttrname(StringUtils.uncapitalize(attrName)); - - //列的数据类型，转换成Java类型 - String attrType = config.getString(columnEntity.getDataType(), columnToJava(columnEntity.getDataType())); - columnEntity.setAttrType(attrType); - - - if (!hasBigDecimal && "BigDecimal".equals(attrType)) { - hasBigDecimal = true; - } - if (!hasList && "array".equals(columnEntity.getExtra())) { - hasList = true; - } - //是否主键 - if ("PRI".equalsIgnoreCase(column.get("columnKey")) && tableEntity.getPk() == null) { - tableEntity.setPk(columnEntity); - } - - columsList.add(columnEntity); - } - tableEntity.setColumns(columsList); - - //没主键，则第一个字段为主键 - if (tableEntity.getPk() == null) { - tableEntity.setPk(tableEntity.getColumns().get(0)); - } - - //设置velocity资源加载器 - Properties prop = new Properties(); - prop.put("file.resource.loader.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader"); - Velocity.init(prop); - String mainPath = config.getString("mainPath"); - mainPath = StringUtils.isBlank(mainPath) ? "com.crmeb" : mainPath; - Map map = new HashMap<>(); - map.put("tableName", tableEntity.getTableName()); - map.put("comments", tableEntity.getComments()); - map.put("pk", tableEntity.getPk()); - map.put("className", tableEntity.getClassName()); - map.put("classname", tableEntity.getClassname()); - map.put("pathName", tableEntity.getClassname().toLowerCase()); - map.put("columns", tableEntity.getColumns()); - map.put("hasBigDecimal", hasBigDecimal); - map.put("hasList", hasList); - map.put("mainPath", mainPath); - map.put("package", config.getString("package")); - map.put("moduleName", config.getString("moduleName")); - map.put("author", config.getString("author")); - map.put("email", config.getString("email")); - map.put("datetime", DateUtil.nowDateTime()); - VelocityContext context = new VelocityContext(map); - - //读取模版 - List templates = getTemplatesLocationConfig(); - for (String template : templates) { - StringWriter sw = new StringWriter(); - Template tpl = Velocity.getTemplate(template, "UTF-8"); - tpl.merge(context, sw); - try { - zip.finish(); - zip.putNextEntry(new ZipEntry(getFileName(template, tableEntity.getClassName(), config.getString("package"), config.getString("moduleName")))); - IOUtils.write(sw.toString(), zip, "UTF-8"); - IOUtils.closeQuietly(sw); - zip.closeEntry(); - } catch (IOException e) { - throw new CrmebException("Play Up Template Failed：" + tableEntity.getTableName()+e.getMessage()); - } - } - } - - /** - * 列名转换成Java属性名 - */ - public static String columnToJava(String columnName) { - return WordUtils.capitalizeFully(columnName, new char[]{'_'}).replace("_", ""); - } - - /** - * 表名转换成Java类名 - */ - public static String tableToJava(String tableName, String[] tablePrefixArray) { - if (null != tablePrefixArray && tablePrefixArray.length > 0) { - for (String tablePrefix : tablePrefixArray) { - if (tableName.startsWith(tablePrefix)){ - tableName = tableName.replaceFirst(tablePrefix, ""); - } - } - } - return columnToJava(tableName); - } - - /** - * 获取配置信息 - */ - public static Configuration getConfig() { - try { - return new PropertiesConfiguration("generator.properties"); - } catch (ConfigurationException e) { - throw new CrmebException("Get config Failed，" + e.getMessage()); - } - } - - /** - * 根据配置生成对应文件 - */ - public static String getFileName(String template, String className, String packageName, String moduleName) { - String packagePath = "main" + File.separator + "java" + File.separator; - if (StringUtils.isNotBlank(packageName)) { - packagePath += packageName.replace(".", File.separator) + File.separator + moduleName + File.separator; - } - - if (template.contains("Entity.java.vm")) { - return packagePath + "entity" + File.separator + className + "Entity.java"; - } - - if (template.contains("Dao.java.vm")) { - return packagePath + "dao" + File.separator + className + "Dao.java"; - } - - if (template.contains("Service.java.vm")) { - return packagePath + "service" + File.separator + className + "Service.java"; - } - - if (template.contains("ServiceImpl.java.vm")) { - return packagePath + "service" + File.separator + "impl" + File.separator + className + "ServiceImpl.java"; - } - - if (template.contains("Controller.java.vm")) { - return packagePath + "controller" + File.separator + className + "Controller.java"; - } - - if (template.contains("Dao.xml.vm")) { - return "main" + File.separator + "resources" + File.separator + "mapper" + File.separator + moduleName + File.separator + className + "Dao.xml"; - } - - if (template.contains("menu.sql.vm")) { - return className.toLowerCase() + "_menu.sql"; - } - - if (template.contains("index.vue.vm")) { - return "main" + File.separator + "resources" + File.separator + "src" + File.separator + "views" + File.separator + "modules" + - File.separator + moduleName + File.separator + className.toLowerCase() + ".vue"; - } - - if (template.contains("api.js.vm")) { - return "main" + File.separator + "resources" + File.separator + "src" + File.separator + "views" + File.separator + "modules" + - File.separator + moduleName + File.separator + className.toLowerCase() + ".js"; - } - - if (template.contains("add-and-update.vue.vm")) { - return "main" + File.separator + "resources" + File.separator + "src" + File.separator + "views" + File.separator + "modules" + - File.separator + moduleName + File.separator + className.toLowerCase() + "-add-and-update.vue"; - } - return null; - } - - -} diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/validation/StringContainsValidator.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/validation/StringContainsValidator.java index 75ffd9eb..20a90649 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/validation/StringContainsValidator.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/validation/StringContainsValidator.java @@ -14,7 +14,7 @@ import java.util.stream.Collectors; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/AftersaleProductInfoVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/AftersaleProductInfoVo.java index 465f17e8..4634d721 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/AftersaleProductInfoVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/AftersaleProductInfoVo.java @@ -8,7 +8,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/AliPayJsResultVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/AliPayJsResultVo.java index f34b48fc..9d548b75 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/AliPayJsResultVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/AliPayJsResultVo.java @@ -9,7 +9,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ArticleVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ArticleVo.java index 70d74654..c6d53872 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ArticleVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ArticleVo.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/AttachVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/AttachVo.java index d6edfd5b..3855eef8 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/AttachVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/AttachVo.java @@ -11,7 +11,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/BargainProductExcelVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/BargainProductExcelVo.java index 9b51c22d..e5759794 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/BargainProductExcelVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/BargainProductExcelVo.java @@ -10,7 +10,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相关版权 * +---------------------------------------------------------------------- @@ -23,8 +23,8 @@ public class BargainProductExcelVo { @ApiModelProperty(value = "砍价活动名称") private String title; - @ApiModelProperty(value = "砍价活动简介") - private String info; +// @ApiModelProperty(value = "砍价活动简介") +// private String info; @ApiModelProperty(value = "砍价金额") private String price; diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/BaseResultResponseVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/BaseResultResponseVo.java index 5d54147c..aa7d5445 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/BaseResultResponseVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/BaseResultResponseVo.java @@ -8,7 +8,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CallbackVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CallbackVo.java index d4fc9811..acf95e2f 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CallbackVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CallbackVo.java @@ -12,7 +12,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CatItem.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CatItem.java index 4bf35b8a..734e0d6e 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CatItem.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CatItem.java @@ -9,7 +9,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CategoryTreeVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CategoryTreeVo.java index f124e398..097ad32f 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CategoryTreeVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CategoryTreeVo.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CloudVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CloudVo.java index 5d24c3fe..e10d4802 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CloudVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CloudVo.java @@ -7,7 +7,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CombinationProductExcelVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CombinationProductExcelVo.java index 06cca195..42570070 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CombinationProductExcelVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CombinationProductExcelVo.java @@ -10,7 +10,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CreateOrderH5SceneInfoDetailVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CreateOrderH5SceneInfoDetailVo.java index 24beccfd..bdc337e2 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CreateOrderH5SceneInfoDetailVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CreateOrderH5SceneInfoDetailVo.java @@ -11,7 +11,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CreateOrderH5SceneInfoVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CreateOrderH5SceneInfoVo.java index 8a16de78..fac895ff 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CreateOrderH5SceneInfoVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CreateOrderH5SceneInfoVo.java @@ -12,7 +12,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CreateOrderRequestVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CreateOrderRequestVo.java index 6c546dcb..e4294e1b 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CreateOrderRequestVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CreateOrderRequestVo.java @@ -11,7 +11,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CreateOrderResponseVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CreateOrderResponseVo.java index ca8a2d31..94945f15 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CreateOrderResponseVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/CreateOrderResponseVo.java @@ -12,7 +12,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/DeliveryCompanyVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/DeliveryCompanyVo.java index d84b571a..3533f685 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/DeliveryCompanyVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/DeliveryCompanyVo.java @@ -7,7 +7,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/DeliveryInfoVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/DeliveryInfoVo.java index 97a27243..eb55d8e6 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/DeliveryInfoVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/DeliveryInfoVo.java @@ -7,7 +7,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/DeliverySendVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/DeliverySendVo.java index 3b1255f1..9b600084 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/DeliverySendVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/DeliverySendVo.java @@ -10,7 +10,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ExpressSheetVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ExpressSheetVo.java index b210cc49..70937941 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ExpressSheetVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ExpressSheetVo.java @@ -11,7 +11,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/FileResultVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/FileResultVo.java index 985fc010..dbadb108 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/FileResultVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/FileResultVo.java @@ -6,7 +6,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/FirstCatVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/FirstCatVo.java index 0965d7b4..43e797d8 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/FirstCatVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/FirstCatVo.java @@ -9,7 +9,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ImageMergeUtilVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ImageMergeUtilVo.java index 7f6b88f6..0972b5b4 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ImageMergeUtilVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ImageMergeUtilVo.java @@ -11,7 +11,7 @@ import javax.validation.constraints.NotBlank; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/LogisticsResultListVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/LogisticsResultListVo.java index ad7f128c..37248e83 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/LogisticsResultListVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/LogisticsResultListVo.java @@ -11,7 +11,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/LogisticsResultVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/LogisticsResultVo.java index 7aa10036..17948833 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/LogisticsResultVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/LogisticsResultVo.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/MenuCheckTree.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/MenuCheckTree.java index 3e83b9a0..b91d42cf 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/MenuCheckTree.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/MenuCheckTree.java @@ -13,7 +13,7 @@ import java.util.stream.Collectors; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/MenuCheckVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/MenuCheckVo.java index b244bc4b..f9dceb76 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/MenuCheckVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/MenuCheckVo.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/MenuTree.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/MenuTree.java index 9768d1ad..4cec139d 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/MenuTree.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/MenuTree.java @@ -13,7 +13,7 @@ import java.util.stream.Collectors; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/MyRecord.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/MyRecord.java index b930e328..a16e164d 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/MyRecord.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/MyRecord.java @@ -19,7 +19,7 @@ import java.util.*; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -81,6 +81,7 @@ public class MyRecord implements Serializable { /** * Set columns value with Model object. + * * @param t * @param * @return @@ -92,8 +93,8 @@ public class MyRecord implements Serializable { for (int i = 0; i < fieldNames.length; i++) { String name = fieldNames[i]; - if (!StringUtils.isEmpty(name) &&"serialVersionUID".equals(name)) { - continue ; + if (!StringUtils.isEmpty(name) && "serialVersionUID".equals(name)) { + continue; } Object value = getFieldValueByName(name, t); if (null != value) { @@ -197,8 +198,8 @@ public class MyRecord implements Serializable { /** * Set column to record. * - * @param column the column name - * @param valueList the value of the column + * @param column the column name + * @param valueList the value of the column */ public MyRecord set(String column, List valueList) { List> value = new ArrayList<>(); diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/OnePassLoginVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/OnePassLoginVo.java index 38511e0d..1048d1df 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/OnePassLoginVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/OnePassLoginVo.java @@ -6,12 +6,14 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import javax.validation.constraints.NotBlank; + /** * 一号通登录对象 * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -26,13 +28,9 @@ public class OnePassLoginVo { private static final long serialVersionUID=1L; - @ApiModelProperty(value = "一号通账号") - private String account; - - /** - * secret = md5(账号+md5(密码)) - */ - @ApiModelProperty(value = "一号通密钥") - private String secret; + @ApiModelProperty(value = "access_key一号通后台AccessKey管理获得", required = true) + private String accessKey; + @ApiModelProperty(value = "secret_key一号通后台AccessKey管理获得", required = true) + private String secretKey; } diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/OnePassLogisticsQueryVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/OnePassLogisticsQueryVo.java index 51d2bf83..224e3249 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/OnePassLogisticsQueryVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/OnePassLogisticsQueryVo.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/OnePassLogisticsTrackVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/OnePassLogisticsTrackVo.java index 636fe22c..27a12061 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/OnePassLogisticsTrackVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/OnePassLogisticsTrackVo.java @@ -11,7 +11,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/OrderInfoDetailVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/OrderInfoDetailVo.java index a9136f97..05942295 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/OrderInfoDetailVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/OrderInfoDetailVo.java @@ -10,7 +10,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/OrderInfoVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/OrderInfoVo.java index 45f55aa0..698b4229 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/OrderInfoVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/OrderInfoVo.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ProductExcelVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ProductExcelVo.java index 3195e426..23e25b25 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ProductExcelVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ProductExcelVo.java @@ -14,7 +14,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相关版权 * +---------------------------------------------------------------------- @@ -32,8 +32,8 @@ public class ProductExcelVo implements Serializable { @ApiModelProperty(value = "商品名称") private String storeName; - @ApiModelProperty(value = "商品简介") - private String storeInfo; +// @ApiModelProperty(value = "商品简介") +// private String storeInfo; @ApiModelProperty(value = "商品分类") private String cateName; diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ProgramTempKeywordsVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ProgramTempKeywordsVo.java index 3de365c3..3d9abad4 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ProgramTempKeywordsVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ProgramTempKeywordsVo.java @@ -12,7 +12,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ProgramTemplateMessageVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ProgramTemplateMessageVo.java index 288e91cd..a3bac695 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ProgramTemplateMessageVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ProgramTemplateMessageVo.java @@ -13,7 +13,7 @@ import java.util.HashMap; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/PublicMyTemplateVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/PublicMyTemplateVo.java index 0b5b4e7b..1182786a 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/PublicMyTemplateVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/PublicMyTemplateVo.java @@ -11,7 +11,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/RegisterCheckAccessInfoItemVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/RegisterCheckAccessInfoItemVo.java index e3bf0071..1a163dfc 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/RegisterCheckAccessInfoItemVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/RegisterCheckAccessInfoItemVo.java @@ -7,7 +7,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/RegisterCheckDataItemnVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/RegisterCheckDataItemnVo.java index 85a3bbc2..5c86f8fd 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/RegisterCheckDataItemnVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/RegisterCheckDataItemnVo.java @@ -7,7 +7,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/RegisterCheckResponseVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/RegisterCheckResponseVo.java index c0664eb4..a58216af 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/RegisterCheckResponseVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/RegisterCheckResponseVo.java @@ -1,13 +1,14 @@ package com.zbkj.common.vo; import lombok.Data; +import lombok.EqualsAndHashCode; /** * 获取接入状态 response * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -15,6 +16,7 @@ import lombok.Data; * +---------------------------------------------------------------------- */ @Data +@EqualsAndHashCode(callSuper = false) public class RegisterCheckResponseVo extends BaseResultResponseVo { private RegisterCheckDataItemnVo data; diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/RoutineMyTemplateVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/RoutineMyTemplateVo.java index 14781f4d..bc47fedb 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/RoutineMyTemplateVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/RoutineMyTemplateVo.java @@ -11,7 +11,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/RoutineTemplateKeyVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/RoutineTemplateKeyVo.java index 539a2bbb..6e5dd025 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/RoutineTemplateKeyVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/RoutineTemplateKeyVo.java @@ -11,7 +11,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SecondCatVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SecondCatVo.java index aa389884..0c903344 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SecondCatVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SecondCatVo.java @@ -10,7 +10,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SendProgramTemplateMessageItemVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SendProgramTemplateMessageItemVo.java index 4c2f52db..db536018 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SendProgramTemplateMessageItemVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SendProgramTemplateMessageItemVo.java @@ -11,7 +11,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SendSmsVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SendSmsVo.java index 375a5328..bbbcd701 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SendSmsVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SendSmsVo.java @@ -7,7 +7,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SendTemplateMessageItemVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SendTemplateMessageItemVo.java index 136a285a..8755c3a4 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SendTemplateMessageItemVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SendTemplateMessageItemVo.java @@ -13,7 +13,7 @@ import java.util.HashMap; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAftersaleAddVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAftersaleAddVo.java index 985debb5..0aa71937 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAftersaleAddVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAftersaleAddVo.java @@ -10,7 +10,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAftersaleUpdateVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAftersaleUpdateVo.java index 13c481a6..1d9de51e 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAftersaleUpdateVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAftersaleUpdateVo.java @@ -10,7 +10,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAftersaleVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAftersaleVo.java index 00f9c22e..af5283e5 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAftersaleVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAftersaleVo.java @@ -10,7 +10,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditBrandRequestItemDataVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditBrandRequestItemDataVo.java index 939aac58..8c4eda1b 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditBrandRequestItemDataVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditBrandRequestItemDataVo.java @@ -12,7 +12,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditBrandRequestItemVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditBrandRequestItemVo.java index 48c9dc80..ea5be93b 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditBrandRequestItemVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditBrandRequestItemVo.java @@ -10,7 +10,7 @@ import javax.validation.constraints.NotBlank; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditBrandRequestVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditBrandRequestVo.java index 7813e771..e49cca2b 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditBrandRequestVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditBrandRequestVo.java @@ -8,7 +8,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditBrandResponseVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditBrandResponseVo.java index 8f0c5005..401c97bc 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditBrandResponseVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditBrandResponseVo.java @@ -2,13 +2,14 @@ package com.zbkj.common.vo; import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; +import lombok.EqualsAndHashCode; /** * * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -16,6 +17,7 @@ import lombok.Data; * +---------------------------------------------------------------------- */ @Data +@EqualsAndHashCode(callSuper = false) public class ShopAuditBrandResponseVo extends BaseResultResponseVo { // 审核单id @TableField(value = "audit_id") diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditCategoryRequestItemDataVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditCategoryRequestItemDataVo.java index 4e56a812..980c31c5 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditCategoryRequestItemDataVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditCategoryRequestItemDataVo.java @@ -7,7 +7,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditCategoryRequestItemVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditCategoryRequestItemVo.java index 690397d3..7d1e95fe 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditCategoryRequestItemVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditCategoryRequestItemVo.java @@ -7,7 +7,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditCategoryRequestVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditCategoryRequestVo.java index 35291447..76105500 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditCategoryRequestVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditCategoryRequestVo.java @@ -7,7 +7,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditCategoryResponseVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditCategoryResponseVo.java index d582a392..84c10a4f 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditCategoryResponseVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditCategoryResponseVo.java @@ -1,13 +1,14 @@ package com.zbkj.common.vo; import lombok.Data; +import lombok.EqualsAndHashCode; /** * 上传类目资质 response * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -15,6 +16,7 @@ import lombok.Data; * +---------------------------------------------------------------------- */ @Data +@EqualsAndHashCode(callSuper = false) public class ShopAuditCategoryResponseVo extends BaseResultResponseVo { private String audit_id; } diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditGetMinCerBrandInfoItem.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditGetMinCerBrandInfoItem.java index 58c8f18e..911a4ff2 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditGetMinCerBrandInfoItem.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditGetMinCerBrandInfoItem.java @@ -5,7 +5,7 @@ package com.zbkj.common.vo; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditGetMinCerBrandInfoItemDataVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditGetMinCerBrandInfoItemDataVo.java index 705ec81c..a163f018 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditGetMinCerBrandInfoItemDataVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditGetMinCerBrandInfoItemDataVo.java @@ -7,7 +7,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditResultResponseVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditResultResponseVo.java index 68c4c221..1ff0ad76 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditResultResponseVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopAuditResultResponseVo.java @@ -1,13 +1,14 @@ package com.zbkj.common.vo; import lombok.Data; +import lombok.EqualsAndHashCode; /** * 查询审核结果 Response * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -15,6 +16,7 @@ import lombok.Data; * +---------------------------------------------------------------------- */ @Data +@EqualsAndHashCode(callSuper = false) public class ShopAuditResultResponseVo extends BaseResultResponseVo { private ItemData data; diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopBrandVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopBrandVo.java index c5b479c2..6e1855a1 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopBrandVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopBrandVo.java @@ -8,7 +8,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopCatDetailVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopCatDetailVo.java index ac9eeefd..a2152681 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopCatDetailVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopCatDetailVo.java @@ -8,7 +8,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopCatVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopCatVo.java index e6338168..fa827f8e 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopCatVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopCatVo.java @@ -10,7 +10,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderAddResultVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderAddResultVo.java index c41a12a3..44c4613f 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderAddResultVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderAddResultVo.java @@ -8,7 +8,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderAddVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderAddVo.java index 9e04abeb..8a859a89 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderAddVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderAddVo.java @@ -8,7 +8,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderAddressInfoAddVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderAddressInfoAddVo.java index dfc983fc..df6bcc33 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderAddressInfoAddVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderAddressInfoAddVo.java @@ -8,7 +8,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderCommonVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderCommonVo.java index 589cec1c..155b7f92 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderCommonVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderCommonVo.java @@ -8,7 +8,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderDeliveryDetailAddVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderDeliveryDetailAddVo.java index ba8963bd..59e48c64 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderDeliveryDetailAddVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderDeliveryDetailAddVo.java @@ -8,7 +8,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderDeliveryDetailVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderDeliveryDetailVo.java index c856879f..743b2b6e 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderDeliveryDetailVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderDeliveryDetailVo.java @@ -10,7 +10,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderDeliveryInfoVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderDeliveryInfoVo.java index e4285161..7057d50a 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderDeliveryInfoVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderDeliveryInfoVo.java @@ -11,7 +11,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderDetailAddVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderDetailAddVo.java index 7103cdad..40290ca8 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderDetailAddVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderDetailAddVo.java @@ -10,7 +10,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderDetailVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderDetailVo.java index b3617892..417ac54a 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderDetailVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderDetailVo.java @@ -10,7 +10,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderPayInfoAddVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderPayInfoAddVo.java index 9901ce05..b6b4e55a 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderPayInfoAddVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderPayInfoAddVo.java @@ -8,7 +8,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderPayInfoVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderPayInfoVo.java index 8dc1db4e..3466902d 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderPayInfoVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderPayInfoVo.java @@ -8,7 +8,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderPayVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderPayVo.java index 5c651701..6a1e089d 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderPayVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderPayVo.java @@ -8,7 +8,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderPriceInfoVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderPriceInfoVo.java index 5eac87dc..5ba9213a 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderPriceInfoVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderPriceInfoVo.java @@ -8,7 +8,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderProductInfoAddVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderProductInfoAddVo.java index ae3e92cb..efe97759 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderProductInfoAddVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderProductInfoAddVo.java @@ -12,7 +12,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderProductInfoVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderProductInfoVo.java index ce59dedd..7cf82f7f 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderProductInfoVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderProductInfoVo.java @@ -8,7 +8,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderVo.java index ee2453f1..eb0f3c35 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopOrderVo.java @@ -8,7 +8,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuAddResponseVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuAddResponseVo.java index b8118778..eb8616e0 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuAddResponseVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuAddResponseVo.java @@ -10,7 +10,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuAddSkuResponseVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuAddSkuResponseVo.java index e6c4c129..8a3b86eb 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuAddSkuResponseVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuAddSkuResponseVo.java @@ -8,7 +8,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuAddVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuAddVo.java index 81685dc3..d83d9a48 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuAddVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuAddVo.java @@ -10,7 +10,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuAuditVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuAuditVo.java index 3ecaa23b..45f08163 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuAuditVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuAuditVo.java @@ -8,7 +8,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuCommonVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuCommonVo.java index ac50b305..f2d7b45b 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuCommonVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuCommonVo.java @@ -8,7 +8,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuInfoVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuInfoVo.java index b85452ec..747a92c3 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuInfoVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuInfoVo.java @@ -9,7 +9,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuListRequestVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuListRequestVo.java index 4468dd02..c9041538 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuListRequestVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuListRequestVo.java @@ -8,7 +8,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuListResponseVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuListResponseVo.java index 85724ac5..7815184c 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuListResponseVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuListResponseVo.java @@ -10,7 +10,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuSkuAttrVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuSkuAttrVo.java index 88fd8982..a860bc0c 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuSkuAttrVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuSkuAttrVo.java @@ -8,7 +8,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuSkuVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuSkuVo.java index 7b81e83f..0670363b 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuSkuVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuSkuVo.java @@ -10,7 +10,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuVo.java index 4f9bee13..31a6b8e9 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ShopSpuVo.java @@ -10,7 +10,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相关版权 * +---------------------------------------------------------------------- @@ -59,7 +59,7 @@ public class ShopSpuVo { /** 预留字段，用于版本控制 */ @TableField(value = "info_version") - private Integer infoVersion; + private String infoVersion; /** 创建时间 */ @TableField(value = "create_time") diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/StoreOrderInfoOldVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/StoreOrderInfoOldVo.java index 0839ff14..30d70ae5 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/StoreOrderInfoOldVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/StoreOrderInfoOldVo.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/StoreOrderInfoVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/StoreOrderInfoVo.java index 49247613..5e91c55c 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/StoreOrderInfoVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/StoreOrderInfoVo.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SystemCityTreeVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SystemCityTreeVo.java index 1323f2d7..b1930eb6 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SystemCityTreeVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SystemCityTreeVo.java @@ -16,7 +16,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SystemConfigFormItemConfigRegListVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SystemConfigFormItemConfigRegListVo.java index 324626ab..27c745ad 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SystemConfigFormItemConfigRegListVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SystemConfigFormItemConfigRegListVo.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SystemConfigFormItemConfigVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SystemConfigFormItemConfigVo.java index 8fba8d2f..ce4f45ab 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SystemConfigFormItemConfigVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SystemConfigFormItemConfigVo.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SystemConfigFormItemVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SystemConfigFormItemVo.java index 0f364552..b339061f 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SystemConfigFormItemVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SystemConfigFormItemVo.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SystemConfigFormVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SystemConfigFormVo.java index a94f9f92..0bde79a0 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SystemConfigFormVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SystemConfigFormVo.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SystemGroupDataRechargeConfigVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SystemGroupDataRechargeConfigVo.java index 36720076..2d915787 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SystemGroupDataRechargeConfigVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SystemGroupDataRechargeConfigVo.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SystemGroupDataSignConfigVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SystemGroupDataSignConfigVo.java index 89ca6391..9b8af08d 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SystemGroupDataSignConfigVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SystemGroupDataSignConfigVo.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SystemStoreNearVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SystemStoreNearVo.java index b19446c4..3301c23b 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SystemStoreNearVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/SystemStoreNearVo.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/TemplateMessageVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/TemplateMessageVo.java index ec30b069..94d6f3e7 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/TemplateMessageVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/TemplateMessageVo.java @@ -13,7 +13,7 @@ import java.util.HashMap; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ThirdCatVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ThirdCatVo.java index 0ea2ee61..da60257b 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ThirdCatVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/ThirdCatVo.java @@ -7,7 +7,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/UploadCommonVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/UploadCommonVo.java index b492371e..448766b3 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/UploadCommonVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/UploadCommonVo.java @@ -8,7 +8,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/UserFundsMonitor.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/UserFundsMonitor.java index f9877bf8..d22659d9 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/UserFundsMonitor.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/UserFundsMonitor.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/UserSignMonthVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/UserSignMonthVo.java index 33a82eff..9cce02d5 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/UserSignMonthVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/UserSignMonthVo.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/UserSignVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/UserSignVo.java index 4be8c74d..a6d44995 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/UserSignVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/UserSignVo.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/WeChatAccessTokenVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/WeChatAccessTokenVo.java index f07a4a59..63c4f3cd 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/WeChatAccessTokenVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/WeChatAccessTokenVo.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/WeChatAuthorizeLoginUserInfoVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/WeChatAuthorizeLoginUserInfoVo.java index 09dd5127..8a0707de 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/WeChatAuthorizeLoginUserInfoVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/WeChatAuthorizeLoginUserInfoVo.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/WeChatMiniAuthorizeVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/WeChatMiniAuthorizeVo.java index 73d8b5fa..dc0bf9a3 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/WeChatMiniAuthorizeVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/WeChatMiniAuthorizeVo.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/WechatVideoUploadImageResponseVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/WechatVideoUploadImageResponseVo.java index b74a4b86..bd033464 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/WechatVideoUploadImageResponseVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/WechatVideoUploadImageResponseVo.java @@ -1,26 +1,23 @@ package com.zbkj.common.vo; import lombok.Data; +import lombok.EqualsAndHashCode; /** * * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- * | Author: CRMEB Team * +---------------------------------------------------------------------- */ +@EqualsAndHashCode(callSuper = true) @Data public class WechatVideoUploadImageResponseVo extends BaseResultResponseVo { - private imageInfo img_info; - - @Data - class imageInfo{ - private String media_id; - } + private WechatVideoUploadImageInfoVo img_info; } diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/WxPayJsResultVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/WxPayJsResultVo.java index c8ddc8a8..1e11d411 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/WxPayJsResultVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/WxPayJsResultVo.java @@ -9,7 +9,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/WxRefundResponseVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/WxRefundResponseVo.java index c8e829da..8dbdba26 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/WxRefundResponseVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/WxRefundResponseVo.java @@ -12,7 +12,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/WxRefundVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/WxRefundVo.java index b5a26961..91ed9099 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/WxRefundVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/WxRefundVo.java @@ -12,7 +12,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/dateLimitUtilVo.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/dateLimitUtilVo.java index f1035500..a9bfac79 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/dateLimitUtilVo.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/vo/dateLimitUtilVo.java @@ -7,7 +7,7 @@ import lombok.Data; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -15,9 +15,9 @@ import lombok.Data; * +---------------------------------------------------------------------- */ @Data -public class dateLimitUtilVo { - public dateLimitUtilVo() {} - public dateLimitUtilVo(String startTime, String endTime) { +public class DateLimitUtilVo { + public DateLimitUtilVo() {} + public DateLimitUtilVo(String startTime, String endTime) { this.startTime = startTime; this.endTime = endTime; } diff --git a/crmeb/crmeb-front/pom.xml b/crmeb/crmeb-front/pom.xml index 9beae282..d907eda6 100644 --- a/crmeb/crmeb-front/pom.xml +++ b/crmeb/crmeb-front/pom.xml @@ -40,6 +40,22 @@ + + org.apache.maven.plugins + maven-resources-plugin + + + true + + woff + woff2 + eot + ttf + svg + xdb + + + @@ -71,6 +87,17 @@ **/*.xml + + true + src/main/resources + + **/*.woff + **/*.ttf + **/*.eot + **/*.svg + ip2region/ip2region.xdb + + diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/CrmebFrontApplication.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/CrmebFrontApplication.java index c3020667..dd25614d 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/CrmebFrontApplication.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/CrmebFrontApplication.java @@ -15,7 +15,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/CorsConfig.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/CorsConfig.java index fdf323fb..75acca2f 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/CorsConfig.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/CorsConfig.java @@ -10,7 +10,7 @@ import org.springframework.web.filter.CorsFilter; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/DruidConfig.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/DruidConfig.java index 981f1ba4..043e75c5 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/DruidConfig.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/DruidConfig.java @@ -16,7 +16,7 @@ import javax.sql.DataSource; * +---------------------------------------------------------------------- * | 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,18 +35,20 @@ public class DruidConfig { servletRegistrationBean.addInitParameter("loginUsername", "kf"); // 用户名 servletRegistrationBean.addInitParameter("loginPassword", "654321"); // 密码 servletRegistrationBean.addInitParameter("resetEnable", "true"); // 是否可以重置数据源 - return servletRegistrationBean ; + return servletRegistrationBean; } + @Bean public FilterRegistrationBean filterRegistrationBean() { - FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean() ; + FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean(); filterRegistrationBean.setFilter(new WebStatFilter()); filterRegistrationBean.addUrlPatterns("/*"); // 所有请求进行监控处理 //不必监控的请求 filterRegistrationBean.addInitParameter("exclusions", "*.html,*.png,*.ico,*.js,*.gif,*.jpg,*.css,/druid/*"); - return filterRegistrationBean ; + return filterRegistrationBean; } + @Bean("dataSource") @ConfigurationProperties(prefix = "spring.datasource") public DataSource druidDataSource() { diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/JacksonConfig.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/JacksonConfig.java index 64b6706f..624d4dd3 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/JacksonConfig.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/JacksonConfig.java @@ -12,7 +12,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/RestTemplateConfig.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/RestTemplateConfig.java index 0fcd52da..08d62b3d 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/RestTemplateConfig.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/RestTemplateConfig.java @@ -18,7 +18,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/SwaggerConfig.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/SwaggerConfig.java index 847ff6ea..4fd7310e 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/SwaggerConfig.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/SwaggerConfig.java @@ -30,7 +30,7 @@ import static com.google.common.collect.Lists.newArrayList; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/TaskExecutorConfig.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/TaskExecutorConfig.java index 39714694..9a60a7e4 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/TaskExecutorConfig.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/TaskExecutorConfig.java @@ -13,7 +13,7 @@ import java.util.concurrent.ThreadPoolExecutor; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/WebConfig.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/WebConfig.java index 763f7a7a..e3e2296e 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/WebConfig.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/WebConfig.java @@ -19,7 +19,7 @@ import org.springframework.web.servlet.handler.MappedInterceptor; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -76,19 +76,32 @@ public class WebConfig implements WebMvcConfigurer { excludePathPatterns("/api/front/groom/list/**"). excludePathPatterns("/api/front/config"). excludePathPatterns("/api/front/category"). + excludePathPatterns("/api/front/categorybypid/*"). excludePathPatterns("/api/front/seckill/*"). excludePathPatterns("/api/front/seckill/list/*"). excludePathPatterns("/api/front/seckill/detail/*"). + excludePathPatterns("/api/front/seckill/detail"). excludePathPatterns("/api/front/ios/*"). excludePathPatterns("/api/front/ios/register/binding/phone"). - excludePathPatterns("api/front/combination/index"). - excludePathPatterns("api/front/seckill/index"). - excludePathPatterns("api/front/bargain/index"). - excludePathPatterns("api/front/combination/index"). - excludePathPatterns("api/front/index/product/*"). - excludePathPatterns("api/front/index/color/config"). - excludePathPatterns("api/front/image/domain"). - excludePathPatterns("api/front/product/leaderboard"). + excludePathPatterns("/api/front/combination/index"). + excludePathPatterns("/api/front/seckill/index"). + excludePathPatterns("/api/front/bargain/index"). + excludePathPatterns("/api/front/bargain/header"). + excludePathPatterns("/api/front/bargain/detail"). + excludePathPatterns("/api/front/index/product/*"). + excludePathPatterns("/api/front/index/color/config"). + excludePathPatterns("/api/front/image/domain"). + excludePathPatterns("/api/front/product/leaderboard"). + excludePathPatterns("/api/front/product/byids/**"). + excludePathPatterns("/api/front/token/is/exist"). + excludePathPatterns("/api/front/login/config"). + excludePathPatterns("/api/front/copyright/info"). + excludePathPatterns("/api/front/get/bottom/navigation"). + excludePathPatterns("/api/front/agreement/**"). + excludePathPatterns("/api/front/pagediy/**"). + excludePathPatterns("/api/front/menu/user"). + excludePathPatterns("/api/front/combination/header"). + excludePathPatterns("/api/front/combination/detail"). excludePathPatterns("/swagger-resources/**", "/webjars/**", "/v2/**", "/swagger-ui.html/**"); } diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/ArticleController.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/ArticleController.java index 2b736f89..4bac73a9 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/ArticleController.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/ArticleController.java @@ -1,11 +1,11 @@ package com.zbkj.front.controller; -import com.zbkj.common.page.CommonPage; -import com.zbkj.common.response.ArticleResponse; -import com.zbkj.common.response.CommonResult; -import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.model.article.Article; import com.zbkj.common.model.category.Category; +import com.zbkj.common.page.CommonPage; +import com.zbkj.common.request.PageParamRequest; +import com.zbkj.common.response.ArticleResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.ArticleService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -21,7 +21,7 @@ import org.springframework.web.bind.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/BargainController.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/BargainController.java index 29c746bd..dfc88178 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/BargainController.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/BargainController.java @@ -1,10 +1,11 @@ package com.zbkj.front.controller; +import com.github.pagehelper.PageInfo; import com.zbkj.common.page.CommonPage; import com.zbkj.common.request.BargainFrontRequest; import com.zbkj.common.request.PageParamRequest; -import com.github.pagehelper.PageInfo; import com.zbkj.common.response.*; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.StoreBargainService; import com.zbkj.service.service.StoreBargainUserHelpService; import com.zbkj.service.service.StoreBargainUserService; @@ -22,7 +23,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/CartController.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/CartController.java index aa27feb8..2c3ca713 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/CartController.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/CartController.java @@ -4,9 +4,9 @@ import com.zbkj.common.page.CommonPage; import com.zbkj.common.request.CartNumRequest; import com.zbkj.common.request.CartRequest; import com.zbkj.common.request.CartResetRequest; -import com.zbkj.common.response.CartInfoResponse; -import com.zbkj.common.response.CommonResult; import com.zbkj.common.request.PageParamRequest; +import com.zbkj.common.response.CartInfoResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.StoreCartService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -28,7 +28,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/CityController.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/CityController.java index 431ff9ff..1e2c28a4 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/CityController.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/CityController.java @@ -1,7 +1,7 @@ package com.zbkj.front.controller; -import com.zbkj.common.response.CommonResult; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.SystemCityService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/CombinationController.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/CombinationController.java index 8a5f8c99..32873dd7 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/CombinationController.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/CombinationController.java @@ -1,11 +1,12 @@ package com.zbkj.front.controller; -import com.zbkj.common.page.CommonPage; -import com.zbkj.common.request.PageParamRequest; import com.github.pagehelper.PageInfo; import com.zbkj.common.model.combination.StoreCombination; +import com.zbkj.common.page.CommonPage; +import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.StorePinkRequest; import com.zbkj.common.response.*; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.StoreCombinationService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -19,7 +20,7 @@ import org.springframework.web.bind.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/CouponController.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/CouponController.java index 3628fe9b..def7ebcc 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/CouponController.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/CouponController.java @@ -1,9 +1,10 @@ package com.zbkj.front.controller; -import com.zbkj.common.response.CommonResult; +import com.zbkj.common.page.CommonPage; import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.response.StoreCouponFrontResponse; import com.zbkj.common.response.StoreCouponUserOrder; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.StoreCouponService; import com.zbkj.service.service.StoreCouponUserService; import io.swagger.annotations.Api; @@ -23,7 +24,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相关版权 * +---------------------------------------------------------------------- @@ -45,8 +46,9 @@ public class CouponController { /** * 分页显示优惠券表 - * @param type 类型，1-通用，2-商品，3-品类 - * @param productId 产品id，搜索产品指定优惠券 + * + * @param type 类型，1-通用，2-商品，3-品类 + * @param productId 产品id，搜索产品指定优惠券 * @param pageParamRequest 分页参数 */ @ApiOperation(value = "分页列表") @@ -57,14 +59,11 @@ public class CouponController { @ApiImplicitParam(name="page", value="页码", required = true), @ApiImplicitParam(name="limit", value="每页数量", required = true) }) - public CommonResult> getList(@RequestParam(value = "type", defaultValue = "0") int type, - @RequestParam(value = "productId", defaultValue = "0") int productId, @Validated PageParamRequest pageParamRequest) { - return CommonResult.success(storeCouponService.getH5List(type, productId, pageParamRequest)); + public CommonResult> getList(@RequestParam(value = "type", defaultValue = "0") int type, + @RequestParam(value = "productId", defaultValue = "0") int productId, @Validated PageParamRequest pageParamRequest) { + return CommonResult.success(CommonPage.restPage(storeCouponService.getH5List(type, productId, pageParamRequest))); } - /** - * 根据购物车id获取可用优惠券 - */ @ApiOperation(value = "当前订单可用优惠券") @RequestMapping(value = "coupons/order/{preOrderNo}", method = RequestMethod.GET) public CommonResult> getCouponsListByPreOrderNo(@PathVariable String preOrderNo) { diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/IndexController.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/IndexController.java index 2631bc63..81d4b622 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/IndexController.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/IndexController.java @@ -1,12 +1,14 @@ package com.zbkj.front.controller; -import com.zbkj.common.page.CommonPage; -import com.zbkj.common.response.CommonResult; -import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.model.system.SystemConfig; +import com.zbkj.common.page.CommonPage; +import com.zbkj.common.request.PageParamRequest; +import com.zbkj.common.response.CopyrightConfigInfoResponse; import com.zbkj.common.response.IndexInfoResponse; import com.zbkj.common.response.IndexProductResponse; +import com.zbkj.common.response.pagelayout.PageLayoutBottomNavigationResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.front.service.IndexService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -27,7 +29,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -105,7 +107,19 @@ public class IndexController { @ApiOperation(value = "全局本地图片域名") @RequestMapping(value = "/image/domain", method = RequestMethod.GET) public CommonResult getImageDomain() { - return CommonResult.success(indexService.getImageDomain(), "成功"); + return CommonResult.success(indexService.getImageDomain()); + } + + @ApiOperation(value = "获取版权信息") + @RequestMapping(value = "/copyright/info", method = RequestMethod.GET) + public CommonResult getCopyrightInfo() { + return CommonResult.success(indexService.getCopyrightInfo()); + } + + @ApiOperation(value = "获取底部导航信息") + @RequestMapping(value = "/get/bottom/navigation", method = RequestMethod.GET) + public CommonResult getBottomNavigation() { + return CommonResult.success(indexService.getBottomNavigationInfo()); } } diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/LoginController.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/LoginController.java index 62d3436d..46cb3ff4 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/LoginController.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/LoginController.java @@ -3,8 +3,9 @@ package com.zbkj.front.controller; import com.zbkj.common.request.LoginMobileRequest; import com.zbkj.common.request.LoginRequest; -import com.zbkj.common.response.CommonResult; +import com.zbkj.common.response.LoginConfigResponse; import com.zbkj.common.response.LoginResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.front.service.LoginService; import com.zbkj.service.service.SmsService; import io.swagger.annotations.Api; @@ -20,15 +21,15 @@ import javax.servlet.http.HttpServletRequest; /** * 用户登陆 前端控制器 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- + * +---------------------------------------------------------------------- + * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] + * +---------------------------------------------------------------------- + * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved. + * +---------------------------------------------------------------------- + * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 + * +---------------------------------------------------------------------- + * | Author: CRMEB Team + * +---------------------------------------------------------------------- */ @Slf4j @RestController("FrontLoginController") @@ -66,28 +67,41 @@ public class LoginController { */ @ApiOperation(value = "退出") @RequestMapping(value = "/logout", method = RequestMethod.GET) - public CommonResult loginOut(HttpServletRequest request){ + public CommonResult loginOut(HttpServletRequest request) { loginService.loginOut(request); return CommonResult.success(); } /** * 发送短信登录验证码 + * * @param phone 手机号码 * @return 发送是否成功 */ @ApiOperation(value = "发送短信登录验证码") @RequestMapping(value = "/sendCode", method = RequestMethod.POST) @ApiImplicitParams({ - @ApiImplicitParam(name="phone", value="手机号码", required = true) + @ApiImplicitParam(name = "phone", value = "手机号码", required = true) }) - public CommonResult sendCode(@RequestParam String phone){ - if(smsService.sendCommonCode(phone)){ + public CommonResult sendCode(@RequestParam String phone) { + if (smsService.sendCommonCode(phone)) { return CommonResult.success("发送成功"); - }else{ + } else { return CommonResult.failed("发送失败"); } } + + @ApiOperation(value = "校验token是否有效") + @RequestMapping(value = "/token/is/exist", method = RequestMethod.POST) + public CommonResult tokenIsExist() { + return CommonResult.success(loginService.tokenIsExist()); + } + + @ApiOperation(value = "获取登录配置") + @RequestMapping(value = "/login/config", method = RequestMethod.GET) + public CommonResult getLoginConfig() { + return CommonResult.success(loginService.getLoginConfig()); + } } diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/PayController.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/PayController.java index b9997995..ff1e2fec 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/PayController.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/PayController.java @@ -1,8 +1,9 @@ package com.zbkj.front.controller; import com.zbkj.common.request.OrderPayRequest; -import com.zbkj.common.response.CommonResult; import com.zbkj.common.response.OrderPayResultResponse; +import com.zbkj.common.response.PayConfigResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.common.utils.CrmebUtil; import com.zbkj.service.service.OrderPayService; import com.zbkj.service.service.WeChatPayService; @@ -20,7 +21,7 @@ import javax.servlet.http.HttpServletRequest; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -39,6 +40,14 @@ public class PayController { @Autowired private OrderPayService orderPayService; + + + @ApiOperation(value = "获取支付配置") + @RequestMapping(value = "/get/config", method = RequestMethod.GET) + public CommonResult getPayConfig() { + return CommonResult.success(orderPayService.getPayConfig()); + } + /** * 订单支付 */ diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/ProductController.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/ProductController.java index 54c9ee58..6c45733b 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/ProductController.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/ProductController.java @@ -1,14 +1,18 @@ package com.zbkj.front.controller; +import com.zbkj.common.model.category.Category; import com.zbkj.common.model.product.StoreProduct; import com.zbkj.common.page.CommonPage; import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.ProductListRequest; import com.zbkj.common.request.ProductRequest; import com.zbkj.common.response.*; +import com.zbkj.common.result.CommonResult; +import com.zbkj.common.utils.CrmebUtil; import com.zbkj.common.vo.CategoryTreeVo; import com.zbkj.front.service.ProductService; +import com.zbkj.service.service.CategoryService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -24,7 +28,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相关版权 * +---------------------------------------------------------------------- @@ -40,6 +44,9 @@ public class ProductController { @Autowired private ProductService productService; + @Autowired + private CategoryService categoryService; + /** * 热门商品推荐 */ @@ -67,6 +74,12 @@ public class ProductController { return CommonResult.success(productService.getCategory()); } + @ApiOperation(value = "根据pid获取子分类") + @RequestMapping(value = "/categorybypid/{pid}", method = RequestMethod.GET) + public CommonResult> getCategoryByPid(@PathVariable Integer pid) { + return CommonResult.success(categoryService.getChildVoStatusOnListByPid(pid)); + } + /** * 商品列表 */ @@ -141,6 +154,12 @@ public class ProductController { public CommonResult> getLeaderboard() { return CommonResult.success(productService.getLeaderboard()); } + + @ApiOperation(value = "根据商品id集合查询对应商品") + @RequestMapping(value = "/product/byids/{ids}", method = RequestMethod.GET) + public CommonResult> getProductByIds(@PathVariable String ids) { + return CommonResult.success(productService.getProductByIds(CrmebUtil.stringToArray(ids))); + } } diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/QrCodeController.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/QrCodeController.java index 21294c24..58e33be0 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/QrCodeController.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/QrCodeController.java @@ -1,10 +1,10 @@ package com.zbkj.front.controller; import com.alibaba.fastjson.JSONObject; -import com.zbkj.common.response.CommonResult; import com.zbkj.common.constants.Constants; import com.zbkj.common.exception.CrmebException; -import com.zbkj.front.service.QrCodeService; +import com.zbkj.common.result.CommonResult; +import com.zbkj.service.service.QrCodeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -19,7 +19,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/SecKillController.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/SecKillController.java index ca60c395..45628a04 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/SecKillController.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/SecKillController.java @@ -2,7 +2,11 @@ package com.zbkj.front.controller; import com.zbkj.common.page.CommonPage; import com.zbkj.common.request.PageParamRequest; -import com.zbkj.common.response.*; +import com.zbkj.common.response.SecKillResponse; +import com.zbkj.common.response.SeckillIndexResponse; +import com.zbkj.common.response.StoreSecKillH5Response; +import com.zbkj.common.response.StoreSeckillDetailResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.StoreSeckillService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -17,7 +21,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/StoreController.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/StoreController.java index d800ad8d..578e7425 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/StoreController.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/StoreController.java @@ -1,10 +1,10 @@ package com.zbkj.front.controller; -import com.zbkj.common.request.StoreNearRequest; -import com.zbkj.common.response.CommonResult; import com.zbkj.common.request.PageParamRequest; +import com.zbkj.common.request.StoreNearRequest; import com.zbkj.common.response.StoreNearResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.SystemStoreService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/StoreOrderController.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/StoreOrderController.java index 6ae84fec..94cac681 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/StoreOrderController.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/StoreOrderController.java @@ -3,6 +3,7 @@ package com.zbkj.front.controller; import com.zbkj.common.page.CommonPage; import com.zbkj.common.request.*; import com.zbkj.common.response.*; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.OrderService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -21,7 +22,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -84,9 +85,11 @@ public class StoreOrderController { @ApiImplicitParams ({ @ApiImplicitParam(name = "type", value = "评价等级|0=未支付,1=待发货,2=待收货,3=待评价,4=已完成,-3=售后/退款", required = true) }) - public CommonResult> orderList(@RequestParam(name = "type") Integer type, - @ModelAttribute PageParamRequest pageRequest) { - return CommonResult.success(orderService.list(type, pageRequest)); + public CommonResult> orderList( + @RequestParam(name = "keywords", required = false) String keywords, + @RequestParam(name = "type") Integer type, + @ModelAttribute PageParamRequest pageRequest) { + return CommonResult.success(CommonPage.restPage(orderService.list(keywords, type, pageRequest))); } /** diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/UploadFrontController.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/UploadFrontController.java index 981ff859..dd0c5f3e 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/UploadFrontController.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/UploadFrontController.java @@ -1,6 +1,6 @@ package com.zbkj.front.controller; -import com.zbkj.common.response.CommonResult; +import com.zbkj.common.result.CommonResult; import com.zbkj.common.vo.FileResultVo; import com.zbkj.service.service.UploadService; import io.swagger.annotations.Api; @@ -23,7 +23,7 @@ import java.io.IOException; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -48,7 +48,7 @@ public class UploadFrontController { @ApiImplicitParam(name = "model", value = "模块 用户user,商品product,微信wechat,news文章"), @ApiImplicitParam(name = "pid", value = "分类ID 0编辑器,1商品图片,2拼团图片,3砍价图片,4秒杀图片,5文章图片,6组合数据图,7前台用户,8微信系列 ", allowableValues = "range[0,1,2,3,4,5,6,7,8]") }) - public CommonResult image(MultipartFile multipart,@RequestParam(value = "model") String model, + public CommonResult image(MultipartFile multipart, @RequestParam(value = "model") String model, @RequestParam(value = "pid") Integer pid) throws IOException { return CommonResult.success(uploadService.imageUpload(multipart, model, pid)); } diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/UserAddressController.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/UserAddressController.java index 99100475..018af32c 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/UserAddressController.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/UserAddressController.java @@ -1,11 +1,11 @@ package com.zbkj.front.controller; +import com.zbkj.common.model.user.UserAddress; import com.zbkj.common.page.CommonPage; +import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.UserAddressDelRequest; import com.zbkj.common.request.UserAddressRequest; -import com.zbkj.common.response.CommonResult; -import com.zbkj.common.request.PageParamRequest; -import com.zbkj.common.model.user.UserAddress; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.UserAddressService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -20,7 +20,7 @@ import org.springframework.web.bind.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/UserCollectController.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/UserCollectController.java index d99e1d58..adc0185d 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/UserCollectController.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/UserCollectController.java @@ -1,11 +1,11 @@ package com.zbkj.front.controller; import com.zbkj.common.page.CommonPage; +import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.UserCollectAllRequest; import com.zbkj.common.request.UserCollectRequest; -import com.zbkj.common.response.CommonResult; -import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.response.UserRelationResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.StoreProductRelationService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -20,7 +20,7 @@ import org.springframework.web.bind.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/UserController.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/UserController.java index ad5c95c2..661f2cd2 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/UserController.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/UserController.java @@ -1,14 +1,15 @@ package com.zbkj.front.controller; -import com.zbkj.common.page.CommonPage; import com.github.pagehelper.PageInfo; import com.zbkj.common.model.system.SystemUserLevel; import com.zbkj.common.model.user.User; import com.zbkj.common.model.user.UserExperienceRecord; import com.zbkj.common.model.user.UserIntegralRecord; +import com.zbkj.common.page.CommonPage; import com.zbkj.common.request.*; import com.zbkj.common.response.*; +import com.zbkj.common.result.CommonResult; import com.zbkj.front.service.UserCenterService; import com.zbkj.service.service.SystemGroupDataService; import com.zbkj.service.service.UserService; @@ -30,7 +31,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -299,6 +300,7 @@ public class UserController { userService.bindSpread(spreadPid); return CommonResult.success(); } + } diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/UserCouponController.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/UserCouponController.java index 39c83e9b..05cfc0ee 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/UserCouponController.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/UserCouponController.java @@ -1,10 +1,10 @@ package com.zbkj.front.controller; import com.zbkj.common.page.CommonPage; -import com.zbkj.common.request.UserCouponReceiveRequest; -import com.zbkj.common.response.CommonResult; import com.zbkj.common.request.PageParamRequest; +import com.zbkj.common.request.UserCouponReceiveRequest; import com.zbkj.common.response.StoreCouponUserResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.service.service.StoreCouponUserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -20,7 +20,7 @@ import org.springframework.web.bind.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/UserRechargeController.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/UserRechargeController.java index fc00d82d..71538c6a 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/UserRechargeController.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/UserRechargeController.java @@ -4,10 +4,10 @@ import com.zbkj.common.constants.Constants; import com.zbkj.common.page.CommonPage; import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.UserRechargeRequest; -import com.zbkj.common.response.CommonResult; import com.zbkj.common.response.OrderPayResultResponse; import com.zbkj.common.response.UserRechargeBillRecordResponse; import com.zbkj.common.response.UserRechargeFrontResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.common.utils.CrmebUtil; import com.zbkj.front.service.UserCenterService; import io.swagger.annotations.Api; @@ -28,7 +28,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -77,6 +77,16 @@ public class UserRechargeController { return CommonResult.success(userCenterService.recharge(request)); } + /** + * App充值 + */ + @ApiOperation(value = "App充值") + @RequestMapping(value = "/wechat/app", method = RequestMethod.POST) + public CommonResult weChatAppRecharge(HttpServletRequest httpServletRequest, @RequestBody @Validated UserRechargeRequest request) { + request.setClientIp(CrmebUtil.getClientIp(httpServletRequest)); + return CommonResult.success(userCenterService.recharge(request)); + } + /** * 佣金转入余额 */ diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/UserSignController.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/UserSignController.java index 24dbabd5..02e71509 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/UserSignController.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/UserSignController.java @@ -1,9 +1,9 @@ package com.zbkj.front.controller; import com.zbkj.common.page.CommonPage; -import com.zbkj.common.response.CommonResult; import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.response.UserSignInfoResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.common.vo.SystemGroupDataSignConfigVo; import com.zbkj.common.vo.UserSignMonthVo; import com.zbkj.common.vo.UserSignVo; @@ -26,7 +26,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相关版权 * +---------------------------------------------------------------------- @@ -48,7 +48,7 @@ public class UserSignController { */ @ApiOperation(value = "分页列表") @RequestMapping(value = "/list", method = RequestMethod.GET) - public CommonResult> getList(@Validated PageParamRequest pageParamRequest) { + public CommonResult> getList(@Validated PageParamRequest pageParamRequest) { CommonPage userSignCommonPage = CommonPage.restPage(userSignService.getList(pageParamRequest)); return CommonResult.success(userSignCommonPage); } diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/WeChatController.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/WeChatController.java index 6f66a0d8..a819b112 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/WeChatController.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/WeChatController.java @@ -4,9 +4,9 @@ import com.zbkj.common.model.wechat.TemplateMessage; import com.zbkj.common.request.RegisterAppWxRequest; import com.zbkj.common.request.RegisterThirdUserRequest; import com.zbkj.common.request.WxBindingPhoneRequest; -import com.zbkj.common.response.CommonResult; import com.zbkj.common.response.LoginResponse; import com.zbkj.common.response.WeChatJsSdkConfigResponse; +import com.zbkj.common.result.CommonResult; import com.zbkj.front.service.UserCenterService; import com.zbkj.service.service.SystemNotificationService; import com.zbkj.service.service.WechatNewService; @@ -29,7 +29,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -54,7 +54,7 @@ public class WeChatController { /** * 通过微信code登录 */ - @ApiOperation(value = "微信登录公共号授权登录") + @ApiOperation(value = "微信登录公众号授权登录") @RequestMapping(value = "/authorize/login", method = RequestMethod.GET) @ApiImplicitParams({ @ApiImplicitParam(name = "spread_spid", value = "推荐人id", dataType = "Integer"), @@ -74,6 +74,15 @@ public class WeChatController { return CommonResult.success(userCenterService.weChatAuthorizeProgramLogin(code, request)); } + /** + * 微信登录App授权登录 + */ + @ApiOperation(value = "微信登录App授权登录") + @RequestMapping(value = "/authorize/app/login", method = RequestMethod.POST) + public CommonResult appLogin(@RequestBody @Validated RegisterAppWxRequest request){ + return CommonResult.success(userCenterService.appLogin(request)); + } + /** * 微信注册绑定手机号 */ diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/filter/ResponseFilter.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/filter/ResponseFilter.java index 12568fb4..27ac6ab9 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/filter/ResponseFilter.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/filter/ResponseFilter.java @@ -1,7 +1,9 @@ package com.zbkj.front.filter; +import com.zbkj.common.config.CrmebConfig; import com.zbkj.common.utils.RequestUtil; +import org.springframework.beans.factory.annotation.Autowired; import javax.servlet.*; import javax.servlet.http.HttpServletRequest; @@ -14,7 +16,7 @@ import java.nio.charset.StandardCharsets; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -25,6 +27,9 @@ import java.nio.charset.StandardCharsets; //@Component public class ResponseFilter implements Filter { + @Autowired + CrmebConfig crmebConfig; + @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws IOException, ServletException { @@ -38,7 +43,7 @@ public class ResponseFilter implements Filter { try { HttpServletRequest req = (HttpServletRequest) request; - str = new ResponseRouter().filter(str, RequestUtil.getUri(req)); + str = new ResponseRouter().filter(str, RequestUtil.getUri(req), crmebConfig); } catch (Exception e) { e.printStackTrace(); } diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/filter/ResponseRouter.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/filter/ResponseRouter.java index 97a5566b..102a8bbf 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/filter/ResponseRouter.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/filter/ResponseRouter.java @@ -1,15 +1,19 @@ package com.zbkj.front.filter; +import com.zbkj.common.config.CrmebConfig; import com.zbkj.common.constants.Constants; +import com.zbkj.common.constants.UploadConstants; import com.zbkj.common.utils.SpringUtil; import com.zbkj.service.service.SystemAttachmentService; +import org.springframework.util.AntPathMatcher; +import org.springframework.util.PathMatcher; /** * response路径处理 * +---------------------------------------------------------------------- * | 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,23 +22,34 @@ import com.zbkj.service.service.SystemAttachmentService; */ public class ResponseRouter { - public String filter(String data, String path) { + public String filter(String data, String path, CrmebConfig crmebConfig) { boolean result = un().contains(path); if (result) { return data; } + //系统不用过滤的URL，针对数据而非token + PathMatcher pathMatcher = new AntPathMatcher(); + for (String configUrl : crmebConfig.getIgnored()) { + if(pathMatcher.match(path, configUrl)){ + return data; + } + } + if (!path.contains("api/admin/") && !path.contains("api/front/")) { return data; } //根据需要处理返回值 - if (data.contains(Constants.UPLOAD_TYPE_IMAGE+"/") && !data.contains("data:image/png;base64")) { - data = SpringUtil.getBean(SystemAttachmentService.class).prefixImage(data); - } - - if (data.contains("file/")) { - data = SpringUtil.getBean(SystemAttachmentService.class).prefixFile(data); + if ((data.contains(UploadConstants.UPLOAD_FILE_KEYWORD+"/") && !data.contains("data:image/png;base64")) + || data.contains(UploadConstants.DOWNLOAD_FILE_KEYWORD) || data.contains(UploadConstants.UPLOAD_AFTER_FILE_KEYWORD)) { + if (data.contains(UploadConstants.DOWNLOAD_FILE_KEYWORD+"/"+Constants.UPLOAD_MODEL_PATH_EXCEL)) { + data = SpringUtil.getBean(SystemAttachmentService.class).prefixFile(data); + } else if(data.contains(UploadConstants.UPLOAD_AFTER_FILE_KEYWORD+"/")) { + data = SpringUtil.getBean(SystemAttachmentService.class).prefixUploadf(data); + } else { + data = SpringUtil.getBean(SystemAttachmentService.class).prefixImage(data); + } } return data; diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/filter/ResponseWrapper.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/filter/ResponseWrapper.java index 23392d1a..d0a826d7 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/filter/ResponseWrapper.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/filter/ResponseWrapper.java @@ -13,7 +13,7 @@ import java.io.IOException; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/interceptor/FrontTokenInterceptor.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/interceptor/FrontTokenInterceptor.java index ba13fa88..6b8b1705 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/interceptor/FrontTokenInterceptor.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/interceptor/FrontTokenInterceptor.java @@ -1,7 +1,8 @@ package com.zbkj.front.interceptor; import com.alibaba.fastjson.JSONObject; -import com.zbkj.common.response.CommonResult; +import com.zbkj.common.result.CommonResult; +import com.zbkj.common.result.CommonResultCode; import com.zbkj.common.token.FrontTokenComponent; import com.zbkj.common.utils.RequestUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -16,7 +17,7 @@ import javax.servlet.http.HttpServletResponse; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -38,13 +39,13 @@ public class FrontTokenInterceptor implements HandlerInterceptor { if(result){ return true; } - response.getWriter().write(JSONObject.toJSONString(CommonResult.unauthorized())); + response.getWriter().write(JSONObject.toJSONString(CommonResult.failed(CommonResultCode.UNAUTHORIZED))); return false; } Boolean result = frontTokenComponent.check(token, request); if(!result){ - response.getWriter().write(JSONObject.toJSONString(CommonResult.unauthorized())); + response.getWriter().write(JSONObject.toJSONString(CommonResult.failed(CommonResultCode.PERMISSION_EXPIRATION))); return false; } return true; diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/pub/ImageMergeController.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/pub/ImageMergeController.java deleted file mode 100644 index cf9f867f..00000000 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/pub/ImageMergeController.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.zbkj.front.pub; - -import com.zbkj.common.response.CommonResult; -import com.zbkj.common.utils.ImageMergeUtil; -import com.zbkj.common.vo.ImageMergeUtilVo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * 图片操作 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - */ -@Slf4j -@RestController -@RequestMapping("api/public/qrcode") -@Api(tags = "图片操作") -public class ImageMergeController { - - @ApiOperation(value = "合并图片返回文件") - @RequestMapping(value = "/mergeList", method = RequestMethod.POST) - public CommonResult> mergeList(@RequestBody @Validated List list){ - Map map = new HashMap<>(); - map.put("base64Code", ImageMergeUtil.drawWordFile(list)); //需要云服务域名，如果需要存入数据库参照上传图片服务 - return CommonResult.success(map); - } -} diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/pub/WeChatPushController.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/pub/WeChatPushController.java index 12a70c05..1cb80196 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/pub/WeChatPushController.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/pub/WeChatPushController.java @@ -1,7 +1,7 @@ package com.zbkj.front.pub; import com.alibaba.fastjson.JSONObject; -import com.zbkj.common.response.CommonResult; +import com.zbkj.common.result.CommonResult; import com.zbkj.common.utils.RestTemplateUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -21,7 +21,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/IndexService.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/IndexService.java index 66165170..e192e343 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/IndexService.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/IndexService.java @@ -1,11 +1,13 @@ package com.zbkj.front.service; +import com.zbkj.common.model.system.SystemConfig; import com.zbkj.common.page.CommonPage; +import com.zbkj.common.request.PageParamRequest; +import com.zbkj.common.response.CopyrightConfigInfoResponse; import com.zbkj.common.response.IndexInfoResponse; import com.zbkj.common.response.IndexProductResponse; +import com.zbkj.common.response.pagelayout.PageLayoutBottomNavigationResponse; import com.zbkj.common.vo.MyRecord; -import com.zbkj.common.request.PageParamRequest; -import com.zbkj.common.model.system.SystemConfig; import java.util.HashMap; import java.util.List; @@ -15,7 +17,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相关版权 * +---------------------------------------------------------------------- @@ -66,4 +68,14 @@ public interface IndexService{ * @return String */ String getImageDomain(); + + /** + * 获取公司版权图片 + */ + CopyrightConfigInfoResponse getCopyrightInfo(); + + /** + * 获取底部导航信息 + */ + PageLayoutBottomNavigationResponse getBottomNavigationInfo(); } diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/LoginService.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/LoginService.java index f5e4596c..40786cd8 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/LoginService.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/LoginService.java @@ -3,6 +3,7 @@ package com.zbkj.front.service; import com.zbkj.common.model.user.User; import com.zbkj.common.request.LoginMobileRequest; import com.zbkj.common.request.LoginRequest; +import com.zbkj.common.response.LoginConfigResponse; import com.zbkj.common.response.LoginResponse; import javax.servlet.http.HttpServletRequest; @@ -12,7 +13,7 @@ import javax.servlet.http.HttpServletRequest; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -23,6 +24,7 @@ public interface LoginService { /** * 账号密码登录 + * * @return LoginResponse */ LoginResponse login(LoginRequest loginRequest); @@ -34,7 +36,8 @@ public interface LoginService { /** * 老绑定分销关系 - * @param user User 用户user类 + * + * @param user User 用户user类 * @param spreadUid Integer 推广人id * @return Boolean */ @@ -42,7 +45,20 @@ public interface LoginService { /** * 推出登录 + * * @param request HttpServletRequest */ void loginOut(HttpServletRequest request); + + /** + * 校验token是否有效 + * + * @return true 有效， false 无效 + */ + Boolean tokenIsExist(); + + /** + * 获取登录配置 + */ + LoginConfigResponse getLoginConfig(); } diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/ProductService.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/ProductService.java index 49e94415..5ff17856 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/ProductService.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/ProductService.java @@ -16,7 +16,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相关版权 * +---------------------------------------------------------------------- @@ -103,4 +103,11 @@ public interface ProductService { * @return List */ List getLeaderboard(); + + /** + * 根据商品id集合 加载对应商品 + * @param proIdList id集合 + * @return id集合对应的商品列表 + */ + List getProductByIds(List proIdList); } diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/QrCodeService.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/QrCodeService.java deleted file mode 100644 index abddb53b..00000000 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/QrCodeService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.zbkj.front.service; - -import com.alibaba.fastjson.JSONObject; - -import java.io.IOException; -import java.util.Map; - -/** -* QrCodeService 接口 -* +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- -*/ -public interface QrCodeService { - - /** - * 获取二维码 - * @return CommonResult - */ - Map get(JSONObject data); - - /** - * 远程图片转base64 - * @param url 图片链接地址 - */ - Map base64(String url); - - /** - * 将字符串 转base64 - * @param text 字符串 - * @param width 宽 - * @param height 高 - */ - Map base64String(String text,int width, int height); - -} diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/UserCenterService.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/UserCenterService.java index 559bd37d..dee44e55 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/UserCenterService.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/UserCenterService.java @@ -1,12 +1,12 @@ package com.zbkj.front.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.github.pagehelper.PageInfo; import com.zbkj.common.model.system.SystemUserLevel; import com.zbkj.common.model.user.User; import com.zbkj.common.model.user.UserExperienceRecord; import com.zbkj.common.model.user.UserIntegralRecord; import com.zbkj.common.page.CommonPage; +import com.github.pagehelper.PageInfo; import com.zbkj.common.request.*; import com.zbkj.common.response.*; @@ -18,7 +18,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相关版权 * +---------------------------------------------------------------------- @@ -180,6 +180,13 @@ public interface UserCenterService extends IService { */ List getUserIntegralRecordList(PageParamRequest pageParamRequest); + /** + * 微信app登录 + * @param request 请求参数 + * @return 登录响应体 + */ + LoginResponse appLogin(RegisterAppWxRequest request); + /** * 获取用户积分信息 * @return IntegralUserResponse @@ -204,4 +211,5 @@ public interface UserCenterService extends IService { * @return UserSpreadPeopleResponse */ UserSpreadPeopleResponse getSpreadPeopleCount(); + } diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/impl/IndexServiceImpl.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/impl/IndexServiceImpl.java index 7e15cb42..08c3703d 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/impl/IndexServiceImpl.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/impl/IndexServiceImpl.java @@ -5,9 +5,11 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.zbkj.common.page.CommonPage; +import com.zbkj.common.response.CopyrightConfigInfoResponse; import com.zbkj.common.response.IndexInfoResponse; import com.zbkj.common.response.IndexProductResponse; import com.zbkj.common.response.ProductActivityItemResponse; +import com.zbkj.common.response.pagelayout.PageLayoutBottomNavigationResponse; import com.zbkj.common.vo.MyRecord; import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.constants.Constants; @@ -35,7 +37,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相关版权 * +---------------------------------------------------------------------- @@ -63,6 +65,9 @@ public class IndexServiceImpl implements IndexService { @Autowired private UserVisitRecordService userVisitRecordService; + @Autowired + private ActivityStyleService activityStyleService; + /** * 首页数据 * banner、金刚区、广告位 @@ -78,6 +83,7 @@ public class IndexServiceImpl implements IndexService { indexInfoResponse.setYzfUrl(systemConfigService.getValueByKey(Constants.CONFIG_KEY_YZF_H5_URL));// 云智服H5 url indexInfoResponse.setConsumerHotline(systemConfigService.getValueByKey(Constants.CONFIG_KEY_CONSUMER_HOTLINE));// 客服电话 indexInfoResponse.setTelephoneServiceSwitch(systemConfigService.getValueByKey(Constants.CONFIG_KEY_TELEPHONE_SERVICE_SWITCH));// 客服电话服务 + indexInfoResponse.setWxChatIndependent(systemConfigService.getValueByKey(Constants.CONFIG_KEY_WX_CHAT_INDEPENDENT)); indexInfoResponse.setCategoryPageConfig(systemConfigService.getValueByKey(Constants.CONFIG_CATEGORY_CONFIG));// 商品分类页配置 indexInfoResponse.setIsShowCategory(systemConfigService.getValueByKey(Constants.CONFIG_IS_SHOW_CATEGORY));// 是否隐藏一级分类 indexInfoResponse.setExplosiveMoney(systemGroupDataService.getListMapByGid(Constants.GROUP_DATA_ID_INDEX_EX_BANNER));//首页超值爆款 @@ -138,6 +144,10 @@ public class IndexServiceImpl implements IndexService { if(CollUtil.isEmpty(storeProductList)) { return CommonPage.restPage(new ArrayList<>()); } + + // 查询活动边框配置信息, 并赋值给商品response 重复添加的商品数据会根据数据添加持续覆盖后的为准 + storeProductList = activityStyleService.makeActivityBorderStyle(storeProductList); + CommonPage storeProductCommonPage = CommonPage.restPage(storeProductList); List productResponseArrayList = new ArrayList<>(); @@ -184,6 +194,7 @@ public class IndexServiceImpl implements IndexService { BeanUtils.copyProperties(storeProduct, productResponse); productResponseArrayList.add(productResponse); } + CommonPage productResponseCommonPage = CommonPage.restPage(productResponseArrayList); BeanUtils.copyProperties(storeProductCommonPage, productResponseCommonPage, "list"); return productResponseCommonPage; @@ -195,7 +206,7 @@ public class IndexServiceImpl implements IndexService { */ @Override public SystemConfig getColorConfig() { - return systemConfigService.getColorConfig(); + return systemConfigService.getChangeColor(); } /** @@ -222,5 +233,31 @@ public class IndexServiceImpl implements IndexService { String localUploadUrl = systemConfigService.getValueByKey("localUploadUrl"); return StrUtil.isBlank(localUploadUrl) ? "" : localUploadUrl; } + + /** + * 获取公司版权图片 + */ + @Override + public CopyrightConfigInfoResponse getCopyrightInfo() { + String copyrightCompanyImage = systemConfigService.getValueByKey(SysConfigConstants.CONFIG_COPYRIGHT_COMPANY_IMAGE); + String copyrightCompanyName = systemConfigService.getValueByKey(SysConfigConstants.CONFIG_COPYRIGHT_COMPANY_INFO); + CopyrightConfigInfoResponse response = new CopyrightConfigInfoResponse(); + response.setCompanyName(copyrightCompanyName); + response.setCompanyImage(copyrightCompanyImage); + return response; + } + + /** + * 获取底部导航信息 + */ + @Override + public PageLayoutBottomNavigationResponse getBottomNavigationInfo() { + String isCustom = systemConfigService.getValueByKey(Constants.CONFIG_BOTTOM_NAVIGATION_IS_CUSTOM); + List> bnList = systemGroupDataService.getListMapByGid(Constants.GROUP_DATA_ID_BOTTOM_NAVIGATION); + PageLayoutBottomNavigationResponse response = new PageLayoutBottomNavigationResponse(); + response.setIsCustom(isCustom); + response.setBottomNavigationList(bnList); + return response; + } } diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/impl/LoginServiceImpl.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/impl/LoginServiceImpl.java index 039caaf4..2a02195b 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/impl/LoginServiceImpl.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/impl/LoginServiceImpl.java @@ -1,18 +1,22 @@ package com.zbkj.front.service.impl; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import com.zbkj.common.constants.Constants; import com.zbkj.common.constants.SmsConstants; import com.zbkj.common.exception.CrmebException; import com.zbkj.common.model.user.User; import com.zbkj.common.request.LoginMobileRequest; import com.zbkj.common.request.LoginRequest; +import com.zbkj.common.response.LoginConfigResponse; import com.zbkj.common.response.LoginResponse; import com.zbkj.common.token.FrontTokenComponent; import com.zbkj.common.utils.CrmebUtil; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.common.utils.RedisUtil; import com.zbkj.front.service.LoginService; +import com.zbkj.service.service.SystemConfigService; import com.zbkj.service.service.UserService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,7 +32,7 @@ import java.util.Optional; * +---------------------------------------------------------------------- * | 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,6 +55,8 @@ public class LoginServiceImpl implements LoginService { @Autowired private FrontTokenComponent tokenComponent; + @Autowired + private SystemConfigService systemConfigService; /** * 账号密码登录 @@ -83,7 +89,8 @@ public class LoginServiceImpl implements LoginService { } // 记录最后一次登录时间 - user.setLastLoginTime(DateUtil.nowDateTime()); + user.setLastLoginTime(CrmebDateUtil.nowDateTime()); + user.setUpdateTime(DateUtil.date()); userService.updateById(user); loginResponse.setUid(user.getUid()); @@ -116,7 +123,8 @@ public class LoginServiceImpl implements LoginService { bindSpread(user, spreadPid); } // 记录最后一次登录时间 - user.setLastLoginTime(DateUtil.nowDateTime()); + user.setLastLoginTime(CrmebDateUtil.nowDateTime()); + user.setUpdateTime(DateUtil.date()); boolean b = userService.updateById(user); if (!b) { logger.error("用户登录时，记录最后一次登录时间出错,uid = " + user.getUid()); @@ -170,7 +178,8 @@ public class LoginServiceImpl implements LoginService { if (!checkBingSpread) return false; user.setSpreadUid(spreadUid); - user.setSpreadTime(DateUtil.nowDateTime()); + user.setSpreadTime(CrmebDateUtil.nowDateTime()); + user.setUpdateTime(DateUtil.date()); Boolean execute = transactionTemplate.execute(e -> { userService.updateById(user); @@ -185,10 +194,39 @@ public class LoginServiceImpl implements LoginService { /** * 推出登录 + * * @param request HttpServletRequest */ @Override public void loginOut(HttpServletRequest request) { tokenComponent.logout(request); } + + /** + * 校验token是否有效 + * + * @return true 有效， false 无效 + */ + @Override + public Boolean tokenIsExist() { + Integer userId = userService.getUserId(); + return userId > 0; + } + + /** + * 获取登录配置 + */ + @Override + public LoginConfigResponse getLoginConfig() { + String routinePhoneVerification = systemConfigService.getValueByKey(Constants.WECHAT_ROUTINE_PHONE_VERIFICATION); + String publicLoginType = systemConfigService.getValueByKey(Constants.WECHAT_PUBLIC_LOGIN_TYPE); + String mobileLoginLogo = systemConfigService.getValueByKey(Constants.CONFIG_KEY_MOBILE_LOGIN_LOGO); + String siteName = systemConfigService.getValueByKey(Constants.CONFIG_KEY_SITE_NAME); + LoginConfigResponse response = new LoginConfigResponse(); + response.setPublicLoginType(publicLoginType); + response.setRoutinePhoneVerification(routinePhoneVerification); + response.setMobileLoginLogo(mobileLoginLogo); + response.setSiteName(siteName); + return response; + } } diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/impl/ProductServiceImpl.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/impl/ProductServiceImpl.java index b34a1fa8..8333bfdd 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/impl/ProductServiceImpl.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/impl/ProductServiceImpl.java @@ -4,26 +4,23 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.github.pagehelper.PageInfo; -import com.zbkj.common.constants.CategoryConstants; -import com.zbkj.common.constants.Constants; -import com.zbkj.common.constants.RedisConstatns; -import com.zbkj.common.constants.SysConfigConstants; -import com.zbkj.common.model.product.StoreProduct; -import com.zbkj.common.model.product.StoreProductAttr; -import com.zbkj.common.model.product.StoreProductAttrValue; -import com.zbkj.common.model.record.UserVisitRecord; -import com.zbkj.common.model.system.SystemUserLevel; -import com.zbkj.common.model.user.User; +import com.zbkj.common.constants.*; import com.zbkj.common.page.CommonPage; -import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.ProductListRequest; import com.zbkj.common.request.ProductRequest; import com.zbkj.common.response.*; +import com.zbkj.common.vo.MyRecord; +import com.zbkj.common.request.PageParamRequest; +import com.github.pagehelper.PageInfo; import com.zbkj.common.utils.CrmebUtil; import com.zbkj.common.utils.RedisUtil; import com.zbkj.common.vo.CategoryTreeVo; -import com.zbkj.common.vo.MyRecord; +import com.zbkj.common.model.record.UserVisitRecord; +import com.zbkj.common.model.product.StoreProduct; +import com.zbkj.common.model.product.StoreProductAttr; +import com.zbkj.common.model.product.StoreProductAttrValue; +import com.zbkj.common.model.system.SystemUserLevel; +import com.zbkj.common.model.user.User; import com.zbkj.front.service.ProductService; import com.zbkj.service.delete.ProductUtils; import com.zbkj.service.service.*; @@ -36,13 +33,14 @@ import java.math.RoundingMode; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.stream.Collectors; /** * IndexServiceImpl 接口实现 * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -91,6 +89,9 @@ public class ProductServiceImpl implements ProductService { @Autowired private UserVisitRecordService userVisitRecordService; + @Autowired + private ActivityStyleService activityStyleService; + /** * 获取分类 * @return List @@ -121,6 +122,9 @@ public class ProductServiceImpl implements ProductService { } CommonPage storeProductCommonPage = CommonPage.restPage(storeProductList); + // 查询活动边框配置信息, 并赋值给商品response 重复添加的商品数据会根据数据添加持续覆盖后的为准 + storeProductList = activityStyleService.makeActivityBorderStyle(storeProductList); + List productResponseArrayList = new ArrayList<>(); for (StoreProduct storeProduct : storeProductList) { IndexProductResponse productResponse = new IndexProductResponse(); @@ -188,8 +192,12 @@ public class ProductServiceImpl implements ProductService { ProductDetailResponse productDetailResponse = new ProductDetailResponse(); // 查询商品 StoreProduct storeProduct = storeProductService.getH5Detail(id); + // 查询活动边框配置信息, 并赋值给商品response 重复添加的商品数据会根据数据添加持续覆盖后的为准 + storeProduct.setActivityStyle(activityStyleService.makeActivityBackgroundStyle(storeProduct)); + if (ObjectUtil.isNotNull(userLevel)) { - storeProduct.setVipPrice(storeProduct.getPrice()); + BigDecimal vipPrice = storeProduct.getPrice().multiply(new BigDecimal(userLevel.getDiscount())).divide(new BigDecimal(100), 2 ,BigDecimal.ROUND_HALF_UP); + storeProduct.setVipPrice(vipPrice); } productDetailResponse.setProductInfo(storeProduct); @@ -206,7 +214,8 @@ public class ProductServiceImpl implements ProductService { BeanUtils.copyProperties(storeProductAttrValue, atr); // 设置会员价 if (ObjectUtil.isNotNull(userLevel)) { - atr.setVipPrice(atr.getPrice()); + BigDecimal vipPrice = atr.getPrice().multiply(new BigDecimal(userLevel.getDiscount())).divide(new BigDecimal(100), 2 ,BigDecimal.ROUND_HALF_UP); + atr.setVipPrice(vipPrice); } skuMap.put(atr.getSuk(), atr); } @@ -239,6 +248,11 @@ public class ProductServiceImpl implements ProductService { updateProduct.setBrowse(storeProduct.getBrowse() + 1); storeProductService.updateById(updateProduct); + // 商品浏览量统计(每日/商城) + String yesterdayStr = DateUtil.date().toString(Constants.DATE_FORMAT_DATE); + redisUtil.incrAndCreate(RedisConstatns.PRO_PAGE_VIEW_KEY + yesterdayStr); + // 商品浏览量统计(每日/个体) + redisUtil.incrAndCreate(StrUtil.format(RedisConstatns.PRO_PRO_PAGE_VIEW_KEY, yesterdayStr, id)); // 保存用户访问记录 if (userService.getUserId() > 0) { UserVisitRecord visitRecord = new UserVisitRecord(); @@ -370,6 +384,10 @@ public class ProductServiceImpl implements ProductService { if (CollUtil.isEmpty(storeProductList)) { return CommonPage.restPage(new ArrayList<>()); } + + // 查询活动边框配置信息, 并赋值给商品response 重复添加的商品数据会根据数据添加持续覆盖后的为准 + storeProductList = activityStyleService.makeActivityBorderStyle(storeProductList); + CommonPage storeProductCommonPage = CommonPage.restPage(storeProductList); List productResponseArrayList = new ArrayList<>(); @@ -538,5 +556,55 @@ public class ProductServiceImpl implements ProductService { return storeProductService.getLeaderboard(); } + + /** + * 根据商品id集合 加载对应商品 + * + * @param proIdList id集合 + * @return id集合对应的商品列表 + */ + @Override + public List getProductByIds(List proIdList) { + List byIdsAndLabel = storeProductService.findByIds(proIdList, "front"); + List productFrontResponses = byIdsAndLabel.stream().map(productItem -> { + IndexProductResponse response = new IndexProductResponse(); + BeanUtils.copyProperties(productItem, response); + return response; + }).collect(Collectors.toList()); + productFrontResponses.forEach(e -> { + // 评论总数 + Integer sumCount = storeProductReplyService.getCountByScore(e.getId(), ProductConstants.PRODUCT_REPLY_TYPE_ALL); + // 好评总数 + Integer goodCount = storeProductReplyService.getCountByScore(e.getId(), ProductConstants.PRODUCT_REPLY_TYPE_GOOD); + + + String replyChance = "0"; + if (sumCount > 0 && goodCount > 0) { + replyChance = String.format("%.2f", ((goodCount.doubleValue() / sumCount.doubleValue()))); + } + e.setReplyNum(sumCount); + e.setPositiveRatio(replyChance); + e.setSales(e.getSales() + e.getFicti()); + }); + + // 查询活动边框配置信息, 并赋值给商品response 重复添加的商品数据会根据数据添加持续覆盖后的为准 + List products = new ArrayList<>(); + productFrontResponses.forEach(response -> { + StoreProduct product = new StoreProduct(); + BeanUtils.copyProperties(response, product); + products.add(product); + }); + List makeProductList = activityStyleService.makeActivityBorderStyle(products); + + makeProductList.forEach(p -> { + productFrontResponses.stream().map(resProduct -> { + if (p.getId().equals(resProduct.getId())) { + resProduct.setActivityStyle(p.getActivityStyle()); + } + return resProduct; + }).collect(Collectors.toList()); + }); + return productFrontResponses; + } } diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/impl/QrCodeServiceImpl.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/impl/QrCodeServiceImpl.java deleted file mode 100644 index 8fe9b028..00000000 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/impl/QrCodeServiceImpl.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.zbkj.front.service.impl; - -import com.alibaba.fastjson.JSONObject; -import com.zbkj.common.exception.CrmebException; -import com.zbkj.common.utils.CrmebUtil; -import com.zbkj.common.utils.QRCodeUtil; -import com.zbkj.common.utils.RestTemplateUtil; -import com.zbkj.front.service.QrCodeService; -import com.zbkj.service.service.WechatNewService; -import org.apache.commons.codec.binary.Base64; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.HashMap; -import java.util.Map; - -/** -* QrCodeServiceImpl 接口实现 -* +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- -*/ -@Service -public class QrCodeServiceImpl implements QrCodeService { -// @Autowired -// private WeChatService weChatService; - - @Autowired - private RestTemplateUtil restTemplateUtil; - @Autowired - private WechatNewService wechatNewService; - - /** - * 二维码 - * @return Object - */ - @Override - public Map get(JSONObject data) { - Map map = new HashMap<>(); - StringBuilder scene = new StringBuilder(); - String page = ""; - try{ - if(null != data){ - Map dataMap = JSONObject.toJavaObject(data, Map.class); - - for (Map.Entry m : dataMap.entrySet()) { - if("path".equals(m.getKey())){ - //前端路由， 不需要拼参数 - page = m.getValue().toString(); - continue; - } - if (scene.length() > 0) { - scene.append(","); - } - scene.append(m.getKey()).append(":").append(m.getValue()); - } - } - }catch (Exception e){ - throw new CrmebException("url参数错误 " + e.getMessage()); - } - map.put("code", wechatNewService.createQrCode(page, scene.length() > 0 ? scene.toString() : "")); - return map; - } - - @Override - public Map base64(String url) { - byte[] bytes = restTemplateUtil.getBuffer(url); - String base64Image = CrmebUtil.getBase64Image(Base64.encodeBase64String(bytes)); - Map map = new HashMap<>(); - map.put("code", base64Image); - return map; - } - - /** - * 讲字符串转为QRcode - * @param text 待转换字符串 - * @return QRcode base64格式 - */ - @Override - public Map base64String(String text,int width, int height) { - - String base64Image = null; - try { - base64Image = QRCodeUtil.crateQRCode(text,width,height); - }catch (Exception e){ - throw new CrmebException("生成二维码异常"); - } - Map map = new HashMap<>(); - map.put("code", base64Image); - return map; - } -} - diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/impl/UserCenterServiceImpl.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/impl/UserCenterServiceImpl.java index 4f232af4..9150294e 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/impl/UserCenterServiceImpl.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/impl/UserCenterServiceImpl.java @@ -2,6 +2,7 @@ package com.zbkj.front.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ReUtil; import cn.hutool.core.util.StrUtil; @@ -29,7 +30,6 @@ import com.zbkj.front.service.LoginService; import com.zbkj.front.service.UserCenterService; import com.zbkj.service.dao.UserDao; import com.zbkj.service.service.*; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; @@ -38,6 +38,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.support.TransactionTemplate; + import java.math.BigDecimal; import java.util.*; import java.util.concurrent.TimeUnit; @@ -45,15 +46,15 @@ import java.util.stream.Collectors; /** * 用户中心 服务实现类 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- + * +---------------------------------------------------------------------- + * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] + * +---------------------------------------------------------------------- + * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved. + * +---------------------------------------------------------------------- + * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 + * +---------------------------------------------------------------------- + * | Author: CRMEB Team + * +---------------------------------------------------------------------- */ @Service public class UserCenterServiceImpl extends ServiceImpl implements UserCenterService { @@ -120,6 +121,8 @@ public class UserCenterServiceImpl extends ServiceImpl implements @Autowired private FrontTokenComponent tokenComponent; + @Autowired + private SCRMUtils scrmUtils; /** * 推广数据接口(昨天的佣金 累计提现金额 当前佣金) @@ -141,6 +144,7 @@ public class UserCenterServiceImpl extends ServiceImpl implements /** * 推广佣金/提现总和 + * * @return BigDecimal */ @Override @@ -155,7 +159,7 @@ public class UserCenterServiceImpl extends ServiceImpl implements //累计提现 if (type == 4) { - return userExtractService.getWithdrawn(null,null); + return userExtractService.getWithdrawn(null, null); } return BigDecimal.ZERO; @@ -163,45 +167,47 @@ public class UserCenterServiceImpl extends ServiceImpl implements /** * 提现申请 + * * @return Boolean */ @Override public Boolean extractCash(UserExtractRequest request) { switch (request.getExtractType()) { case "weixin": - if (StringUtils.isBlank(request.getWechat())) { - throw new CrmebException("请填写微信号！"); + if (StrUtil.isBlank(request.getWechat())) { + throw new CrmebException("请填写微信号！"); } request.setAlipayCode(null); request.setBankCode(null); request.setBankName(null); break; case "alipay": - if (StringUtils.isBlank(request.getAlipayCode())) { - throw new CrmebException("请填写支付宝账号！"); + if (StrUtil.isBlank(request.getAlipayCode())) { + throw new CrmebException("请填写支付宝账号！"); } request.setWechat(null); request.setBankCode(null); request.setBankName(null); break; case "bank": - if (StringUtils.isBlank(request.getBankName())) { - throw new CrmebException("请填写银行名称！"); + if (StrUtil.isBlank(request.getBankName())) { + throw new CrmebException("请填写银行名称！"); } - if (StringUtils.isBlank(request.getBankCode())) { - throw new CrmebException("请填写银行卡号！"); + if (StrUtil.isBlank(request.getBankCode())) { + throw new CrmebException("请填写银行卡号！"); } request.setWechat(null); request.setAlipayCode(null); break; default: - throw new CrmebException("请选择支付方式"); + throw new CrmebException("请选择支付方式"); } return userExtractService.extractApply(request); } /** * 提现银行/提现最低金额 + * * @return UserExtractCashResponse */ @Override @@ -211,7 +217,7 @@ public class UserCenterServiceImpl extends ServiceImpl implements List bankArr = new ArrayList<>(); if (bank.indexOf("\n") > 0) { bankArr.addAll(Arrays.asList(bank.split("\n"))); - }else{ + } else { bankArr.add(bank); } return bankArr; @@ -219,6 +225,7 @@ public class UserCenterServiceImpl extends ServiceImpl implements /** * 会员等级列表 + * * @return List */ @Override @@ -228,6 +235,7 @@ public class UserCenterServiceImpl extends ServiceImpl implements /** * 推广用户， 我自己推广了哪些用户 + * * @return List */ @Override @@ -244,21 +252,20 @@ public class UserCenterServiceImpl extends ServiceImpl implements if (request.getGrade().equals(1)) {// 二级推广人 //查询二级推广人 List secondSpreadIdList = userService.getSpreadPeopleIdList(userIdList); + if (CollUtil.isEmpty(secondSpreadIdList)) { + return new ArrayList<>(); + } //二级推广人 userIdList.clear(); userIdList.addAll(secondSpreadIdList); } List spreadPeopleList = userService.getSpreadPeopleList(userIdList, request.getKeyword(), request.getSortKey(), request.getIsAsc(), pageParamRequest); - spreadPeopleList.forEach(e -> { - OrderBrokerageData brokerageData = storeOrderService.getBrokerageData(e.getUid(), userId); - e.setOrderCount(brokerageData.getNum()); - e.setNumberCount(brokerageData.getPrice()); - }); return spreadPeopleList; } /** * 充值额度选择 + * * @return UserRechargeResponse */ @Override @@ -267,7 +274,7 @@ public class UserCenterServiceImpl extends ServiceImpl implements userRechargeResponse.setRechargeQuota(systemGroupDataService.getListByGid(SysGroupDataConstants.GROUP_DATA_ID_RECHARGE_LIST, UserRechargeItemResponse.class)); String rechargeAttention = systemConfigService.getValueByKey(Constants.CONFIG_RECHARGE_ATTENTION); List rechargeAttentionList = new ArrayList<>(); - if (StringUtils.isNotBlank(rechargeAttention)) { + if (StrUtil.isNotBlank(rechargeAttention)) { rechargeAttentionList = CrmebUtil.stringToArrayStrRegex(rechargeAttention, "\n"); } userRechargeResponse.setRechargeAttention(rechargeAttentionList); @@ -276,6 +283,7 @@ public class UserCenterServiceImpl extends ServiceImpl implements /** * 用户资金统计 + * * @return UserBalanceResponse */ @Override @@ -283,12 +291,12 @@ public class UserCenterServiceImpl extends ServiceImpl implements User info = userService.getInfo(); BigDecimal recharge = userBillService.getSumBigDecimal(1, info.getUid(), Constants.USER_BILL_CATEGORY_MONEY, null, null); BigDecimal orderStatusSum = userBillService.getSumBigDecimal(0, info.getUid(), Constants.USER_BILL_CATEGORY_MONEY, null, null); -// BigDecimal orderStatusSum = storeOrderService.getSumBigDecimal(info.getUid(), null); return new UserBalanceResponse(info.getNowMoney(), recharge, orderStatusSum); } /** * 推广订单 + * * @return UserSpreadOrderResponse; */ @Override @@ -327,7 +335,7 @@ public class UserCenterServiceImpl extends ServiceImpl implements userSpreadOrderItemChildResponse.setNickname(userMap.get(orderUid).getNickname()); userSpreadOrderItemChildResponse.setType("返佣"); - String month = DateUtil.dateToStr(record.getUpdateTime(), Constants.DATE_FORMAT_MONTH); + String month = CrmebDateUtil.dateToStr(record.getUpdateTime(), Constants.DATE_FORMAT_MONTH); if (monthList.contains(month)) { //如果在已有的数据中找到当前月份数据则追加 for (UserSpreadOrderItemResponse userSpreadOrderItemResponse : userSpreadOrderItemResponseList) { @@ -348,7 +356,7 @@ public class UserCenterServiceImpl extends ServiceImpl implements // 获取月份总订单数 Map countMap = userBrokerageRecordService.getSpreadCountByUidAndMonth(user.getUid(), monthList); - for (UserSpreadOrderItemResponse userSpreadOrderItemResponse: userSpreadOrderItemResponseList) { + for (UserSpreadOrderItemResponse userSpreadOrderItemResponse : userSpreadOrderItemResponseList) { userSpreadOrderItemResponse.setCount(countMap.get(userSpreadOrderItemResponse.getTime())); } @@ -358,6 +366,7 @@ public class UserCenterServiceImpl extends ServiceImpl implements /** * 充值 + * * @return UserSpreadOrderResponse; */ @Override @@ -392,10 +401,6 @@ public class UserCenterServiceImpl extends ServiceImpl implements userRecharge.setPrice(request.getPrice()); userRecharge.setGivePrice(request.getGivePrice()); userRecharge.setRechargeType(request.getFromType()); - boolean save = userRechargeService.save(userRecharge); - if (!save) { - throw new CrmebException("生成充值订单失败!"); - } OrderPayResultResponse response = new OrderPayResultResponse(); MyRecord record = new MyRecord(); @@ -413,13 +418,23 @@ public class UserCenterServiceImpl extends ServiceImpl implements vo.setMwebUrl(unifiedorder.get("mweb_url")); response.setPayType(PayConstants.PAY_CHANNEL_WE_CHAT_H5); } + if (userRecharge.getRechargeType().equals(PayConstants.PAY_CHANNEL_WE_CHAT_APP_IOS) || userRecharge.getRechargeType().equals(PayConstants.PAY_CHANNEL_WE_CHAT_APP_ANDROID)) {// + vo.setPartnerid(unifiedorder.get("partnerid")); + } response.setJsConfig(vo); response.setOrderNo(userRecharge.getOrderId()); + + userRecharge.setOutTradeNo(unifiedorder.get("outTradeNo")); + boolean save = userRechargeService.save(userRecharge); + if (!save) { + throw new CrmebException("生成充值订单失败!"); + } return response; } /** * 微信登录 + * * @return LoginResponse; */ @Override @@ -427,7 +442,7 @@ public class UserCenterServiceImpl extends ServiceImpl implements // 通过code获取获取公众号授权信息 WeChatOauthToken oauthToken = wechatNewService.getOauth2AccessToken(code); //检测是否存在 - UserToken userToken = userTokenService.getByOpenidAndType(oauthToken.getOpenId(), Constants.THIRD_LOGIN_TOKEN_TYPE_PUBLIC); + UserToken userToken = userTokenService.getByOpenidAndType(oauthToken.getOpenId(), Constants.THIRD_LOGIN_TOKEN_TYPE_PUBLIC); LoginResponse loginResponse = new LoginResponse(); if (ObjectUtil.isNotNull(userToken)) {// 已存在，正常登录 User user = userService.getById(userToken.getUid()); @@ -436,15 +451,16 @@ public class UserCenterServiceImpl extends ServiceImpl implements } // 记录最后一次登录时间 - user.setLastLoginTime(DateUtil.nowDateTime()); + user.setLastLoginTime(CrmebDateUtil.nowDateTime()); Boolean execute = transactionTemplate.execute(e -> { // 分销绑定 if (userService.checkBingSpread(user, spreadUid, "old")) { user.setSpreadUid(spreadUid); - user.setSpreadTime(DateUtil.nowDateTime()); + user.setSpreadTime(CrmebDateUtil.nowDateTime()); // 处理新旧推广人数据 userService.updateSpreadCountByUid(spreadUid, "add"); } + user.setUpdateTime(DateUtil.date()); userService.updateById(user); return Boolean.TRUE; }); @@ -482,6 +498,7 @@ public class UserCenterServiceImpl extends ServiceImpl implements /** * 获取微信授权logo + * * @return String; */ @Override @@ -491,7 +508,8 @@ public class UserCenterServiceImpl extends ServiceImpl implements /** * 小程序登录 - * @param code String 前端临时授权code + * + * @param code String 前端临时授权code * @param request RegisterThirdUserRequest 用户信息 * @return LoginResponse */ @@ -509,15 +527,16 @@ public class UserCenterServiceImpl extends ServiceImpl implements throw new CrmebException("当前账户已禁用，请联系管理员！"); } // 记录最后一次登录时间 - user.setLastLoginTime(DateUtil.nowDateTime()); + user.setLastLoginTime(CrmebDateUtil.nowDateTime()); Boolean execute = transactionTemplate.execute(e -> { // 分销绑定 if (userService.checkBingSpread(user, request.getSpreadPid(), "old")) { user.setSpreadUid(request.getSpreadPid()); - user.setSpreadTime(DateUtil.nowDateTime()); + user.setSpreadTime(CrmebDateUtil.nowDateTime()); // 处理新旧推广人数据 userService.updateSpreadCountByUid(request.getSpreadPid(), "add"); } + user.setUpdateTime(DateUtil.date()); userService.updateById(user); return Boolean.TRUE; }); @@ -544,7 +563,9 @@ public class UserCenterServiceImpl extends ServiceImpl implements loginResponse.setType("start"); return loginResponse; } - + if (StrUtil.isBlank(request.getNickName())) { + request.setNickName(""); + } request.setType(Constants.USER_LOGIN_TYPE_PROGRAM); request.setOpenId(response.getOpenId()); String key = SecureUtil.md5(response.getOpenId()); @@ -556,7 +577,8 @@ public class UserCenterServiceImpl extends ServiceImpl implements /** * 推广人排行榜 - * @param type String 时间范围(week-周，month-月) + * + * @param type String 时间范围(week-周，month-月) * @param pageParamRequest PageParamRequest 分页 * @return List */ @@ -567,7 +589,8 @@ public class UserCenterServiceImpl extends ServiceImpl implements /** * 佣金排行榜 - * @param type String 时间范围 + * + * @param type String 时间范围 * @param pageParamRequest PageParamRequest 分页 * @return List */ @@ -579,7 +602,7 @@ public class UserCenterServiceImpl extends ServiceImpl implements return null; } // 解决0元排行问题 - for (int i = 0; i < recordList.size();) { + for (int i = 0; i < recordList.size(); ) { UserBrokerageRecord userBrokerageRecord = recordList.get(i); if (userBrokerageRecord.getPrice().compareTo(BigDecimal.ZERO) < 1) { recordList.remove(i); @@ -597,7 +620,7 @@ public class UserCenterServiceImpl extends ServiceImpl implements //解决排序问题 List userList = CollUtil.newArrayList(); - for (UserBrokerageRecord record: recordList) { + for (UserBrokerageRecord record : recordList) { User user = new User(); User userVo = userVoList.get(record.getUid()); @@ -606,7 +629,7 @@ public class UserCenterServiceImpl extends ServiceImpl implements user.setBrokeragePrice(record.getPrice()); if (StrUtil.isBlank(userVo.getNickname())) { user.setNickname(userVo.getPhone().substring(0, 2) + "****" + userVo.getPhone().substring(7)); - }else{ + } else { user.setNickname(userVo.getNickname()); } userList.add(user); @@ -616,6 +639,7 @@ public class UserCenterServiceImpl extends ServiceImpl implements /** * 推广海报图 + * * @return List */ @Override @@ -625,7 +649,8 @@ public class UserCenterServiceImpl extends ServiceImpl implements /** * 当前用户在佣金排行第几名 - * @param type String 时间范围 + * + * @param type String 时间范围 * @return 优惠券集合 */ @Override @@ -643,7 +668,7 @@ public class UserCenterServiceImpl extends ServiceImpl implements for (int i = 0; i < recordList.size(); i++) { if (recordList.get(i).getUid().equals(userId)) { number = i + 1; - break ; + break; } } return number; @@ -651,6 +676,7 @@ public class UserCenterServiceImpl extends ServiceImpl implements /** * 佣金转入余额 + * * @return Boolean */ @Override @@ -679,7 +705,7 @@ public class UserCenterServiceImpl extends ServiceImpl implements userBill.setBalance(user.getNowMoney().add(price)); userBill.setMark(StrUtil.format("佣金转余额,增加{}", price)); userBill.setStatus(1); - userBill.setCreateTime(DateUtil.nowDateTime()); + userBill.setCreateTime(CrmebDateUtil.nowDateTime()); // userBrokerage转出记录 UserBrokerageRecord brokerageRecord = new UserBrokerageRecord(); @@ -692,7 +718,7 @@ public class UserCenterServiceImpl extends ServiceImpl implements brokerageRecord.setBalance(user.getNowMoney().add(price)); brokerageRecord.setMark(StrUtil.format("佣金转余额，减少{}", price)); brokerageRecord.setStatus(BrokerageRecordConstants.BROKERAGE_RECORD_STATUS_COMPLETE); - brokerageRecord.setCreateTime(DateUtil.nowDateTime()); + brokerageRecord.setCreateTime(CrmebDateUtil.nowDateTime()); Boolean execute = transactionTemplate.execute(e -> { // 扣佣金 @@ -717,6 +743,7 @@ public class UserCenterServiceImpl extends ServiceImpl implements /** * 推广佣金明细 + * * @param pageParamRequest 分页参数 */ @Override @@ -727,6 +754,7 @@ public class UserCenterServiceImpl extends ServiceImpl implements /** * 用户账单记录（现金） + * * @param type 记录类型：all-全部，expenditure-支出，income-收入 * @return CommonPage */ @@ -742,7 +770,7 @@ public class UserCenterServiceImpl extends ServiceImpl implements // 获取年-月 Map> map = CollUtil.newHashMap(); list.forEach(i -> { - String month = StrUtil.subPre(DateUtil.dateToStr(i.getCreateTime(), Constants.DATE_FORMAT), 7); + String month = StrUtil.subPre(CrmebDateUtil.dateToStr(i.getCreateTime(), Constants.DATE_FORMAT), 7); if (map.containsKey(month)) { map.get(month).add(i); } else { @@ -759,12 +787,14 @@ public class UserCenterServiceImpl extends ServiceImpl implements responseList.add(response); }); - PageInfo pageInfo = CommonPage.copyPageInfo(billPageInfo, responseList); + List collect = responseList.stream().sorted(Comparator.comparing(s -> cn.hutool.core.date.DateUtil.parse(s.getDate(), "yyyy-MM").getTime(), Comparator.reverseOrder())).collect(Collectors.toList()); + PageInfo pageInfo = CommonPage.copyPageInfo(billPageInfo, collect); return CommonPage.restPage(pageInfo); } /** * 微信注册绑定手机号 + * * @param request 请求参数 * @return 登录信息 */ @@ -798,6 +828,12 @@ public class UserCenterServiceImpl extends ServiceImpl implements case "routine": type = Constants.THIRD_LOGIN_TOKEN_TYPE_PROGRAM; break; + case "iosWx": + type = Constants.THIRD_LOGIN_TOKEN_TYPE_IOS_WX; + break; + case "androidWx": + type = Constants.THIRD_LOGIN_TOKEN_TYPE_ANDROID_WX; + break; } UserToken userToken = userTokenService.getTokenByUserId(user.getUid(), type); @@ -814,7 +850,7 @@ public class UserCenterServiceImpl extends ServiceImpl implements // 分销绑定 if (userService.checkBingSpread(finalUser, registerThirdUserRequest.getSpreadPid(), "new")) { finalUser.setSpreadUid(registerThirdUserRequest.getSpreadPid()); - finalUser.setSpreadTime(DateUtil.nowDateTime()); + finalUser.setSpreadTime(CrmebDateUtil.nowDateTime()); userService.updateSpreadCountByUid(registerThirdUserRequest.getSpreadPid(), "add"); } userService.save(finalUser); @@ -828,6 +864,12 @@ public class UserCenterServiceImpl extends ServiceImpl implements case "routine": userTokenService.bind(registerThirdUserRequest.getOpenId(), Constants.THIRD_LOGIN_TOKEN_TYPE_PROGRAM, finalUser.getUid()); break; + case "iosWx": + userTokenService.bind(registerThirdUserRequest.getOpenId(), Constants.THIRD_LOGIN_TOKEN_TYPE_IOS_WX, finalUser.getUid()); + break; + default: + userTokenService.bind(registerThirdUserRequest.getOpenId(), Constants.THIRD_LOGIN_TOKEN_TYPE_ANDROID_WX, finalUser.getUid()); + break; } return Boolean.TRUE; }); @@ -850,11 +892,17 @@ public class UserCenterServiceImpl extends ServiceImpl implements loginResponse.setUid(user.getUid()); loginResponse.setNikeName(user.getNickname()); loginResponse.setPhone(user.getPhone()); + try { + scrmUtils.addUserForSCRM(user.getPhone(), user.getNickname()); + } catch (Exception e) { + logger.error("SCRM用户同步失败: phone={}, nickname={}", user.getPhone(), user.getNickname(), e); + } return loginResponse; } /** * 用户积分记录列表 + * * @param pageParamRequest 分页参数 * @return List */ @@ -864,8 +912,73 @@ public class UserCenterServiceImpl extends ServiceImpl implements return userIntegralRecordService.findUserIntegralRecordList(uid, pageParamRequest); } + /** + * 微信app登录 + * + * @param request 请求参数 + * @return 登录响应体 + */ + @Override + public LoginResponse appLogin(RegisterAppWxRequest request) { + //检测是否存在 + UserToken userToken = null; + if (request.getType().equals(Constants.USER_LOGIN_TYPE_IOS_WX)) { + userToken = userTokenService.getByOpenidAndType(request.getOpenId(), Constants.THIRD_LOGIN_TOKEN_TYPE_IOS_WX); + } + if (request.getType().equals(Constants.USER_LOGIN_TYPE_ANDROID_WX)) { + userToken = userTokenService.getByOpenidAndType(request.getOpenId(), Constants.THIRD_LOGIN_TOKEN_TYPE_ANDROID_WX); + } + LoginResponse loginResponse = new LoginResponse(); + if (ObjectUtil.isNotNull(userToken)) {// 已存在，正常登录 + User user = userService.getById(userToken.getUid()); + if (!user.getStatus()) { + throw new CrmebException("当前账户已禁用，请联系管理员！"); + } + + // 记录最后一次登录时间 + user.setLastLoginTime(CrmebDateUtil.nowDateTime()); + user.setUpdateTime(DateUtil.date()); + Boolean execute = transactionTemplate.execute(e -> { + userService.updateById(user); + return Boolean.TRUE; + }); + if (!execute) { + logger.error(StrUtil.format("APP微信登录记录最后一次登录时间失败，uid={}", user.getUid())); + } + try { + String token = tokenComponent.createToken(user); + loginResponse.setToken(token); + } catch (Exception e) { + logger.error(StrUtil.format("APP微信登录生成token失败，uid={}", user.getUid())); + e.printStackTrace(); + } + loginResponse.setType("login"); + loginResponse.setUid(user.getUid()); + return loginResponse; + } + // 没有用户，走创建用户流程 + // 从微信获取用户信息，存入Redis中，将key返回给前端，前端在下一步绑定手机号的时候下发 + RegisterThirdUserRequest registerThirdUserRequest = new RegisterThirdUserRequest(); + registerThirdUserRequest.setSpreadPid(0); + registerThirdUserRequest.setType(request.getType()); + registerThirdUserRequest.setOpenId(request.getOpenId()); + registerThirdUserRequest.setNickName(request.getNickName()); + registerThirdUserRequest.setSex(request.getGender()); + registerThirdUserRequest.setProvince(request.getProvince()); + registerThirdUserRequest.setCity(request.getCity()); + registerThirdUserRequest.setCountry(request.getCountry()); + registerThirdUserRequest.setAvatar(request.getAvatarUrl()); + String key = SecureUtil.md5(request.getOpenId()); + redisUtil.set(key, JSONObject.toJSONString(registerThirdUserRequest), (long) (60 * 2), TimeUnit.MINUTES); + + loginResponse.setType("register"); + loginResponse.setKey(key); + return loginResponse; + } + /** * 获取用户积分信息 + * * @return IntegralUserResponse */ @Override @@ -875,7 +988,10 @@ public class UserCenterServiceImpl extends ServiceImpl implements //签到 Integer sumIntegral = userIntegralRecordService.getSumIntegral(user.getUid(), IntegralRecordConstants.INTEGRAL_RECORD_TYPE_ADD, "", null); - Integer deductionIntegral = userIntegralRecordService.getSumIntegral(user.getUid(), IntegralRecordConstants.INTEGRAL_RECORD_TYPE_SUB, "", IntegralRecordConstants.INTEGRAL_RECORD_LINK_TYPE_ORDER); + ArrayList linkTypeList = new ArrayList<>(); + linkTypeList.add(IntegralRecordConstants.INTEGRAL_RECORD_LINK_TYPE_ORDER); + linkTypeList.add(IntegralRecordConstants.INTEGRAL_RECORD_LINK_TYPE_SYSTEM); + Integer deductionIntegral = userIntegralRecordService.getSumIntegral(user.getUid(), IntegralRecordConstants.INTEGRAL_RECORD_TYPE_SUB, "", linkTypeList); userSignInfoResponse.setSumIntegral(sumIntegral); userSignInfoResponse.setDeductionIntegral(deductionIntegral); // 冻结积分 @@ -887,6 +1003,7 @@ public class UserCenterServiceImpl extends ServiceImpl implements /** * 获取用户经验记录 + * * @param pageParamRequest 分页参数 * @return List */ @@ -898,6 +1015,7 @@ public class UserCenterServiceImpl extends ServiceImpl implements /** * 提现用户信息 + * * @return UserExtractCashResponse */ @Override @@ -916,6 +1034,7 @@ public class UserCenterServiceImpl extends ServiceImpl implements /** * 推广人列表统计 + * * @return UserSpreadPeopleResponse */ @Override @@ -951,10 +1070,10 @@ public class UserCenterServiceImpl extends ServiceImpl implements * 绑定手机号数据校验 */ private void checkBindingPhone(WxBindingPhoneRequest request) { - if (!"public".equals(request.getType()) && !"routine".equals(request.getType()) && !"iosWx".equals(request.getType()) && !"androidWx".equals(request.getType())) { + if (!request.getType().equals("public") && !request.getType().equals("routine") && !request.getType().equals("iosWx") && !request.getType().equals("androidWx")) { throw new CrmebException("未知的用户类型"); } - if ("public".equals(request.getType())) { + if (request.getType().equals("public") || request.getType().equals("iosWx") || request.getType().equals("androidWx")) { if (StrUtil.isBlank(request.getCaptcha())) { throw new CrmebException("验证码不能为空"); } @@ -969,39 +1088,54 @@ public class UserCenterServiceImpl extends ServiceImpl implements } checkValidateCode(request.getPhone(), request.getCaptcha()); } else { - // 参数校验 - if (StrUtil.isBlank(request.getCode())) { - throw new CrmebException("小程序获取手机号code不能为空"); - } - if (StrUtil.isBlank(request.getEncryptedData())) { - throw new CrmebException("小程序获取手机号加密数据不能为空"); - } - if (StrUtil.isBlank(request.getIv())) { - throw new CrmebException("小程序获取手机号加密算法的初始向量不能为空"); - } - // 获取appid - String programAppId = systemConfigService.getValueByKey(WeChatConstants.WECHAT_MINI_APPID); - if (StringUtils.isBlank(programAppId)) { - throw new CrmebException("微信小程序appId未设置"); - } + if (StrUtil.isNotBlank(request.getCaptcha())) { + if (StrUtil.isBlank(request.getPhone())) { + throw new CrmebException("手机号不能为空"); + } + boolean matchPhone = ReUtil.isMatch(RegularConstants.PHONE_TWO, request.getPhone()); + if (!matchPhone) { + throw new CrmebException("手机号格式错误，请输入正确得手机号"); + } + boolean match = ReUtil.isMatch(RegularConstants.VALIDATE_CODE_NUM_SIX, request.getCaptcha()); + if (!match) { + throw new CrmebException("验证码格式错误，验证码必须为6位数字"); + } + checkValidateCode(request.getPhone(), request.getCaptcha()); + } else { + // 参数校验 + if (StrUtil.isBlank(request.getCode())) { + throw new CrmebException("小程序获取手机号code不能为空"); + } + if (StrUtil.isBlank(request.getEncryptedData())) { + throw new CrmebException("小程序获取手机号加密数据不能为空"); + } + if (StrUtil.isBlank(request.getIv())) { + throw new CrmebException("小程序获取手机号加密算法的初始向量不能为空"); + } + // 获取appid + String programAppId = systemConfigService.getValueByKey(WeChatConstants.WECHAT_MINI_APPID); + if (StrUtil.isBlank(programAppId)) { + throw new CrmebException("微信小程序appId未设置"); + } - WeChatMiniAuthorizeVo response = wechatNewService.miniAuthCode(request.getCode()); -// WeChatMiniAuthorizeVo response = weChatService.programAuthorizeLogin(request.getCode()); - System.out.println("小程序登陆成功 = " + JSON.toJSONString(response)); - String decrypt = WxUtil.decrypt(programAppId, request.getEncryptedData(), response.getSessionKey(), request.getIv()); - if (StrUtil.isBlank(decrypt)) { - throw new CrmebException("微信小程序获取手机号解密失败"); + WeChatMiniAuthorizeVo response = wechatNewService.miniAuthCode(request.getCode()); + System.out.println("小程序登陆成功 = " + JSON.toJSONString(response)); + String decrypt = WxUtil.decrypt(programAppId, request.getEncryptedData(), response.getSessionKey(), request.getIv()); + if (StrUtil.isBlank(decrypt)) { + throw new CrmebException("微信小程序获取手机号解密失败"); + } + JSONObject jsonObject = JSONObject.parseObject(decrypt); + if (StrUtil.isBlank(jsonObject.getString("phoneNumber"))) { + throw new CrmebException("微信小程序获取手机号没有有效的手机号"); + } + request.setPhone(jsonObject.getString("phoneNumber")); } - JSONObject jsonObject = JSONObject.parseObject(decrypt); - if (StrUtil.isBlank(jsonObject.getString("phoneNumber"))) { - throw new CrmebException("微信小程序获取手机号没有有效的手机号"); - } - request.setPhone(jsonObject.getString("phoneNumber")); } } /** * 赠送新人券 + * * @param uid 用户uid */ private void giveNewPeopleCoupon(Integer uid) { @@ -1012,9 +1146,9 @@ public class UserCenterServiceImpl extends ServiceImpl implements couponList.forEach(storeCoupon -> { //是否有固定的使用时间 if (!storeCoupon.getIsFixedTime()) { - String endTime = DateUtil.addDay(DateUtil.nowDate(Constants.DATE_FORMAT), storeCoupon.getDay(), Constants.DATE_FORMAT); - storeCoupon.setUseEndTime(DateUtil.strToDate(endTime, Constants.DATE_FORMAT)); - storeCoupon.setUseStartTime(DateUtil.nowDateTimeReturnDate(Constants.DATE_FORMAT)); + String endTime = CrmebDateUtil.addDay(CrmebDateUtil.nowDate(Constants.DATE_FORMAT), storeCoupon.getDay(), Constants.DATE_FORMAT); + storeCoupon.setUseEndTime(CrmebDateUtil.strToDate(endTime, Constants.DATE_FORMAT)); + storeCoupon.setUseStartTime(CrmebDateUtil.nowDateTimeReturnDate(Constants.DATE_FORMAT)); } StoreCouponUser storeCouponUser = new StoreCouponUser(); @@ -1027,7 +1161,7 @@ public class UserCenterServiceImpl extends ServiceImpl implements storeCouponUser.setStartTime(storeCoupon.getUseStartTime()); storeCouponUser.setEndTime(storeCoupon.getUseEndTime()); } else {// 没有固定使用时间 - Date nowDate = DateUtil.nowDateTime(); + Date nowDate = CrmebDateUtil.nowDateTime(); storeCouponUser.setStartTime(nowDate); DateTime dateTime = cn.hutool.core.date.DateUtil.offsetDay(nowDate, storeCoupon.getDay()); storeCouponUser.setEndTime(dateTime); @@ -1051,8 +1185,9 @@ public class UserCenterServiceImpl extends ServiceImpl implements /** * 检测手机验证码 + * * @param phone 手机号 - * @param code 验证码 + * @param code 验证码 */ private void checkValidateCode(String phone, String code) { Object validateCode = redisUtil.get(SmsConstants.SMS_VALIDATE_PHONE + phone); diff --git a/crmeb/crmeb-front/src/main/resources/application-beta.yml b/crmeb/crmeb-front/src/main/resources/application-beta.yml index c2beaff6..3bc45922 100644 --- a/crmeb/crmeb-front/src/main/resources/application-beta.yml +++ b/crmeb/crmeb-front/src/main/resources/application-beta.yml @@ -1,6 +1,8 @@ # CRMEB 相关配置 crmeb: - version: CRMEB-JAVA-KY-v1.3.4 # 当前代码版本 + version: CRMEB-JAVA-KY-v1.4 # 当前代码版本 + imagePath: /你的站点绝对路径 建议jar包位置/ # 服务器图片路径配置 斜杠结尾 + asyncConfig: true #是否同步config表数据到redis server: port: 20009 @@ -13,13 +15,13 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/crmeb_java_beta?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 - username: root - password: 123456 + url: jdbc:mysql://127.0.0.1:3306/crmeb_java_beta?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 + username: crmeb_java_beta + password: 111111 redis: host: 127.0.0.1 #地址 port: 6379 #端口 - password: 123456 + password: 111111 timeout: 10000 # 连接超时时间（毫秒） database: 3 #默认数据库 jedis: diff --git a/crmeb/crmeb-front/src/main/resources/application-dev.yml b/crmeb/crmeb-front/src/main/resources/application-dev.yml index 1d5a5302..81c5afa2 100644 --- a/crmeb/crmeb-front/src/main/resources/application-dev.yml +++ b/crmeb/crmeb-front/src/main/resources/application-dev.yml @@ -1,9 +1,11 @@ # CRMEB 相关配置 crmeb: - version: CRMEB-JAVA-KY-v1.3.4 # 当前代码版本 + version: CRMEB-JAVA-KY-v1.4 # 当前代码版本 + imagePath: /JAVA_PROJECT/OPEN/dev/admin/ # 服务器图片路径配置 斜杠结尾 + asyncConfig: false #是否同步config表数据到redis server: - port: 20011 + port: 20510 spring: profiles: @@ -13,15 +15,15 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/crmeb_java_dev?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 - username: root - password: 123456 + url: jdbc:mysql://127.0.0.1:3306/single_open?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 + username: single_open + password: 111111 redis: host: 127.0.0.1 #地址 port: 6379 #端口 - password: 123456 + password: 111111 timeout: 10000 # 连接超时时间（毫秒） - database: 10 #默认数据库 + database: 6 #默认数据库 jedis: pool: max-active: 200 # 连接池最大连接数（使用负值表示没有限制） diff --git a/crmeb/crmeb-front/src/main/resources/application-prod.yml b/crmeb/crmeb-front/src/main/resources/application-prod.yml index 3bc577f4..ab1ba5c5 100644 --- a/crmeb/crmeb-front/src/main/resources/application-prod.yml +++ b/crmeb/crmeb-front/src/main/resources/application-prod.yml @@ -1,9 +1,11 @@ # CRMEB 相关配置 crmeb: - version: CRMEB-JAVA-KY-v1.3.4 # 当前代码版本 + version: CRMEB-JAVA-KY-v1.4 # 当前代码版本 + imagePath: /JAVA_PROJECT/SINGLE/demo/admin/ # 服务器图片路径配置 斜杠结尾 + asyncConfig: true #是否同步config表数据到redis server: - port: 20001 + port: 20410 spring: profiles: @@ -13,15 +15,15 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/crmeb_java?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 - username: root - password: 123456 + url: jdbc:mysql://127.0.0.1:3306/java_demo?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 + username: java_demo + password: 111111 redis: host: 127.0.0.1 #地址 port: 6379 #端口 - password: 123456 + password: 111111 timeout: 10000 # 连接超时时间（毫秒） - database: 15 #默认数据库 + database: 4 #默认数据库 jedis: pool: max-active: 200 # 连接池最大连接数（使用负值表示没有限制） @@ -42,7 +44,7 @@ logging: # mybatis 配置 mybatis-plus: - # 配置slq打印日志 + # 配置sql打印日志 configuration: log-impl: @@ -50,6 +52,6 @@ mybatis-plus: swagger: basic: enable: true #是否开启界面 - check: true #是否打开验证 - username: #访问swagger的账号 - password: #访问swagger的密码 + check: false #是否打开验证 + username: crmeb #访问swagger的账号 + password: crmeb.com #访问swagger的密码 diff --git a/crmeb/crmeb-front/src/main/resources/application.yml b/crmeb/crmeb-front/src/main/resources/application.yml index f4d78b4a..c5f4d356 100644 --- a/crmeb/crmeb-front/src/main/resources/application.yml +++ b/crmeb/crmeb-front/src/main/resources/application.yml @@ -1,6 +1,23 @@ # CRMEB 相关配置 crmeb: - version: CRMEB-JAVA-KY-v1.3.4 # 当前代码版本 + version: CRMEB-JAVA-KY-v1.4 # 当前代码版本 + imagePath: /Users/dazongzi/Documents/ZBKJ/CODEMANGER/BIZ-CODE/JavaSingel/back_old_version/V2.1/CRMEB_JAVA_SY_V2.1-20240827/single_java/ # 服务器图片路径配置 斜杠结尾 + asyncConfig: false #是否同步config表数据到redis + activityStyleCachedTime: 10 #活动边框缓存周期 秒为单位，生产环境适当5-10分钟即可 + demoSite: true # 是否演示站点 所有手机号码都会掩码 + ignored: #安全路径白名单 + - swagger-ui/ + - swagger-resources/** + - /**/v2/api-docs + - /**/*.html + - /**/*.js + - /**/*.css + - /**/*.png + - /**/*.map + - /favicon.ico + - /actuator/** + - /druid/** + - api/front/pagediy/info # 配置端口 server: @@ -21,8 +38,6 @@ spring: multipart: max-file-size: 50MB #设置单个文件大小 max-request-size: 50MB #设置单次请求文件的总大小 - resources: - static-locations: classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${crmeb.filePath} application: name: cemrb-front #这个很重要，这在以后的服务与服务之间相互调用一般都是根据这个name jackson: @@ -33,15 +48,15 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/crmeb?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 - username: crmeb + url: jdbc:mysql://127.0.0.1:3306/single_open?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 + username: single_open password: 111111 redis: host: 127.0.0.1 #地址 port: 6379 #端口 password: 111111 timeout: 30000 # 连接超时时间（毫秒） - database: 3 #默认数据库 + database: 6 #默认数据库 jedis: pool: max-active: 200 # 连接池最大连接数（使用负值表示没有限制） @@ -49,6 +64,8 @@ spring: max-idle: 10 # 连接池中的最大空闲连接 min-idle: 0 # 连接池中的最小空闲连接 time-between-eviction-runs: -1 #逐出扫描的时间间隔(毫秒) 如果为负数,则不运行逐出线程, 默认-1 + second: + database: 13 # 微信accessToken存储库 debug: true logging: @@ -63,7 +80,7 @@ logging: # mybatis 配置 mybatis-plus: mapper-locations: classpath*:mapper/*/*Mapper.xml #xml扫描，多个目录用逗号或者分号分隔（告诉 Mapper 所对应的 XML 文件位置） - # 配置slq打印日志 + # 配置sql打印日志 configuration: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl global-config: @@ -73,6 +90,47 @@ mybatis-plus: logic-not-delete-value: 0 # 逻辑未删除值(默认为 0) +# 行为验证码 +aj: + captcha: + type: default # 验证码类型 + water-mark: CRMEB Java # 水印 + slip-offset: 15 # 校验滑动拼图允许误差偏移量(默认5像素) + aes-status: true # aes加密坐标开启或者禁用(true|false) + interference-options: 2 # 滑动干扰项(0/1/2) + font-style: 1 # 点选字体样式 默认Font.BOLD + font-size: 25 # 点选字体字体大小 + req-frequency-limit-enable: false # 接口请求次数一分钟限制是否开启 true|false + req-get-lock-limit: 5 # 验证失败5次，get接口锁定 + req-get-lock-seconds: 360 # 验证失败后，锁定时间间隔,s + req-get-minute-limit: 30 # get接口一分钟内请求数限制 + req-check-minute-limit: 60 # check接口一分钟内请求数限制 + req-verify-minute-limit: 60 # verify接口一分钟内请求数限制 + + # 滑动验证，底图路径，不配置将使用默认图片 + # 支持全路径 + # 支持项目路径,以classpath:开头,取resource目录下路径,例：classpath:images/jigsaw + jigsaw: classpath:images/jigsaw + #滑动验证，底图路径，不配置将使用默认图片 + ##支持全路径 + # 支持项目路径,以classpath:开头,取resource目录下路径,例：classpath:images/pic-click + pic-click: classpath:images/pic-click + # 对于分布式部署的应用，我们建议应用自己实现CaptchaCacheService，比如用Redis或者memcache， + # 参考CaptchaCacheServiceRedisImpl.java + # 如果应用是单点的，也没有使用redis，那默认使用内存。 + # 内存缓存只适合单节点部署的应用，否则验证码生产与验证在节点之间信息不同步，导致失败。 + # ！！！ 注意啦，如果应用有使用spring-boot-starter-data-redis， + # 请打开CaptchaCacheServiceRedisImpl.java注释。 + # redis -----> SPI： 在resources目录新建META-INF.services文件夹(两层)，参考当前服务resources。 + # 缓存local/redis... + cache-type: redis + # local缓存的阈值,达到这个值，清除缓存 + cache-number: 1000 + # local定时清除过期缓存(单位秒),设置为0代表不执行 + timing-clear: 3600 + + history-data-clear-enable: false + #swagger 配置 swagger: basic: diff --git a/crmeb/crmeb-front/src/main/resources/logback-spring.xml b/crmeb/crmeb-front/src/main/resources/logback-spring.xml index a4e705a2..42efa5da 100644 --- a/crmeb/crmeb-front/src/main/resources/logback-spring.xml +++ b/crmeb/crmeb-front/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/crmeb/crmeb-service/pom.xml b/crmeb/crmeb-service/pom.xml index 0ebfeab2..abacdc85 100644 --- a/crmeb/crmeb-service/pom.xml +++ b/crmeb/crmeb-service/pom.xml @@ -22,6 +22,17 @@ crmeb-common ${crmeb-common} + + com.jayway.jsonpath + json-path + 2.4.0 + + + + com.google.code.gson + gson + 2.8.9 + \ No newline at end of file diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/ArticleDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/ArticleDao.java index 541c3f70..e07bdb8f 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/ArticleDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/ArticleDao.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/CategoryDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/CategoryDao.java index b8900b44..5da7bd4f 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/CategoryDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/CategoryDao.java @@ -8,7 +8,7 @@ import com.zbkj.common.model.category.Category; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/ExpressDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/ExpressDao.java index 3de15b9d..abf9b62d 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/ExpressDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/ExpressDao.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/MySqlGenDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/MySqlGenDao.java deleted file mode 100644 index 82e0e14e..00000000 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/MySqlGenDao.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.zbkj.service.dao; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; -import java.util.Map; - -@Mapper -public interface MySqlGenDao { - /** - * Mysql 查询列表 - * @param map 表名称 - * @return 列表 - */ - List> getList(Map map); - - /** - * Mysql 查询获取表信息 - * @param tableName 表名称 - * @return 表信息 - */ - Map getTable(String tableName); - - /** - * mysql 获取列信息 - * @param tableName 表名称 - * @return 表对应的列信息 - */ - List> getColumns(String tableName); -} diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/ShippingTemplatesDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/ShippingTemplatesDao.java index 4e9cd5e1..ad5e2e7b 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/ShippingTemplatesDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/ShippingTemplatesDao.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/ShippingTemplatesFreeDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/ShippingTemplatesFreeDao.java index d1186f7e..805138d3 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/ShippingTemplatesFreeDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/ShippingTemplatesFreeDao.java @@ -1,24 +1,24 @@ package com.zbkj.service.dao; -import com.zbkj.common.model.express.ShippingTemplatesFree; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zbkj.common.request.ShippingTemplatesFreeRequest; +import com.zbkj.common.model.express.ShippingTemplatesFree; +import com.zbkj.common.response.ShippingTemplatesFreeResponse; import java.util.List; /** - * Mapper 接口 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- + * Mapper 接口 + * +---------------------------------------------------------------------- + * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] + * +---------------------------------------------------------------------- + * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved. + * +---------------------------------------------------------------------- + * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 + * +---------------------------------------------------------------------- + * | Author: CRMEB Team + * +---------------------------------------------------------------------- */ public interface ShippingTemplatesFreeDao extends BaseMapper { - List getListGroup(Integer tempId); + List getListGroup(Integer tempId); } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/ShippingTemplatesRegionDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/ShippingTemplatesRegionDao.java index 8fd80112..96686842 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/ShippingTemplatesRegionDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/ShippingTemplatesRegionDao.java @@ -1,8 +1,8 @@ package com.zbkj.service.dao; -import com.zbkj.common.model.express.ShippingTemplatesRegion; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zbkj.common.request.ShippingTemplatesRegionRequest; +import com.zbkj.common.model.express.ShippingTemplatesRegion; +import com.zbkj.common.response.ShippingTemplatesRegionResponse; import java.util.List; @@ -11,7 +11,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相关版权 * +---------------------------------------------------------------------- @@ -20,5 +20,5 @@ import java.util.List; */ public interface ShippingTemplatesRegionDao extends BaseMapper { - List getListGroup(Integer tempId); + List getListGroup(Integer tempId); } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SmsRecordDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SmsRecordDao.java index 4b608d69..4ee3e513 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SmsRecordDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SmsRecordDao.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SmsTemplateDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SmsTemplateDao.java index bb19694e..de232ab0 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SmsTemplateDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SmsTemplateDao.java @@ -8,7 +8,7 @@ import com.zbkj.common.model.sms.SmsTemplate; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreBargainDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreBargainDao.java index c6f74988..442dfa3f 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreBargainDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreBargainDao.java @@ -8,7 +8,7 @@ import com.zbkj.common.model.bargain.StoreBargain; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreBargainUserDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreBargainUserDao.java index 1bd18a9d..3c0c0b3c 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreBargainUserDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreBargainUserDao.java @@ -3,12 +3,14 @@ package com.zbkj.service.dao; import com.zbkj.common.model.bargain.StoreBargainUser; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; + /** * 用户参与砍价表 Mapper 接口 * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -17,4 +19,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface StoreBargainUserDao extends BaseMapper { + List selectHeaderList(); } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreBargainUserHelpDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreBargainUserHelpDao.java index 6c5071cd..dec516de 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreBargainUserHelpDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreBargainUserHelpDao.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreCartDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreCartDao.java index 86e37988..cccc79f4 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreCartDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreCartDao.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreCombinationDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreCombinationDao.java index bb08a2ff..4c2e519c 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreCombinationDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreCombinationDao.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreCouponDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreCouponDao.java index 0dd71e77..7111786e 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreCouponDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreCouponDao.java @@ -8,7 +8,7 @@ import com.zbkj.common.model.coupon.StoreCoupon; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreCouponUserDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreCouponUserDao.java index bb110bc1..e98084c2 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreCouponUserDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreCouponUserDao.java @@ -3,12 +3,15 @@ package com.zbkj.service.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zbkj.common.model.coupon.StoreCouponUser; +import java.util.List; +import java.util.Map; + /** * 优惠券记录表 Mapper 接口 * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -17,4 +20,7 @@ import com.zbkj.common.model.coupon.StoreCouponUser; */ public interface StoreCouponUserDao extends BaseMapper { + List getListByPreOrderNo(Map map); + + } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreOrderDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreOrderDao.java index 9a982178..0049388e 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreOrderDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreOrderDao.java @@ -11,13 +11,14 @@ import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; import java.util.List; +import java.util.Map; /** * 订单表 Mapper 接口 * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -41,6 +42,8 @@ public interface StoreOrderDao extends BaseMapper { */ Integer getRefundTotal(String where); + List findFrontList(Map searchMap); + /** * 核销详情 月数据 * @param request 分页和日期 diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreOrderInfoDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreOrderInfoDao.java index c39dc78a..71518c41 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreOrderInfoDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreOrderInfoDao.java @@ -11,7 +11,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreOrderStatusDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreOrderStatusDao.java index dba3ec61..6e7b95d0 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreOrderStatusDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreOrderStatusDao.java @@ -11,7 +11,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StorePinkDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StorePinkDao.java index 4d2a9a94..2349acd1 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StorePinkDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StorePinkDao.java @@ -3,12 +3,14 @@ package com.zbkj.service.dao; import com.zbkj.common.model.combination.StorePink; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; + /** * 拼团表 Mapper 接口 * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -17,4 +19,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface StorePinkDao extends BaseMapper { + List selectSizePink(Integer size); } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductAttrDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductAttrDao.java index e7dd9029..80d9224c 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductAttrDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductAttrDao.java @@ -8,7 +8,7 @@ import com.zbkj.common.model.product.StoreProductAttr; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductAttrResultDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductAttrResultDao.java index d9805e37..4941b02b 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductAttrResultDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductAttrResultDao.java @@ -8,7 +8,7 @@ import com.zbkj.common.model.product.StoreProductAttrResult; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductAttrValueDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductAttrValueDao.java index a4f7a03a..14878ad3 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductAttrValueDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductAttrValueDao.java @@ -8,7 +8,7 @@ import com.zbkj.common.model.product.StoreProductAttrValue; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductCateDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductCateDao.java deleted file mode 100644 index 6085db34..00000000 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductCateDao.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.zbkj.service.dao; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zbkj.common.model.product.StoreProductCate; - -/** - * 商品分类辅助表 Mapper 接口 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - */ -public interface StoreProductCateDao extends BaseMapper { - -} diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductCouponDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductCouponDao.java index 84aed9cd..7164358a 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductCouponDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductCouponDao.java @@ -9,7 +9,7 @@ import com.zbkj.common.model.product.StoreProductCoupon; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductDao.java index fee8a382..48e04038 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductDao.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductDescriptionDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductDescriptionDao.java index 152fbbe2..e9ee4948 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductDescriptionDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductDescriptionDao.java @@ -8,7 +8,7 @@ import com.zbkj.common.model.product.StoreProductDescription; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductLogDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductLogDao.java index f81d8229..248d5e35 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductLogDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductLogDao.java @@ -8,7 +8,7 @@ import com.zbkj.common.model.log.StoreProductLog; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductRelationDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductRelationDao.java index 7c98a361..83aee844 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductRelationDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductRelationDao.java @@ -11,7 +11,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductReplyDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductReplyDao.java index 65d31beb..66cfdc0f 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductReplyDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductReplyDao.java @@ -8,7 +8,7 @@ import com.zbkj.common.model.product.StoreProductReply; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductRuleDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductRuleDao.java index 54fb571a..731a98ee 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductRuleDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreProductRuleDao.java @@ -8,7 +8,7 @@ import com.zbkj.common.model.product.StoreProductRule; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreSeckillDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreSeckillDao.java index b3fb84ab..bc509c0b 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreSeckillDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreSeckillDao.java @@ -8,7 +8,7 @@ import com.zbkj.common.model.seckill.StoreSeckill; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreSeckillMangerDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreSeckillMangerDao.java index 35f3cea5..1a334c78 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreSeckillMangerDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/StoreSeckillMangerDao.java @@ -8,7 +8,7 @@ import com.zbkj.common.model.seckill.StoreSeckillManger; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemAdminDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemAdminDao.java index db0d770e..992d5874 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemAdminDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemAdminDao.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemAttachmentDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemAttachmentDao.java index 2cbf99b3..ab2c97cc 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemAttachmentDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemAttachmentDao.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemCityDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemCityDao.java index 7f24c5e3..c17dbac6 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemCityDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemCityDao.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemConfigDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemConfigDao.java index abe92dc9..947482a1 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemConfigDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemConfigDao.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemFormTempDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemFormTempDao.java index 8f7f98c8..b29717dc 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemFormTempDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemFormTempDao.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemGroupDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemGroupDao.java index 6715bcc3..5d78782f 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemGroupDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemGroupDao.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemGroupDataDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemGroupDataDao.java index 04db403c..1f8155ff 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemGroupDataDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemGroupDataDao.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemNotificationDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemNotificationDao.java index e773a651..2e04e766 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemNotificationDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemNotificationDao.java @@ -8,7 +8,7 @@ import com.zbkj.common.model.system.SystemNotification; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemRoleDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemRoleDao.java index 01fc807a..9d150c6c 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemRoleDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemRoleDao.java @@ -8,7 +8,7 @@ import com.zbkj.common.model.system.SystemRole; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemRoleMenuDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemRoleMenuDao.java index 580a2af7..9545943a 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemRoleMenuDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemRoleMenuDao.java @@ -8,7 +8,7 @@ import com.zbkj.common.model.system.SystemRoleMenu; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemStoreDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemStoreDao.java index a3a78e30..38d9c646 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemStoreDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemStoreDao.java @@ -12,7 +12,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemStoreStaffDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemStoreStaffDao.java index cb78eaba..06690ff8 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemStoreStaffDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemStoreStaffDao.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemUserLevelDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemUserLevelDao.java index b6aebf76..db5316fd 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemUserLevelDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/SystemUserLevelDao.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/TemplateMessageDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/TemplateMessageDao.java index 13ed7351..62f608a1 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/TemplateMessageDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/TemplateMessageDao.java @@ -9,7 +9,7 @@ import com.zbkj.common.model.wechat.TemplateMessage; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserAddressDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserAddressDao.java index 2375ec93..32775704 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserAddressDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserAddressDao.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserBillDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserBillDao.java index 42817e91..97b87875 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserBillDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserBillDao.java @@ -12,7 +12,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserBrokerageRecordDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserBrokerageRecordDao.java index 27d88e10..fbd55bdd 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserBrokerageRecordDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserBrokerageRecordDao.java @@ -8,7 +8,7 @@ import com.zbkj.common.model.user.UserBrokerageRecord; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserDao.java index 2490ea59..7c802da5 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserDao.java @@ -12,7 +12,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserExperienceRecordDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserExperienceRecordDao.java index 35fe0710..20edffe3 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserExperienceRecordDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserExperienceRecordDao.java @@ -8,7 +8,7 @@ import com.zbkj.common.model.user.UserExperienceRecord; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserExtractDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserExtractDao.java index 989a31fb..167ab4c0 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserExtractDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserExtractDao.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserFundsMonitorDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserFundsMonitorDao.java index 68de2b56..a07b7923 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserFundsMonitorDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserFundsMonitorDao.java @@ -8,7 +8,7 @@ import com.zbkj.common.vo.UserFundsMonitor; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserGroupDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserGroupDao.java index 0e9d0923..4fb0f9e8 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserGroupDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserGroupDao.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserIntegralRecordDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserIntegralRecordDao.java index 3c130368..dc10d92d 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserIntegralRecordDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserIntegralRecordDao.java @@ -8,7 +8,7 @@ import com.zbkj.common.model.user.UserIntegralRecord; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserLevelDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserLevelDao.java index 7aef4529..4fdda08d 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserLevelDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserLevelDao.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserRechargeDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserRechargeDao.java index 93db88b1..087dab37 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserRechargeDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserRechargeDao.java @@ -10,7 +10,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserSignDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserSignDao.java index d66def30..a1987df5 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserSignDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserSignDao.java @@ -8,7 +8,7 @@ import com.zbkj.common.model.user.UserSign; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserTagDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserTagDao.java index 384199e6..441b6594 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserTagDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserTagDao.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserTokenDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserTokenDao.java index 3eb502ca..a70caf8e 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserTokenDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserTokenDao.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserVisitRecordDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserVisitRecordDao.java index c1dbea14..5aad20ad 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserVisitRecordDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/UserVisitRecordDao.java @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Param; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/WechatExceptionsDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/WechatExceptionsDao.java index 1d3a5eec..8c1a11d7 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/WechatExceptionsDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/WechatExceptionsDao.java @@ -8,7 +8,7 @@ import com.zbkj.common.model.wechat.WechatExceptions; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/WechatPayInfoDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/WechatPayInfoDao.java index 7912d5c5..dfc03eb8 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/WechatPayInfoDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/WechatPayInfoDao.java @@ -8,7 +8,7 @@ import com.zbkj.common.model.wechat.WechatPayInfo; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/WechatQrcodeDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/WechatQrcodeDao.java index 7f76e4b1..7dff0874 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/WechatQrcodeDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/WechatQrcodeDao.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/WechatReplyDao.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/WechatReplyDao.java index 532a1259..7a9803ac 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/WechatReplyDao.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/dao/WechatReplyDao.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/delete/OrderUtils.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/delete/OrderUtils.java index b605ca15..25c38892 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/delete/OrderUtils.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/delete/OrderUtils.java @@ -21,7 +21,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相关版权 * +---------------------------------------------------------------------- @@ -68,13 +68,13 @@ public class OrderUtils { payType = payType.toLowerCase(); switch (payType){ case PayConstants.PAY_TYPE_WE_CHAT: - result = "1".equals(systemConfigService.getValueByKey(SysConfigConstants.CONFIG_PAY_WEIXIN_OPEN)); + result = systemConfigService.getValueByKey(SysConfigConstants.CONFIG_PAY_WEIXIN_OPEN).equals("1"); break; case PayConstants.PAY_TYPE_YUE: - result = ("1".equals(systemConfigService.getValueByKey(SysConfigConstants.CONFIG_YUE_PAY_STATUS))); + result = (systemConfigService.getValueByKey(SysConfigConstants.CONFIG_YUE_PAY_STATUS).equals("1")); break; case PayConstants.PAY_TYPE_ALI_PAY: - result = ("1".equals(systemConfigService.getValueByKey(SysConfigConstants.CONFIG_ALI_PAY_STATUS))); + result = (systemConfigService.getValueByKey(SysConfigConstants.CONFIG_ALI_PAY_STATUS).equals("1")); break; } return result; diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/delete/ProductUtils.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/delete/ProductUtils.java index c1c7dbf1..685520a3 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/delete/ProductUtils.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/delete/ProductUtils.java @@ -4,17 +4,17 @@ import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson.JSON; import com.zbkj.common.constants.Constants; import com.zbkj.common.exception.CrmebException; -import com.zbkj.common.response.ProductActivityItemResponse; -import com.zbkj.common.utils.CrmebUtil; -import com.zbkj.common.utils.DateUtil; -import com.zbkj.common.utils.UrlUtil; import com.zbkj.common.model.bargain.StoreBargain; import com.zbkj.common.model.combination.StoreCombination; -import com.zbkj.common.model.seckill.StoreSeckill; -import com.zbkj.common.model.seckill.StoreSeckillManger; import com.zbkj.common.model.product.StoreProduct; import com.zbkj.common.model.product.StoreProductAttr; +import com.zbkj.common.model.seckill.StoreSeckill; +import com.zbkj.common.model.seckill.StoreSeckillManger; import com.zbkj.common.request.StoreProductRequest; +import com.zbkj.common.response.ProductActivityItemResponse; +import com.zbkj.common.utils.CrmebUtil; +import com.zbkj.common.utils.CrmebDateUtil; +import com.zbkj.common.utils.UrlUtil; import com.zbkj.service.service.*; import org.apache.commons.lang3.StringUtils; import org.json.JSONArray; @@ -39,7 +39,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相关版权 * +---------------------------------------------------------------------- @@ -72,6 +72,7 @@ public class ProductUtils { /** * 解析淘宝产品数据 + * * @param url * @param tag * @throws IOException @@ -89,7 +90,7 @@ public class ProductUtils { StoreProductRequest productRequest = new StoreProductRequest(); StoreProduct product = new StoreProduct(); product.setStoreName(item.getString("title")); - product.setStoreInfo(item.getString("title")); +// product.setStoreInfo(item.getString("title")); product.setSliderImage(item.getString("images")); product.setImage(item.getString("images").split(",")[0] .replace("[", "").replace("\"", "")); @@ -124,13 +125,14 @@ public class ProductUtils { /** * 解析京东产品数据 + * * @param url * @param tag * @return * @throws JSONException */ public StoreProductRequest getJDProductInfo(String url, int tag) throws JSONException, IOException { - setConfig(url,tag); + setConfig(url, tag); JSONObject tbJsonData = getRequestFromUrl(baseUrl + rightUrl); // JSONObject tbJsonData = new JSONObject(JSONExample.jdJson); // just Test JSONObject data = tbJsonData.getJSONObject("data"); @@ -141,7 +143,7 @@ public class ProductUtils { StoreProductRequest productRequest = new StoreProductRequest(); StoreProduct product = new StoreProduct(); product.setStoreName(item.getString("name")); - product.setStoreInfo(item.getString("name")); +// product.setStoreInfo(item.getString("name")); product.setSliderImage(item.getString("images")); product.setImage(item.getString("images").split(",")[0] .replace("[", "").replace("\"", "")); @@ -159,8 +161,8 @@ public class ProductUtils { StoreProductAttr spattr = new StoreProductAttr(); String stepkey = saleProps.next(); String stepValue = props.getString(stepkey); - String stepValueValidLength = stepValue.replace("[","").replace("]","").replace("\"",""); - if(stepValueValidLength.length() > 0){ + String stepValueValidLength = stepValue.replace("[", "").replace("]", "").replace("\"", ""); + if (stepValueValidLength.length() > 0) { com.alibaba.fastjson.JSONArray stepValues = JSON.parseArray(stepValue); int c = stepValues.get(0).toString().length(); attrValueIsNullCount += c == 0 ? 1 : 0; @@ -168,7 +170,7 @@ public class ProductUtils { spattr.setAttrValues(props.getString(stepkey)); spaAttes.add(spattr); productRequest.setAttr(spaAttes); - }else{ + } else { attrValueIsNullCount += 1; } } @@ -179,6 +181,7 @@ public class ProductUtils { /** * 解析天猫产品数据 + * * @param url * @param tag * @return @@ -196,7 +199,7 @@ public class ProductUtils { StoreProductRequest productRequest = new StoreProductRequest(); StoreProduct product = new StoreProduct(); product.setStoreName(item.getString("title")); - product.setStoreInfo(item.getString("subTitle")); +// product.setStoreInfo(item.getString("subTitle")); product.setSliderImage(item.getString("images")); product.setImage(item.getString("images").split(",")[0] .replace("[", "").replace("\"", "")); @@ -232,6 +235,7 @@ public class ProductUtils { /** * 解析拼多多产品数据 + * * @param url * @param tag * @return @@ -249,7 +253,7 @@ public class ProductUtils { StoreProductRequest productRequest = new StoreProductRequest(); StoreProduct product = new StoreProduct(); product.setStoreName(item.getString("goodsName")); - product.setStoreInfo(item.getString("goodsDesc")); +// product.setStoreInfo(item.getString("goodsDesc")); product.setSliderImage(item.getString("thumbUrl")); product.setImage(item.getString("banner")); product.setVideoLink(item.getJSONArray("video").getJSONObject(0).getString("videoUrl")); @@ -261,7 +265,7 @@ public class ProductUtils { if (null == props) throw new CrmebException("复制商品失败--返回数据格式错误--未找到props"); if (props.length() > 0) { List spaAttes = new ArrayList<>(); - HashMap> tempAttr = new HashMap<>(); + HashMap> tempAttr = new HashMap<>(); for (int i = 0; i < props.length(); i++) { JSONObject pItem = props.getJSONObject(i); JSONArray specArray = pItem.getJSONArray("specs"); @@ -269,11 +273,11 @@ public class ProductUtils { JSONObject specItem = specArray.getJSONObject(j); String keyTemp = specItem.getString("spec_key"); String valueTemp = specItem.getString("spec_value"); - if(tempAttr.containsKey(keyTemp)){ - if(!tempAttr.get(keyTemp).contains(valueTemp)){ + if (tempAttr.containsKey(keyTemp)) { + if (!tempAttr.get(keyTemp).contains(valueTemp)) { tempAttr.get(keyTemp).add(valueTemp); } - }else{ + } else { List tempList = new ArrayList<>(); tempList.add(valueTemp); tempAttr.put(keyTemp, tempList); @@ -282,8 +286,8 @@ public class ProductUtils { } Iterator iterator = tempAttr.keySet().iterator(); - while (iterator.hasNext()){ - String key = (String)iterator.next(); + while (iterator.hasNext()) { + String key = (String) iterator.next(); StoreProductAttr spattr = new StoreProductAttr(); spattr.setAttrName(key); spattr.setAttrValues(tempAttr.get(key).toString()); @@ -297,15 +301,16 @@ public class ProductUtils { /** * *** 苏宁返回的数据不一致，暂放 * 解析苏宁产品数据 + * * @param url * @param tag * @return * @throws JSONException */ public StoreProductRequest getSuningProductInfo(String url, int tag) throws JSONException, IOException { - setConfig(url,tag); + setConfig(url, tag); JSONObject tbJsonData = getRequestFromUrl(baseUrl + rightUrl); - System.out.println("tbJsonData:"+tbJsonData); + System.out.println("tbJsonData:" + tbJsonData); // JSONObject tbJsonData = new JSONObject(JSONExample.snJson); // just Test JSONObject data = tbJsonData.getJSONObject("data"); if (null == data) throw new CrmebException("复制商品失败--返回数据格式错误--未找到data"); @@ -313,7 +318,7 @@ public class ProductUtils { StoreProductRequest productRequest = new StoreProductRequest(); StoreProduct product = new StoreProduct(); product.setStoreName(data.getString("title")); - product.setStoreInfo(data.getString("title")); +// product.setStoreInfo(data.getString("title")); product.setSliderImage(data.getString("images")); product.setImage(data.getString("images").split(",")[0] .replace("[", "").replace("\"", "")); @@ -335,26 +340,27 @@ public class ProductUtils { /** * 设置配置数据 + * * @param tag */ - public void setConfig(String url, int tag){ + public void setConfig(String url, int tag) { String rightEndUrl = "&itemid="; - switch (tag){ // 导入平台1=淘宝，2=京东，3=苏宁，4=拼多多， 5=天猫 + switch (tag) { // 导入平台1=淘宝，2=京东，3=苏宁，4=拼多多， 5=天猫 case 1: baseUrl = systemConfigService.getValueByKey("importProductTB"); rightEndUrl += UrlUtil.getParamsByKey(url, "id"); break; case 2: baseUrl = systemConfigService.getValueByKey("importProductJD"); - rightEndUrl += url.substring(url.lastIndexOf("/")+1).replace(".html",""); + rightEndUrl += url.substring(url.lastIndexOf("/") + 1).replace(".html", ""); break; case 3: baseUrl = systemConfigService.getValueByKey("importProductSN"); int start = url.indexOf(".com/") + 5; int end = url.indexOf(".html"); - String sp = url.substring(start,end); + String sp = url.substring(start, end); String[] shopProduct = sp.split("/"); - rightEndUrl += shopProduct[1]+"&shopid="+shopProduct[0]; + rightEndUrl += shopProduct[1] + "&shopid=" + shopProduct[0]; break; case 4: rightEndUrl += UrlUtil.getParamsByKey(url, "goods_id"); @@ -367,19 +373,20 @@ public class ProductUtils { } // String token = systemConfigService.getValueByKey("importProductToken"); String token = systemConfigService.getValueByKey("copy_product_apikey"); - if(StringUtils.isBlank(token)){ + if (StringUtils.isBlank(token)) { throw new CrmebException("请配置复制产品平台的Token -- www.99api.com"); } - if(StringUtils.isBlank(baseUrl)){ + if (StringUtils.isBlank(baseUrl)) { throw new CrmebException("请配置复制产品平台的Url-- www.99api.com"); } // rightUrl = "?apikey="+systemConfigService.getValueByKey("importProductToken")+rightEndUrl; - rightUrl = "?apikey="+systemConfigService.getValueByKey("copy_product_apikey")+rightEndUrl; + rightUrl = "?apikey=" + systemConfigService.getValueByKey("copy_product_apikey") + rightEndUrl; } /** * 99api产品复制工具方法 + * * @param rd * @return * @throws IOException @@ -395,6 +402,7 @@ public class ProductUtils { /** * 根据url访问99api后返回对应的平台的产品json数据 + * * @param url * @return * @throws IOException @@ -416,52 +424,53 @@ public class ProductUtils { /** * 根据商品参加的活动次序查找对应活动明细 + * * @param productId 商品id - * @param activity 活动次序 + * @param activity 活动次序 * @return 活动结果 */ - public HashMap getActivityByProduct(Integer productId, String activity){ - HashMap result = null; + public HashMap getActivityByProduct(Integer productId, String activity) { + HashMap result = null; // 根据参与活动配置次序查找对应活动信息 - if(StringUtils.isBlank(activity)){ + if (StringUtils.isBlank(activity)) { return result; } result = new HashMap<>(); List activitys = CrmebUtil.stringToArrayInt(activity); for (Integer code : activitys) { - if(code == 1){ // 查找秒杀信息 + if (code == 1) { // 查找秒杀信息 List currentSecKills = storeSeckillService.getCurrentSecKillByProductId(productId); - if(null != currentSecKills && currentSecKills.size() > 0){ + if (null != currentSecKills && currentSecKills.size() > 0) { // 查询当前秒杀活动时间段配置信息 StoreSeckillManger secKillManager = storeSeckillMangerService.getById(currentSecKills.get(0).getTimeId()); // 将当前时间段转化成时间戳 int secKillEndSecondTimestamp = - DateUtil.getSecondTimestamp(DateUtil.nowDateTime("yyyy-MM-dd " + secKillManager.getEndTime() + ":00:00")); + CrmebDateUtil.getSecondTimestamp(CrmebDateUtil.nowDateTime("yyyy-MM-dd " + secKillManager.getEndTime() + ":00:00")); ProductActivityItemResponse secKillResponse = new ProductActivityItemResponse(); secKillResponse.setId(currentSecKills.get(0).getId()); secKillResponse.setTime(secKillEndSecondTimestamp); - secKillResponse.setType(Constants.PRODUCT_TYPE_SECKILL+""); - result.put(code,secKillResponse); + secKillResponse.setType(Constants.PRODUCT_TYPE_SECKILL + ""); + result.put(code, secKillResponse); } } - if(code == 2){ // 查找砍价信息 + if (code == 2) { // 查找砍价信息 List currentBargains = storeBargainService.getCurrentBargainByProductId(productId); if (CollUtil.isNotEmpty(currentBargains)) { ProductActivityItemResponse bargainResponse = new ProductActivityItemResponse(); bargainResponse.setId(currentBargains.get(0).getId()); - bargainResponse.setTime(DateUtil.getSecondTimestamp(currentBargains.get(0).getStopTime())); - bargainResponse.setType(Constants.PRODUCT_TYPE_BARGAIN +""); + bargainResponse.setTime(CrmebDateUtil.getSecondTimestamp(currentBargains.get(0).getStopTime())); + bargainResponse.setType(Constants.PRODUCT_TYPE_BARGAIN + ""); result.put(code, bargainResponse); } } - if(code == 3){ // 查找拼团信息 + if (code == 3) { // 查找拼团信息 List currentCombinations = storeCombinationService.getCurrentBargainByProductId(productId); if (CollUtil.isNotEmpty(currentCombinations)) { ProductActivityItemResponse bargainResponse = new ProductActivityItemResponse(); bargainResponse.setId(currentCombinations.get(0).getId()); - bargainResponse.setTime(DateUtil.getSecondTimestamp(currentCombinations.get(0).getStopTime())); - bargainResponse.setType(Constants.PRODUCT_TYPE_PINGTUAN +""); + bargainResponse.setTime(CrmebDateUtil.getSecondTimestamp(currentCombinations.get(0).getStopTime())); + bargainResponse.setType(Constants.PRODUCT_TYPE_PINGTUAN + ""); result.put(code, bargainResponse); } } @@ -471,17 +480,18 @@ public class ProductUtils { /** * 获取商品参与的全部活动 - * @param storeProduct 当前商品 - * @return 商品所参与的活动 + * + * @param storeProduct 当前商品 + * @return 商品所参与的活动 */ public List getProductAllActivity(StoreProduct storeProduct) { HashMap currentActivityList = getActivityByProduct(storeProduct.getId(), storeProduct.getActivity()); - if(StringUtils.isBlank(storeProduct.getActivity())) return new ArrayList<>(); + if (StringUtils.isBlank(storeProduct.getActivity())) return new ArrayList<>(); List activityH5 = new ArrayList<>(); List activityList = CrmebUtil.stringToArrayInt(storeProduct.getActivity()); for (Integer code : activityList) { - if(null != currentActivityList.get(code)){ + if (null != currentActivityList.get(code)) { activityH5.add(currentActivityList.get(code)); } } @@ -490,13 +500,14 @@ public class ProductUtils { /** * 获取当前商品参与的第一个活动 - * @param storeProduct 当前商品信息 + * + * @param storeProduct 当前商品信息 * @return 当前参与的商品活动 */ public ProductActivityItemResponse getProductCurrentActivity(StoreProduct storeProduct) { HashMap currentActivityList = getActivityByProduct(storeProduct.getId(), storeProduct.getActivity()); - if(StringUtils.isBlank(storeProduct.getActivity())) return null; + if (StringUtils.isBlank(storeProduct.getActivity())) return null; List activityList = CrmebUtil.stringToArrayInt(storeProduct.getActivity()); return currentActivityList.get(activityList.get(0)); @@ -504,8 +515,8 @@ public class ProductUtils { /** * 一号通复制商品转公共商品参数 - * @param jsonObject 一号通复制商品 * + * @param jsonObject 一号通复制商品 */ public static StoreProductRequest onePassCopyTransition(com.alibaba.fastjson.JSONObject jsonObject) { if (null == jsonObject) return null; @@ -514,7 +525,7 @@ public class ProductUtils { StoreProduct product = new StoreProduct(); product.setStoreName(jsonObject.getString("store_name")); - product.setStoreInfo(jsonObject.getString("store_info")); +// product.setStoreInfo(jsonObject.getString("store_info")); product.setSliderImage(jsonObject.getString("slider_image")); product.setImage(jsonObject.getString("image").replace("[", "").replace("\"", "")); product.setKeyword(jsonObject.getString("store_name")); diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/ArticleService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/ArticleService.java index 49bd2c09..04c8224d 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/ArticleService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/ArticleService.java @@ -17,7 +17,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/CallbackService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/CallbackService.java index 272efde7..15f2f281 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/CallbackService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/CallbackService.java @@ -1,11 +1,13 @@ package com.zbkj.service.service; +import javax.servlet.http.HttpServletRequest; + /** * 订单支付回调 service * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/CategoryService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/CategoryService.java index ba29ead4..d840b14d 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/CategoryService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/CategoryService.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- @@ -23,8 +23,8 @@ import java.util.List; * +---------------------------------------------------------------------- */ public interface CategoryService extends IService { - - List getList(CategorySearchRequest request, PageParamRequest pageParamRequest); + + List getList(CategorySearchRequest request); int delete(Integer id); @@ -48,6 +48,13 @@ public interface CategoryService extends IService { List getByIds(List ids); + /** + * 获取父级id集合 + * @param idList + * @return + */ + List getByPIds(List idList); + HashMap getListInId(List cateIdList); Boolean checkAuth(List pathIdList, String uri); @@ -55,6 +62,10 @@ public interface CategoryService extends IService { boolean update(CategoryRequest request, Integer id); List getChildVoListByPid(Integer pid); + /** + * 获取分类下子类时判断当前分类有效 + */ + List getChildVoStatusOnListByPid(Integer pid); boolean checkUrl(String uri); diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/CosService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/CosService.java index 39884e54..d3cd866a 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/CosService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/CosService.java @@ -9,7 +9,7 @@ import java.io.File; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/ExcelService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/ExcelService.java index 8bc7a50a..28190ede 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/ExcelService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/ExcelService.java @@ -10,7 +10,7 @@ import com.zbkj.common.request.StoreProductSearchRequest; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/ExpressService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/ExpressService.java index 6b816684..3151f46c 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/ExpressService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/ExpressService.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- @@ -59,6 +59,12 @@ public interface ExpressService extends IService { */ JSONObject template(String com); + /** + * 获取电子面单模版 + * @return + */ + JSONObject templateFor(String com, String type, String is_shipment, String page, String limit); + /** * 查询快递公司 * @param code 快递公司编号 diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/HomeService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/HomeService.java index 28d04e9d..1c95fbfa 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/HomeService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/HomeService.java @@ -1,5 +1,6 @@ package com.zbkj.service.service; +import com.zbkj.common.response.HomeOperatingDataResponse; import com.zbkj.common.response.HomeRateResponse; import java.util.Map; @@ -9,7 +10,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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,4 +54,10 @@ public interface HomeService{ * @return HomeRateResponse */ HomeRateResponse indexDate(); + + /** + * 经营数据 + * @return HomeOperatingDataResponse + */ + HomeOperatingDataResponse operatingData(); } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/LogisticService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/LogisticService.java index 5ee928cb..04500505 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/LogisticService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/LogisticService.java @@ -8,7 +8,7 @@ import com.zbkj.common.vo.LogisticsResultVo; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/OnePassService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/OnePassService.java index aeafec48..d17d3690 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/OnePassService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/OnePassService.java @@ -2,6 +2,9 @@ package com.zbkj.service.service; import com.alibaba.fastjson.JSONObject; import com.zbkj.common.request.*; +import com.zbkj.common.request.onepass.OnePassLoginRequest; +import com.zbkj.common.request.onepass.OnePassShipmentCancelOrderRequest; +import com.zbkj.common.request.onepass.OnePassShipmentCreateOrderRequest; import com.zbkj.common.vo.MyRecord; import com.zbkj.common.vo.OnePassLogisticsQueryVo; @@ -10,7 +13,7 @@ import com.zbkj.common.vo.OnePassLogisticsQueryVo; * +---------------------------------------------------------------------- * | 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,75 +22,64 @@ import com.zbkj.common.vo.OnePassLogisticsQueryVo; */ public interface OnePassService { - /** - * 获取用户验证码 - * @param phone 手机号 - */ - Object sendUserCode(String phone, Integer types); - - /** - * 注册用户 - * @param registerRequest 注册参数 - */ - String register(OnePassRegisterRequest registerRequest); /** * 用户登录 * @param request 登录参数 */ - MyRecord login(OnePassLoginRequest request); + Boolean login(OnePassLoginRequest request); /** - * 判断是否登录 + * 保存一号通应用信息 + * @param request 一号通服务中申请的应用信息 + * @return 保存结果 */ - MyRecord isLogin(); + Boolean saveOnePassApplicationInfo(OnePassLoginRequest request); + + /** + * 获取一号通应用信息 + * @return 一号通应用信息 + */ + OnePassLoginRequest getOnePassApplicationInfo(); + + /** + * 商家寄件 + * @param request 寄件请求对象 + * @return 寄件返回数据 + */ + JSONObject shipmentCreateOrder(OnePassShipmentCreateOrderRequest request); + + + /** + * 取消商家寄件 + * @param request 取消商家寄件请求对象 + * @return 取消寄件返回对象 + */ + JSONObject shipmentCancelOrder(OnePassShipmentCancelOrderRequest request); + + /** + * 获取商家寄件所需的快递公司列表 + * @return 商家寄件功能对应的快递公司列表 + */ + JSONObject shipmentComs(); + + /** + * 商家寄件功能对应的回调 + * @return 回调数据 + */ + Boolean shipmentCallBackMethod(String type, String data); + /** * 一号通用户信息 */ JSONObject info(); - - /** - * 用户注销 - */ - Boolean logOut(); - - /** - * 修改密码 - * @param request 修改密码参数 - */ - Boolean updatePassword(OnePassUpdateRequest request); - - /** - * 修改手机号 - * @param request 修改手机参数 - */ - Boolean updatePhone(OnePassUpdateRequest request); - - /** - * 套餐列表 - * @param type 套餐类型：sms,短信；expr_query,物流查询；expr_dump,电子面单；copy,产品复制 - */ - JSONObject mealList(String type); - - /** - * 套餐购买 - * @param request 购买参数 - */ - JSONObject mealCode(MealCodeRequest request); - /** * 服务开通 * @param request 服务开通参数 */ Boolean serviceOpen(ServiceOpenRequest request); - /** - * 用量记录 - * @param request 用量记录查询参数 - */ - JSONObject userRecord(OnePassUserRecordRequest request); - /** * 复制平台商品 * @param url 商品链接 @@ -107,12 +99,6 @@ public interface OnePassService { */ OnePassLogisticsQueryVo exprQuery(String expressNo, String com); - /** - * 修改手机号——验证账号密码 - * @return Boolean - */ - Boolean beforeUpdatePhoneValidator(OnePassLoginRequest request); - /** * 校验一号通账号是否配置 */ diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/OrderPayService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/OrderPayService.java index cdba5725..6e348eef 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/OrderPayService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/OrderPayService.java @@ -3,13 +3,14 @@ package com.zbkj.service.service; import com.zbkj.common.model.order.StoreOrder; import com.zbkj.common.request.OrderPayRequest; import com.zbkj.common.response.OrderPayResultResponse; +import com.zbkj.common.response.PayConfigResponse; /** * 订单支付 * +---------------------------------------------------------------------- * | 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 +19,12 @@ import com.zbkj.common.response.OrderPayResultResponse; */ public interface OrderPayService{ + + /** + * 获取支付配置 + */ + PayConfigResponse getPayConfig(); + /** * 支付成功处理 * @param storeOrder 订单 diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/OrderService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/OrderService.java index 15e0f332..665125b8 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/OrderService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/OrderService.java @@ -1,5 +1,6 @@ package com.zbkj.service.service; +import com.github.pagehelper.PageInfo; import com.zbkj.common.page.CommonPage; import com.zbkj.common.request.*; import com.zbkj.common.response.*; @@ -12,7 +13,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相关版权 * +---------------------------------------------------------------------- @@ -27,7 +28,7 @@ public interface OrderService { * @param pageRequest 分页 * @return 订单集合 */ - CommonPage list(Integer type, PageParamRequest pageRequest); + PageInfo list(String keywords,Integer type, PageParamRequest pageRequest); /** * 订单详情 diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/OrderTaskService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/OrderTaskService.java index e1313fe7..8c8dfad8 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/OrderTaskService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/OrderTaskService.java @@ -6,7 +6,7 @@ package com.zbkj.service.service; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -37,4 +37,9 @@ package com.zbkj.service.service; * 订单自动完成 */ void autoComplete(); + + /** + * 订单自动收货 + */ + void autoTakeDelivery(); } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/OssService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/OssService.java index 46135a60..6221d277 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/OssService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/OssService.java @@ -10,7 +10,7 @@ import java.io.File; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/QiNiuService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/QiNiuService.java index 9a8476e4..21a1ae8d 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/QiNiuService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/QiNiuService.java @@ -10,7 +10,7 @@ import java.io.File; * +---------------------------------------------------------------------- * | 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,5 +20,5 @@ import java.io.File; public interface QiNiuService { void upload(UploadManager uploadManager, CloudVo cloudVo, String upToken, String webPth, String localFile, Integer id); - void uploadFile(UploadManager uploadManager, CloudVo cloudVo, String upToken, String webPth, String localFile, File file); + void uploadFile(UploadManager uploadManager, String upToken, String webPth, String localFile, File file); } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/RechargePayService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/RechargePayService.java index d65eba75..c290c706 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/RechargePayService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/RechargePayService.java @@ -7,7 +7,7 @@ import com.zbkj.common.model.finance.UserRecharge; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/RetailShopService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/RetailShopService.java index 36646056..46fe85c0 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/RetailShopService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/RetailShopService.java @@ -12,7 +12,7 @@ import com.zbkj.common.model.user.User; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/ShippingTemplatesFreeService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/ShippingTemplatesFreeService.java index aea5c86f..59b9517f 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/ShippingTemplatesFreeService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/ShippingTemplatesFreeService.java @@ -3,35 +3,38 @@ package com.zbkj.service.service; import com.baomidou.mybatisplus.extension.service.IService; import com.zbkj.common.model.express.ShippingTemplatesFree; import com.zbkj.common.request.ShippingTemplatesFreeRequest; +import com.zbkj.common.response.ShippingTemplatesFreeResponse; import java.util.List; /** -* ShippingTemplatesFreeService 接口 -* +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- -*/ + * ShippingTemplatesFreeService 接口 + * +---------------------------------------------------------------------- + * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] + * +---------------------------------------------------------------------- + * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved. + * +---------------------------------------------------------------------- + * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 + * +---------------------------------------------------------------------- + * | Author: CRMEB Team + * +---------------------------------------------------------------------- + */ public interface ShippingTemplatesFreeService extends IService { - void saveAll(List shippingTemplatesFreeRequestList, Integer type, Integer id); + Boolean saveAll(List shippingTemplatesFreeRequestList, Integer type, Integer id); - List getListGroup(Integer tempId); + List getListGroup(Integer tempId); /** * 删除 + * * @param tempId 运费模板id */ - Boolean delete(Integer tempId); + Boolean deleteByTempId(Integer tempId); /** * 根据模板编号、城市ID查询 + * * @param tempId 模板编号 * @param cityId 城市ID * @return 运费模板 diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/ShippingTemplatesRegionService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/ShippingTemplatesRegionService.java index 0cd2f88e..c18401c6 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/ShippingTemplatesRegionService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/ShippingTemplatesRegionService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.zbkj.common.model.express.ShippingTemplatesRegion; import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.ShippingTemplatesRegionRequest; +import com.zbkj.common.response.ShippingTemplatesRegionResponse; import java.util.List; @@ -12,7 +13,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相关版权 * +---------------------------------------------------------------------- @@ -21,9 +22,11 @@ import java.util.List; */ public interface ShippingTemplatesRegionService extends IService { - void saveAll(List shippingTemplatesRegionRequestList, Integer type, Integer id); + Boolean saveAll(List shippingTemplatesRegionRequestList, Integer type, Integer id); - List getListGroup(Integer tempId); + List getListGroup(Integer tempId); + + Boolean deleteByTempId(Integer tempId); /** * 删除 @@ -39,4 +42,11 @@ public interface ShippingTemplatesRegionService extends IService findListById(Integer tempId); } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/ShippingTemplatesService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/ShippingTemplatesService.java index 0ef1a843..e690607e 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/ShippingTemplatesService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/ShippingTemplatesService.java @@ -5,6 +5,7 @@ import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.model.express.ShippingTemplates; import com.zbkj.common.request.ShippingTemplatesRequest; import com.zbkj.common.request.ShippingTemplatesSearchRequest; +import com.zbkj.common.response.ShippingTemplatesInfoResponse; import java.util.List; @@ -13,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相关版权 * +---------------------------------------------------------------------- @@ -45,5 +46,5 @@ public interface ShippingTemplatesService extends IService { * @param id 模板id * @return ShippingTemplates */ - ShippingTemplates getInfo(Integer id); + ShippingTemplatesInfoResponse getInfo(Integer id); } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SmsRecordService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SmsRecordService.java index ddb9599c..301131bf 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SmsRecordService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SmsRecordService.java @@ -8,7 +8,7 @@ import com.zbkj.common.model.sms.SmsRecord; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SmsService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SmsService.java index 855efc19..ca5b2365 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SmsService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SmsService.java @@ -12,7 +12,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SmsTemplateService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SmsTemplateService.java index 42184d2b..51d59198 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SmsTemplateService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SmsTemplateService.java @@ -8,7 +8,7 @@ import com.zbkj.common.model.sms.SmsTemplate; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreBargainService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreBargainService.java index 293514fb..41703af6 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreBargainService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreBargainService.java @@ -18,7 +18,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreBargainUserHelpService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreBargainUserHelpService.java index 8014d6d4..a294d0b3 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreBargainUserHelpService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreBargainUserHelpService.java @@ -13,7 +13,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreBargainUserService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreBargainUserService.java index 92081026..d458ced0 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreBargainUserService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreBargainUserService.java @@ -17,7 +17,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreCartService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreCartService.java index 3fac0c67..3ec840d3 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreCartService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreCartService.java @@ -17,7 +17,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -103,4 +103,5 @@ public interface StoreCartService extends IService { * @param number 数量 */ Boolean updateCartNum(Integer id, Integer number); + } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreCombinationService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreCombinationService.java index 7c1db06c..559a3215 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreCombinationService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreCombinationService.java @@ -17,7 +17,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreCouponService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreCouponService.java index 90303db8..26b08af3 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreCouponService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreCouponService.java @@ -1,6 +1,7 @@ package com.zbkj.service.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.github.pagehelper.PageInfo; import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.SearchAndPageRequest; import com.zbkj.common.model.coupon.StoreCoupon; @@ -16,7 +17,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相关版权 * +---------------------------------------------------------------------- @@ -70,12 +71,13 @@ public interface StoreCouponService extends IService { /** * 移动端优惠券列表 - * @param type 类型，1-通用，2-商品，3-品类 - * @param productId 产品id，搜索产品指定优惠券 + * + * @param type 类型，1-通用，2-商品，3-品类 + * @param productId 产品id，搜索产品指定优惠券 * @param pageParamRequest 分页参数 - * @return List + * @return PageInfo */ - List getH5List(Integer type, Integer productId, PageParamRequest pageParamRequest); + PageInfo getH5List(Integer type, Integer productId, PageParamRequest pageParamRequest); /** * 修改优惠券状态 diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreCouponUserService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreCouponUserService.java index 5e221b7c..4cdfb49a 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreCouponUserService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreCouponUserService.java @@ -20,7 +20,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相关版权 * +---------------------------------------------------------------------- @@ -47,7 +47,7 @@ public interface StoreCouponUserService extends IService { HashMap getMapByUserId(Integer userId); /** - * 根据购物车id获取可用优惠券 + * 当前订单可用优惠券 * @param preOrderNo 预下单订单号 * @return 可用优惠券集合 */ diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreOrderInfoService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreOrderInfoService.java index abc46ae9..5a050cd8 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreOrderInfoService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreOrderInfoService.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相关版权 * +---------------------------------------------------------------------- @@ -71,4 +71,14 @@ public interface StoreOrderInfoService extends IService { * @return BigDecimal */ BigDecimal getSalesByDateAndProductId(String date, Integer proId); + + /** + * 根据订单id、商品id、商品唯一id更新回复状态 + * + * @param orderId 订单id + * @param productId 商品id + * @param unique 商品唯一id + * @return + */ + void updateReply(Integer orderId, Integer productId, String unique); } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreOrderRefundService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreOrderRefundService.java index 28c38630..e4a56f1a 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreOrderRefundService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreOrderRefundService.java @@ -10,7 +10,7 @@ import com.zbkj.common.request.StoreOrderRefundRequest; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreOrderService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreOrderService.java index 156d9d41..66e1c91d 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreOrderService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreOrderService.java @@ -1,12 +1,14 @@ package com.zbkj.service.service; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.IService; -import com.zbkj.common.model.order.StoreOrder; +import com.github.pagehelper.PageInfo; import com.zbkj.common.page.CommonPage; import com.zbkj.common.request.*; import com.zbkj.common.response.*; import com.zbkj.common.vo.ExpressSheetVo; import com.zbkj.common.vo.LogisticsResultVo; +import com.zbkj.common.model.order.StoreOrder; import java.math.BigDecimal; import java.util.List; @@ -17,7 +19,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -59,6 +61,7 @@ public interface StoreOrderService extends IService { * @return 订单结果列表 */ List getUserOrderList(Integer uid, Integer status, PageParamRequest pageParamRequest); + PageInfo getUserOrderList_2_3(String keywords, Integer uid, Integer status, PageParamRequest pageParamRequest); /** * 创建订单 * @param storeOrder 订单参数 @@ -91,7 +94,7 @@ public interface StoreOrderService extends IService { */ StoreOrderInfoResponse info(String orderNo); - Boolean send(StoreOrderSendRequest request); + String send(StoreOrderSendRequest request); /** * 订单备注 @@ -238,9 +241,10 @@ public interface StoreOrderService extends IService { * 获取订单状态数量 * @param dateLimit 时间端 * @param type 订单类型：0普通订单，1-视频号订单, 2-全部订单 + * @param orderNo 订单号 * @return StoreOrderCountItemResponse */ - StoreOrderCountItemResponse getOrderStatusNum(String dateLimit, Integer type); + StoreOrderCountItemResponse getOrderStatusNum(String dateLimit, Integer type, String orderNo); /** * 获取订单统计数据 @@ -256,6 +260,13 @@ public interface StoreOrderService extends IService { */ Boolean delete(String orderNo); +// /** +// * 视频订单发货 +// * @param request 发货请求参数 +// * @return Boolean +// */ +// Boolean videoSend(VideoOrderSendRequest request); + /** * 通过日期获取商品交易件数 * @param date 日期，yyyy-MM-dd格式 @@ -378,4 +389,36 @@ public interface StoreOrderService extends IService { * @param spreadId 推广人uid */ OrderBrokerageData getBrokerageData(Integer uid, Integer spreadId); + + /** + * 获取待收货订单 + * @param sendTime 发货时间 + * @return List + */ + List findAwaitTakeDeliveryOrderList(String sendTime); + + /** + * 更改订单运单号 + */ + Boolean updateTrackingNumber(StoreOrderSendRequest request); + + /** + * 一号通商家寄件 寄件 + * @param request 寄件请求数据 + * @param storeOrder 当前操作订单数据 + */ + void expressForOnePassShipment(StoreOrderSendRequest request, StoreOrder storeOrder); + + /** + * 一号通商家寄件 快递揽件回调 + * @param jsonObject 回调结果 + */ + void expressForOnePassShipmentTakeCallBack(JSONObject jsonObject); + + + /** + * 一号通商家寄件 取消寄件回调 + * @param jsonObject 回调结果 + */ + void expressForOnePassShipmentCancelCallBack(JSONObject jsonObject); } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreOrderStatusService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreOrderStatusService.java index 38b08762..db6c166c 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreOrderStatusService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreOrderStatusService.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreOrderTaskService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreOrderTaskService.java index 4da56b2d..173ac14a 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreOrderTaskService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreOrderTaskService.java @@ -8,7 +8,7 @@ import com.zbkj.common.model.order.StoreOrder; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreOrderVerification.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreOrderVerification.java index 02cbfe9d..aa861f12 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreOrderVerification.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreOrderVerification.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StorePinkService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StorePinkService.java index dd672782..670dbf2c 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StorePinkService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StorePinkService.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductAttrResultService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductAttrResultService.java index ac6309c9..10e3521a 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductAttrResultService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductAttrResultService.java @@ -10,7 +10,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductAttrService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductAttrService.java index 251a62db..0d7ee68d 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductAttrService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductAttrService.java @@ -10,7 +10,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductAttrValueService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductAttrValueService.java index 498de1e3..c20df8af 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductAttrValueService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductAttrValueService.java @@ -10,7 +10,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相关版权 * +---------------------------------------------------------------------- @@ -67,7 +67,7 @@ public interface StoreProductAttrValueService extends IService getListByProductIdAndType(Integer productId, Integer type); + + /** + * 根据商品id和attrIdList获取 商品属性列表集合 + * @param productId 商品id + * @param attrIdList 属性idList + * @return 商品属性集合 + */ + List getByProductIdAndAttrIdList(Integer productId, List attrIdList); + + /** + * 添加/扣减库存 + * @param id 秒杀商品id + * @param num 数量 + * @param operationType 类型：add—添加，sub—扣减 + * @param version 版本 + */ + Boolean operationStock(Integer id, Integer num, String operationType, Integer version); + + } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductCouponService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductCouponService.java index bf39de26..a8aca572 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductCouponService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductCouponService.java @@ -10,7 +10,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductDescriptionService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductDescriptionService.java index 3b3c545d..a2fb3c46 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductDescriptionService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductDescriptionService.java @@ -8,7 +8,7 @@ import com.zbkj.common.model.product.StoreProductDescription; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductLogService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductLogService.java index f8a67454..def50110 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductLogService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductLogService.java @@ -8,7 +8,7 @@ import com.zbkj.common.model.log.StoreProductLog; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductRelationService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductRelationService.java index 33a123d4..16097285 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductRelationService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductRelationService.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相关版权 * +---------------------------------------------------------------------- @@ -89,4 +89,5 @@ public interface StoreProductRelationService extends IService { * @param request 回复参数 */ Boolean comment(StoreProductReplyCommentRequest request); + + /** + * 获取统计数据（好评、中评、差评） + */ + Integer getCountByScore(Integer productId, String type); } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductRuleService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductRuleService.java index e37ded81..e570845e 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductRuleService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductRuleService.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductService.java index 4827049b..5b141b57 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreProductService.java @@ -1,13 +1,14 @@ package com.zbkj.service.service; +import com.alipay.api.domain.Product; import com.baomidou.mybatisplus.extension.service.IService; +import com.github.pagehelper.PageInfo; import com.zbkj.common.model.product.StoreProduct; import com.zbkj.common.request.*; import com.zbkj.common.response.StoreProductInfoResponse; import com.zbkj.common.response.StoreProductResponse; import com.zbkj.common.response.StoreProductTabsHeader; import com.zbkj.common.vo.MyRecord; -import com.github.pagehelper.PageInfo; import org.json.JSONException; import java.io.IOException; @@ -18,7 +19,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相关版权 * +---------------------------------------------------------------------- @@ -63,6 +64,14 @@ public interface StoreProductService extends IService { */ StoreProductResponse getByProductId(Integer id); + /** + * 通过ID获取商品列表 + * + * @param proIdsList 商品ID列表 + * @param label admin-管理端，front-移动端 + */ + List findByIds(List proIdsList, String label); + /** * 商品详情（管理端） * @param id 商品id @@ -74,7 +83,7 @@ public interface StoreProductService extends IService { * 获取tabsHeader对应数量 * @return List */ - List getTabsHeader(); + List getTabsHeader(StoreProductHeaderRequest request); /** * 根据其他平台url导入产品信息 @@ -84,8 +93,6 @@ public interface StoreProductService extends IService { */ StoreProductRequest importProductFromUrl(String url, int tag) throws IOException, JSONException; - List getSecondaryCategoryByProductId(String productId); - /** * 删除商品 * @param productId 商品id @@ -131,7 +138,7 @@ public interface StoreProductService extends IService { * @param num 数量 * @param type 类型：add—添加，sub—扣减 */ - Boolean operationStock(Integer id, Integer num, String type); + Boolean operationStock(Integer id, Integer num, String type, Integer version); /** * 下架 @@ -219,4 +226,25 @@ public interface StoreProductService extends IService { * @return List */ List getLeaderboard(); + + /** + * 是否有商品使用运费模板 + * @return Boolean + */ + Boolean isUseShippingTemplateId(Integer templateId); + + /** + * 获取商品所用的分类（包含父级分类） + * @param productIdList 商品ID列表 + * @return 商品分类及所有父级分类ID + */ + List getProductAllCategoryIdByProductIds(List productIdList); + + /** + * 快捷添加库存 + * + * @param request 添加库存参数 + * @return Boolean + */ + Boolean quickAddStock(ProductAddStockRequest request); } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreSeckillMangerService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreSeckillMangerService.java index 020add2f..b283b078 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreSeckillMangerService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreSeckillMangerService.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相关版权 * +---------------------------------------------------------------------- @@ -57,7 +57,7 @@ public interface StoreSeckillMangerService extends IService * @param status 待更新状态 * @return 结果 */ - Boolean updateStatus(Integer id, Boolean status); + Boolean updateStatus(Integer id, String status); /** * 更新秒杀配置 diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreSeckillService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreSeckillService.java index 837912af..fa1e504c 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreSeckillService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/StoreSeckillService.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemAdminService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemAdminService.java index 62a39e2e..30693c06 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemAdminService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemAdminService.java @@ -16,7 +16,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemAttachmentService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemAttachmentService.java index 8831ef12..e2ac5a1f 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemAttachmentService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemAttachmentService.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- @@ -45,6 +45,13 @@ public interface SystemAttachmentService extends IService { */ String prefixImage(String path); + /** + * 给前端上传的文件加前缀 + * @param path 路径 + * @return 替换后的 + */ + String prefixUploadf(String path); + /** * 给文件加前缀 * @param path String 路径 @@ -76,4 +83,16 @@ public interface SystemAttachmentService extends IService { * @param move 参数 */ Boolean updateAttrId(SystemAttachmentMoveRequest move); + + /** + * 获取cdn url + * @return String + */ + String getCdnUrl(); + + /** + * 删除附件 + * @param idList 附件ID列表 + */ + Boolean deleteByIds(List idList); } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemCityAsyncService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemCityAsyncService.java index e281aaa2..7ad2272f 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemCityAsyncService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemCityAsyncService.java @@ -5,7 +5,7 @@ package com.zbkj.service.service; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemCityService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemCityService.java index 0b7dfeb0..61d7443b 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemCityService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemCityService.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- @@ -66,4 +66,16 @@ public interface SystemCityService extends IService { * @return 城市数据 */ SystemCity getCityByCityName(String cityName); + + /** + * 根据区名获取数据 + */ + SystemCity getByAreaNameAndPid(String areaName, Integer pid); + + /** + * 通过区域id获取 + * @param areaId 区域Id + * @return SystemCity + */ + SystemCity getByAreaId(Integer areaId); } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemConfigService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemConfigService.java index 9c627c0e..50a046c4 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemConfigService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemConfigService.java @@ -1,20 +1,20 @@ package com.zbkj.service.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.zbkj.common.request.SystemConfigAdminRequest; -import com.zbkj.common.request.SystemFormCheckRequest; -import com.zbkj.common.vo.ExpressSheetVo; import com.zbkj.common.model.system.SystemConfig; +import com.zbkj.common.request.SaveConfigRequest; +import com.zbkj.common.request.SystemFormCheckRequest; +import com.zbkj.common.response.AdminSiteLogoResponse; +import com.zbkj.common.vo.ExpressSheetVo; import java.util.HashMap; -import java.util.List; /** * SystemConfigService 接口 * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -30,13 +30,6 @@ public interface SystemConfigService extends IService { */ String getValueByKey(String key); - /** - * 同时获取多个配置 - * @param keys 多个配置key - * @return 查询到的多个结果 - */ - List getValuesByKes(List keys); - /** * 保存或更新配置数据 * @param name 菜单名称 @@ -66,20 +59,6 @@ public interface SystemConfigService extends IService { */ HashMap info(Integer formId); - /** - * 根据name查询数据 - * @param name name - * @return Boolean - */ - Boolean checkName(String name); - - /** - * 根据key获取配置 - * @param key key - * @return List - */ - List getListByKey(String key); - /** * 获取面单默认配置信息 * @return ExpressSheetVo @@ -87,15 +66,63 @@ public interface SystemConfigService extends IService { ExpressSheetVo getDeliveryInfo(); /** - * 更新配置信息 - * @param requestList 请求数组 - * @return Boolean + * 获取文件存储类型 */ - Boolean updateByList(List requestList); + SystemConfig getFileUploadType(); /** - * 获取颜色配置 - * @return SystemConfig + * 获取管理端logo + * + * @return AdminSiteLogoResponse */ - SystemConfig getColorConfig(); + AdminSiteLogoResponse getSiteLogo(); + + /** + * 获取腾讯地图key + */ + SystemConfig getTxMapKey(); + + /** + * 获取移动端首页列表样式 + */ + SystemConfig getHomePageSaleListStyle(); + + /** + * 保存移动端首页列表样式 + */ + Boolean saveHomePageSaleListStyle(SaveConfigRequest request); + + /** + * 清除config缓存 + */ + Boolean clearCache(); + + /** + * 获取授权地址 + */ + SystemConfig getAuthHost(); + + /** + * 获取主题色 + */ + SystemConfig getChangeColor(); + + /** + * 保存主题色 + */ + Boolean saveChangeColor(SaveConfigRequest request); + + + /** + * 获取移动端域名 + * @return 移动端域名 + */ + String getFrontDomain(); + + /** + * 获取素材域名 + * + * @return 素材域名 + */ + String getMediaDomain(); } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemFormTempService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemFormTempService.java index 2d76a446..c4326077 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemFormTempService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemFormTempService.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemGroupDataService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemGroupDataService.java index de6e1e32..bb86d7ed 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemGroupDataService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemGroupDataService.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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemGroupService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemGroupService.java index a4aa89bb..6d43f15c 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemGroupService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemGroupService.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemMenuService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemMenuService.java index bf037364..4cc6dcd4 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemMenuService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemMenuService.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemNotificationService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemNotificationService.java index 98928507..498c5c31 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemNotificationService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemNotificationService.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemRoleMenuService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemRoleMenuService.java index 403bb2d9..639c1452 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemRoleMenuService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemRoleMenuService.java @@ -11,7 +11,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemRoleService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemRoleService.java index b4edc614..477b2787 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemRoleService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemRoleService.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemStoreService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemStoreService.java index 8f6c9fd6..71e8202b 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemStoreService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemStoreService.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- @@ -55,9 +55,10 @@ public interface SystemStoreService extends IService { /** * 表头数量 + * @param keywords 搜索条件:门店名称、门店电话 * @return HashMap */ - HashMap getCount(); + HashMap getCount(String keywords); HashMap getMapInId(List storeIdList); diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemStoreStaffService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemStoreStaffService.java index bc2b4759..1fe01bb4 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemStoreStaffService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemStoreStaffService.java @@ -12,7 +12,7 @@ import com.zbkj.common.model.system.SystemStoreStaff; * +---------------------------------------------------------------------- * | 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,4 +49,5 @@ public interface SystemStoreStaffService extends IService { * @return Boolean */ Boolean updateStatus(Integer id, Integer status); + } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemUserLevelService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemUserLevelService.java index a79f6dd1..609f43fa 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemUserLevelService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/SystemUserLevelService.java @@ -12,7 +12,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/TemplateMessageService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/TemplateMessageService.java index fe80416a..4d82377a 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/TemplateMessageService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/TemplateMessageService.java @@ -11,7 +11,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UploadService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UploadService.java index a6a87eda..50bd69dc 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UploadService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UploadService.java @@ -10,7 +10,7 @@ import java.io.IOException; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserAddressService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserAddressService.java index 98dd3374..027bea3c 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserAddressService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserAddressService.java @@ -12,7 +12,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserBillService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserBillService.java index 9c4bd937..953e067f 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserBillService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserBillService.java @@ -18,7 +18,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserBrokerageRecordService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserBrokerageRecordService.java index a160d6b0..a225968b 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserBrokerageRecordService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserBrokerageRecordService.java @@ -17,7 +17,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserExperienceRecordService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserExperienceRecordService.java index 3fccec0b..daea14ac 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserExperienceRecordService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserExperienceRecordService.java @@ -11,7 +11,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserExtractService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserExtractService.java index 7cfa67d3..feef1f14 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserExtractService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserExtractService.java @@ -18,7 +18,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserFundsMonitorService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserFundsMonitorService.java index e904eafd..6e4e7790 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserFundsMonitorService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserFundsMonitorService.java @@ -12,7 +12,7 @@ import com.zbkj.common.model.user.UserBrokerageRecord; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserGroupService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserGroupService.java index d98c7cba..49199f0a 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserGroupService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserGroupService.java @@ -12,7 +12,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserIntegralRecordService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserIntegralRecordService.java index 3de6ef2a..e90686ab 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserIntegralRecordService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserIntegralRecordService.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相关版权 * +---------------------------------------------------------------------- @@ -52,7 +52,7 @@ public interface UserIntegralRecordService extends IService * @param linkType 关联类型 * @return 积分总数 */ - Integer getSumIntegral(Integer uid, Integer type, String date, String linkType); + Integer getSumIntegral(Integer uid, Integer type, String date, List linkTypeList); /** * H5用户积分列表 diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserLevelService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserLevelService.java index 9544947a..e11edf28 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserLevelService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserLevelService.java @@ -12,7 +12,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserRechargeService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserRechargeService.java index a5607d4b..f2881949 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserRechargeService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserRechargeService.java @@ -9,13 +9,14 @@ import com.zbkj.common.response.UserRechargeResponse; import java.math.BigDecimal; import java.util.HashMap; +import java.util.List; /** * UserRechargeService 接口 * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -80,4 +81,15 @@ public interface UserRechargeService extends IService { * @return Integer */ Integer getRechargeUserNumByPeriod(String startDate, String endDate); + + /** + * 获取待上传微信发货管理订单 + */ + List findAwaitUploadWechatList(); + + /** + * 获取订单 + * @param outTradeNo 商户系统内部的订单号 + */ + UserRecharge getByOutTradeNo(String outTradeNo); } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserService.java index b3b5143a..364d6fcf 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserService.java @@ -16,7 +16,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -322,4 +322,5 @@ public interface UserService extends IService { * @param id 用户uid */ User getInfoByUid(Integer id); + } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserSignService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserSignService.java index 035d0df5..6db32b8a 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserSignService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserSignService.java @@ -16,7 +16,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserTagService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserTagService.java index 8c57e14a..f39f34b9 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserTagService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserTagService.java @@ -12,7 +12,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserTokenService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserTokenService.java index 88211dea..4e02c0cd 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserTokenService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserTokenService.java @@ -8,7 +8,7 @@ import com.zbkj.common.model.user.UserToken; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserVisitRecordService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserVisitRecordService.java index 56e99b1a..0a05c106 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserVisitRecordService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/UserVisitRecordService.java @@ -8,7 +8,7 @@ import com.zbkj.common.model.record.UserVisitRecord; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/WeChatPayService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/WeChatPayService.java index 9feff460..be98fb43 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/WeChatPayService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/WeChatPayService.java @@ -9,7 +9,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/WechatCallbackService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/WechatCallbackService.java index d74343a3..26b2433e 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/WechatCallbackService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/WechatCallbackService.java @@ -8,7 +8,7 @@ import com.zbkj.common.model.wechat.WechatCallback; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/WechatExceptionsService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/WechatExceptionsService.java index 057cc762..f91a84be 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/WechatExceptionsService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/WechatExceptionsService.java @@ -8,7 +8,7 @@ import com.zbkj.common.model.wechat.WechatExceptions; * +---------------------------------------------------------------------- * | 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,7 +18,7 @@ import com.zbkj.common.model.wechat.WechatExceptions; public interface WechatExceptionsService extends IService { /** - * 删除历史日志 + * 自动删除日志 */ void autoDeleteLog(); } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/WechatNewService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/WechatNewService.java index dd21a78b..6f7f1a9e 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/WechatNewService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/WechatNewService.java @@ -1,6 +1,7 @@ package com.zbkj.service.service; import com.alibaba.fastjson.JSONObject; +import com.zbkj.common.request.SaveConfigRequest; import com.zbkj.common.response.WeChatJsSdkConfigResponse; import com.zbkj.common.token.WeChatOauthToken; import com.zbkj.common.vo.*; @@ -13,7 +14,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -71,6 +72,14 @@ public interface WechatNewService { */ String createQrCode(String page, String scene); + + /** + * 生成小程序码 + * + * @param jsonObject + * @return 小程序码 + */ + String createQrCode(JSONObject jsonObject); /** * 微信预下单接口(统一下单) * @param unifiedorderVo 预下单请求对象 @@ -178,4 +187,5 @@ public interface WechatNewService { * @return 小程序订阅消息模板编号（自己的） */ String apiAddRoutineTemplate(String tempKey, List kidList); + } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/WechatPayInfoService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/WechatPayInfoService.java index 24cf82c6..489cdb35 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/WechatPayInfoService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/WechatPayInfoService.java @@ -8,7 +8,7 @@ import com.zbkj.common.model.wechat.WechatPayInfo; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/WechatPublicService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/WechatPublicService.java index 5d03b028..982c2e84 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/WechatPublicService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/WechatPublicService.java @@ -5,7 +5,7 @@ package com.zbkj.service.service; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/WechatReplyService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/WechatReplyService.java index 64a2dacf..ea538be3 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/WechatReplyService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/WechatReplyService.java @@ -13,7 +13,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/WechatUserService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/WechatUserService.java index 1a03a164..aae21538 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/WechatUserService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/WechatUserService.java @@ -5,7 +5,7 @@ package com.zbkj.service.service; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/YlyPrintService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/YlyPrintService.java index 262473de..a05f1438 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/YlyPrintService.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/YlyPrintService.java @@ -5,7 +5,7 @@ package com.zbkj.service.service; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/ArticleServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/ArticleServiceImpl.java index 39ff2a3d..29228e3b 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/ArticleServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/ArticleServiceImpl.java @@ -1,6 +1,7 @@ package com.zbkj.service.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -41,7 +42,7 @@ import java.util.stream.Collectors; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -151,6 +152,7 @@ public class ArticleServiceImpl extends ServiceImpl impleme String visit = StrUtil.isNotBlank(article.getVisit()) ? article.getVisit() : "0"; int num = Integer.parseInt(visit) + 1; article.setVisit(String.valueOf(num)); + article.setUpdateTime(DateUtil.date()); dao.updateById(article); return articleResponse; } @@ -250,6 +252,7 @@ public class ArticleServiceImpl extends ServiceImpl impleme article.setId(id); article.setImageInput(systemAttachmentService.clearPrefix(article.getImageInput())); article.setContent(systemAttachmentService.clearPrefix(article.getContent())); + article.setUpdateTime(DateUtil.date()); return updateById(article); } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/CallbackServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/CallbackServiceImpl.java index 5af3eb51..812df342 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/CallbackServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/CallbackServiceImpl.java @@ -1,10 +1,12 @@ package com.zbkj.service.service.impl; import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.SecureUtil; import com.alibaba.fastjson.JSONObject; + import com.zbkj.common.constants.Constants; import com.zbkj.common.constants.TaskConstants; import com.zbkj.common.exception.CrmebException; @@ -14,8 +16,9 @@ import com.zbkj.common.model.finance.UserRecharge; import com.zbkj.common.model.order.StoreOrder; import com.zbkj.common.model.user.User; import com.zbkj.common.model.wechat.WechatPayInfo; + import com.zbkj.common.utils.CrmebUtil; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.common.utils.RedisUtil; import com.zbkj.common.utils.WxPayUtil; import com.zbkj.common.vo.AttachVo; @@ -31,6 +34,7 @@ import org.springframework.transaction.support.TransactionTemplate; import javax.crypto.Cipher; import javax.crypto.spec.SecretKeySpec; +import javax.servlet.http.HttpServletRequest; import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; import java.security.Security; @@ -42,7 +46,7 @@ import java.util.*; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -169,7 +173,8 @@ public class CallbackServiceImpl implements CallbackService { // 添加支付成功redis队列 Boolean execute = transactionTemplate.execute(e -> { storeOrder.setPaid(true); - storeOrder.setPayTime(DateUtil.nowDateTime()); + storeOrder.setPayTime(CrmebDateUtil.nowDateTime()); + storeOrder.setUpdateTime(DateUtil.date()); storeOrderService.updateById(storeOrder); if (storeOrder.getUseIntegral() > 0) { userService.updateIntegral(user, storeOrder.getUseIntegral(), "sub"); @@ -228,6 +233,7 @@ public class CallbackServiceImpl implements CallbackService { storePinkService.save(storePink); // 如果是开团，需要更新订单数据 storeOrder.setPinkId(storePink.getId()); + storeOrder.setUpdateTime(DateUtil.date()); storeOrderService.updateById(storeOrder); } @@ -244,10 +250,7 @@ public class CallbackServiceImpl implements CallbackService { } // 充值 if (Constants.SERVICE_PAY_TYPE_RECHARGE.equals(attachVo.getType())) { - UserRecharge userRecharge = new UserRecharge(); - userRecharge.setOrderId(callbackVo.getOutTradeNo()); - userRecharge.setUid(attachVo.getUserId()); - userRecharge = userRechargeService.getInfoByEntity(userRecharge); + UserRecharge userRecharge = userRechargeService.getByOutTradeNo(callbackVo.getOutTradeNo()); if(ObjectUtil.isNull(userRecharge)){ throw new CrmebException("没有找到订单信息"); } @@ -276,6 +279,30 @@ public class CallbackServiceImpl implements CallbackService { return sb.toString(); } + + /** + * 将request中的参数转换成Map + * @param request + * @return + */ + private Map convertRequestParamsToMap(HttpServletRequest request) { + Map retMap = new HashMap(); + Map requestParams = request.getParameterMap(); + for (Iterator iter = requestParams.keySet().iterator(); iter.hasNext();) { + String name = (String) iter.next(); + String[] values = (String[]) requestParams.get(name); + String valueStr = ""; + for (int i = 0; i < values.length; i++) { + valueStr = (i == values.length - 1) ? valueStr + values[i] + : valueStr + values[i] + ","; + } + //乱码解决，这段代码在出现乱码时使用。如果mysign和sign不相等也可以使用这段代码转化 + //valueStr = new String(valueStr.getBytes("ISO-8859-1"), "gbk"); + retMap.put(name, valueStr); + } + return retMap; + } + /** * 微信退款回调 * @param xmlInfo 微信回调json @@ -285,7 +312,7 @@ public class CallbackServiceImpl implements CallbackService { public String weChatRefund(String xmlInfo) { MyRecord notifyRecord = new MyRecord(); MyRecord refundRecord = refundNotify(xmlInfo, notifyRecord); - if ("fail".equals(refundRecord.getStr("status"))) { + if (refundRecord.getStr("status").equals("fail")) { logger.error("微信退款回调失败==>" + refundRecord.getColumns() + ", rawData==>" + xmlInfo + ", data==>" + notifyRecord); return refundRecord.getStr("returnXml"); } @@ -305,6 +332,7 @@ public class CallbackServiceImpl implements CallbackService { return refundRecord.getStr("returnXml"); } storeOrder.setRefundStatus(2); + storeOrder.setUpdateTime(DateUtil.date()); boolean update = storeOrderService.updateById(storeOrder); if (update) { // 退款task diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/CategoryServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/CategoryServiceImpl.java index 543037b4..770e7419 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/CategoryServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/CategoryServiceImpl.java @@ -1,6 +1,7 @@ package com.zbkj.service.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -37,7 +38,7 @@ import java.util.stream.Collectors; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -57,14 +58,12 @@ public class CategoryServiceImpl extends ServiceImpl impl /** * 获取分类下子类的数量 * @param request 请求参数 - * @param pageParamRequest 分页参数 * @author Mr.Zhang * @since 2020-04-16 * @return List */ @Override - public List getList(CategorySearchRequest request, PageParamRequest pageParamRequest) { - PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit()); + public List getList(CategorySearchRequest request) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); if(null != request.getPid()){ lambdaQueryWrapper.eq(Category::getPid, request.getPid()); @@ -96,6 +95,18 @@ public class CategoryServiceImpl extends ServiceImpl impl return dao.selectList(lambdaQueryWrapper); } + /** + * 获取父级id集合 + * @param idList + * @return + */ + @Override + public List getByPIds(List idList) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(Category::getPid, idList); + return dao.selectList(lambdaQueryWrapper); + } + /** * 通过id集合获取列表 id => name * @param cateIdList List id集合 @@ -149,6 +160,7 @@ public class CategoryServiceImpl extends ServiceImpl impl category.setId(id); category.setPath(getPathByPId(category.getPid())); + category.setUpdateTime(DateUtil.date()); updateById(category); //如状态为关闭，那么所以子集的状态都关闭 @@ -184,6 +196,7 @@ public class CategoryServiceImpl extends ServiceImpl impl Category categoryVo = new Category(); categoryVo.setId(categoryId); categoryVo.setStatus(true); + categoryVo.setUpdateTime(DateUtil.date()); categoryArrayList.add(categoryVo); } updateBatchById(categoryArrayList); @@ -225,7 +238,7 @@ public class CategoryServiceImpl extends ServiceImpl impl if(null != category){ return category.getPath() + pid + "/"; } - return null; + return "/0/"; } /** @@ -352,19 +365,36 @@ public class CategoryServiceImpl extends ServiceImpl impl return dao.selectList(objectQueryWrapper); } + /** + * 获取分类下子类时判断当前分类有效 + */ + @Override + public List getChildVoStatusOnListByPid(Integer pid) { + Category category = dao.selectById(pid); + if(ObjectUtil.isNull(category) || !category.getStatus()) return new ArrayList<>(); + //查看是否有子类 + QueryWrapper objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("status", CategoryConstants.CATEGORY_STATUS_NORMAL); + objectQueryWrapper.eq("pid", pid); + objectQueryWrapper.like("path", "/"+pid+"/"); + return dao.selectList(objectQueryWrapper); + } + /** * 检测分类名称是否存在 * @param name String 分类名 * @param type int 类型 + * @param path String 路径 * @author Mr.Zhang * @since 2020-04-16 * @return int */ - private int checkName(String name, Integer type) { + private int checkName(String name, Integer type,String path) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(Category::getName, name); if (ObjectUtil.isNotNull(type)) { lambdaQueryWrapper.eq(Category::getType, type); + lambdaQueryWrapper.eq(Category::getPath, path); } return dao.selectCount(lambdaQueryWrapper); } @@ -387,6 +417,7 @@ public class CategoryServiceImpl extends ServiceImpl impl public boolean updateStatus(Integer id) { Category category = getById(id); category.setStatus(!category.getStatus()); + category.setUpdateTime(DateUtil.date()); return updateById(category); } @@ -397,7 +428,7 @@ public class CategoryServiceImpl extends ServiceImpl impl @Override public Boolean create(CategoryRequest categoryRequest) { //检测标题是否存在 - if(checkName(categoryRequest.getName(), categoryRequest.getType()) > 0){ + if(checkName(categoryRequest.getName(), categoryRequest.getType(),getPathByPId(categoryRequest.getPid())) > 0){ throw new CrmebException("此分类已存在"); } Category category = new Category(); diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/CosServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/CosServiceImpl.java index e31afbb4..dec0a239 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/CosServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/CosServiceImpl.java @@ -21,7 +21,7 @@ import java.io.File; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/CrmebGeneratorCodeService.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/CrmebGeneratorCodeService.java deleted file mode 100644 index 5cb464e9..00000000 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/CrmebGeneratorCodeService.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.zbkj.service.service.impl; - -import com.github.pagehelper.Page; -import com.github.pagehelper.PageHelper; -import com.zbkj.common.utils.genutils.GenCodePageListUtils; -import com.zbkj.common.utils.genutils.GenCodeUtils; -import com.zbkj.common.utils.genutils.GenCodePageQueryUtils; -import com.zbkj.service.dao.MySqlGenDao; -import org.apache.commons.io.IOUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.io.ByteArrayOutputStream; -import java.util.List; -import java.util.Map; -import java.util.zip.ZipOutputStream; - -/** - * 代码生成也业务类 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- - */ -@Service -public class CrmebGeneratorCodeService { - - @Autowired - private MySqlGenDao mySqlGenDao; - - /** - * 查询数据库对应表 - * @param pageQueryUtils - * @return - */ - public GenCodePageListUtils queryList(GenCodePageQueryUtils pageQueryUtils) { - Page page = PageHelper.startPage(pageQueryUtils.getPage(), pageQueryUtils.getLimit()); - List> list = mySqlGenDao.getList(pageQueryUtils); - int total = (int) page.getTotal(); - return new GenCodePageListUtils(list, total, pageQueryUtils.getLimit(), pageQueryUtils.getPage()); - } - - public Map queryTable(String tableName) { - return mySqlGenDao.getTable(tableName); - } - - public List> queryColumns(String tableName) { - return mySqlGenDao.getColumns(tableName); - } - - - /** - * 参训数据库表对应的列数据 - * @param tableNames 数据库表名称 - * @return byte 数组 - */ - public byte[] generatorCode(String[] tableNames) { - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - ZipOutputStream zip = new ZipOutputStream(outputStream); - for (String tableName : tableNames) { - //查询表信息 - Map table = queryTable(tableName); - //查询列信息 - List> columns = queryColumns(tableName); - //生成代码 - GenCodeUtils.generatorCode(table, columns, zip); - } - - IOUtils.closeQuietly(zip); - return outputStream.toByteArray(); - } -} diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/ExcelServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/ExcelServiceImpl.java index dfdfbf2d..cb455c27 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/ExcelServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/ExcelServiceImpl.java @@ -2,6 +2,7 @@ package com.zbkj.service.service.impl; import cn.hutool.core.collection.CollUtil; import com.zbkj.common.config.CrmebConfig; +import com.zbkj.common.constants.UploadConstants; import com.zbkj.common.page.CommonPage; import com.zbkj.common.constants.Constants; import com.zbkj.common.exception.CrmebException; @@ -10,7 +11,7 @@ import com.zbkj.common.response.StoreOrderDetailResponse; import com.zbkj.common.response.StoreProductResponse; import com.github.pagehelper.PageInfo; import com.zbkj.common.utils.CrmebUtil; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.common.utils.ExportUtil; import com.zbkj.common.response.StoreBargainResponse; import com.zbkj.common.response.StoreCombinationResponse; @@ -34,7 +35,7 @@ import java.util.stream.Collectors; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -90,15 +91,15 @@ public class ExcelServiceImpl implements ExcelService { }).collect(Collectors.toList()); // 上传设置 - ExportUtil.setUpload(crmebConfig.getImagePath(), Constants.UPLOAD_MODEL_PATH_EXCEL, Constants.UPLOAD_TYPE_FILE); + ExportUtil.setUpload(crmebConfig.getImagePath(), Constants.UPLOAD_MODEL_PATH_EXCEL, UploadConstants.DOWNLOAD_FILE_KEYWORD); // 文件名 - String fileName = "砍价".concat(DateUtil.nowDateTime(Constants.DATE_TIME_FORMAT_NUM)).concat(CrmebUtil.randomCount(111111111, 999999999).toString()).concat(".xlsx"); + String fileName = "砍价".concat(CrmebDateUtil.nowDateTime(Constants.DATE_TIME_FORMAT_NUM)).concat(CrmebUtil.randomCount(111111111, 999999999).toString()).concat(".xlsx"); //自定义标题别名 LinkedHashMap aliasMap = new LinkedHashMap<>(); aliasMap.put("title", "砍价活动名称"); - aliasMap.put("info", "砍价活动简介"); +// aliasMap.put("info", "砍价活动简介"); aliasMap.put("price", "砍价金额"); aliasMap.put("bargainNum", "用户每次砍价的次数"); aliasMap.put("status", "砍价状态"); @@ -129,15 +130,15 @@ public class ExcelServiceImpl implements ExcelService { CombinationProductExcelVo vo = new CombinationProductExcelVo(); BeanUtils.copyProperties(temp, vo); vo.setIsShow(temp.getIsShow() ? "开启" : "关闭"); - vo.setStopTime(DateUtil.timestamp2DateStr(temp.getStopTime(), Constants.DATE_FORMAT_DATE)); + vo.setStopTime(CrmebDateUtil.timestamp2DateStr(temp.getStopTime(), Constants.DATE_FORMAT_DATE)); return vo; }).collect(Collectors.toList()); // 上传设置 - ExportUtil.setUpload(crmebConfig.getImagePath(), Constants.UPLOAD_MODEL_PATH_EXCEL, Constants.UPLOAD_TYPE_FILE); + ExportUtil.setUpload(crmebConfig.getImagePath(), Constants.UPLOAD_MODEL_PATH_EXCEL, UploadConstants.DOWNLOAD_FILE_KEYWORD); // 文件名 - String fileName = "拼团".concat(DateUtil.nowDateTime(Constants.DATE_TIME_FORMAT_NUM)).concat(CrmebUtil.randomCount(111111111, 999999999).toString()).concat(".xlsx"); + String fileName = "拼团".concat(CrmebDateUtil.nowDateTime(Constants.DATE_TIME_FORMAT_NUM)).concat(CrmebUtil.randomCount(111111111, 999999999).toString()).concat(".xlsx"); //自定义标题别名 LinkedHashMap aliasMap = new LinkedHashMap<>(); @@ -185,7 +186,7 @@ public class ExcelServiceImpl implements ExcelService { for (StoreProductResponse product : list ) { ProductExcelVo vo = new ProductExcelVo(); vo.setStoreName(product.getStoreName()); - vo.setStoreInfo(product.getStoreInfo()); +// vo.setStoreInfo(product.getStoreInfo()); vo.setCateName(CrmebUtil.getValueByIndex(categoryNameList, product.getCateId())); vo.setPrice("￥" + product.getPrice()); vo.setStock(product.getStock().toString()); @@ -200,15 +201,15 @@ public class ExcelServiceImpl implements ExcelService { * =============================== */ // 上传设置 - ExportUtil.setUpload(crmebConfig.getImagePath(), Constants.UPLOAD_MODEL_PATH_EXCEL, Constants.UPLOAD_TYPE_FILE); + ExportUtil.setUpload(crmebConfig.getImagePath(), Constants.UPLOAD_MODEL_PATH_EXCEL, UploadConstants.DOWNLOAD_FILE_KEYWORD); // 文件名 - String fileName = "商品导出_".concat(DateUtil.nowDateTime(Constants.DATE_TIME_FORMAT_NUM)).concat(CrmebUtil.randomCount(111111111, 999999999).toString()).concat(".xlsx"); + String fileName = "商品导出_".concat(CrmebDateUtil.nowDateTime(Constants.DATE_TIME_FORMAT_NUM)).concat(CrmebUtil.randomCount(111111111, 999999999).toString()).concat(".xlsx"); //自定义标题别名 LinkedHashMap aliasMap = new LinkedHashMap<>(); aliasMap.put("storeName", "商品名称"); - aliasMap.put("storeInfo", "商品简介"); +// aliasMap.put("storeInfo", "商品简介"); aliasMap.put("cateName", "商品分类"); aliasMap.put("price", "价格"); aliasMap.put("stock", "库存"); @@ -238,7 +239,7 @@ public class ExcelServiceImpl implements ExcelService { List voList = CollUtil.newArrayList(); for (StoreOrderDetailResponse order: list ) { OrderExcelVo vo = new OrderExcelVo(); - vo.setCreateTime(DateUtil.dateToStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + vo.setCreateTime(CrmebDateUtil.dateToStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); vo.setOrderId(order.getOrderId()); vo.setOrderType(order.getOrderType()); vo.setPayPrice(order.getPayPrice().toString()); @@ -255,10 +256,10 @@ public class ExcelServiceImpl implements ExcelService { =============================== */ // 上传设置 - ExportUtil.setUpload(crmebConfig.getImagePath(), Constants.UPLOAD_MODEL_PATH_EXCEL, Constants.UPLOAD_TYPE_FILE); + ExportUtil.setUpload(crmebConfig.getImagePath(), Constants.UPLOAD_MODEL_PATH_EXCEL, UploadConstants.DOWNLOAD_FILE_KEYWORD); // 文件名 - String fileName = "订单导出_".concat(DateUtil.nowDateTime(Constants.DATE_TIME_FORMAT_NUM)).concat(CrmebUtil.randomCount(111111111, 999999999).toString()).concat(".xlsx"); + String fileName = "订单导出_".concat(CrmebDateUtil.nowDateTime(Constants.DATE_TIME_FORMAT_NUM)).concat(CrmebUtil.randomCount(111111111, 999999999).toString()).concat(".xlsx"); //自定义标题别名 LinkedHashMap aliasMap = new LinkedHashMap<>(); diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/ExpressServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/ExpressServiceImpl.java index 0311c82e..06a26a55 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/ExpressServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/ExpressServiceImpl.java @@ -37,7 +37,7 @@ import java.util.stream.Collectors; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -93,6 +93,7 @@ public class ExpressServiceImpl extends ServiceImpl impleme } Express express = new Express(); BeanUtils.copyProperties(expressRequest, express); + return updateById(express); } @@ -133,7 +134,7 @@ public class ExpressServiceImpl extends ServiceImpl impleme public List findAll(String type) { LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.eq(Express::getIsShow, true); - if ("elec".equals(type)) { + if (type.equals("elec")) { lqw.eq(Express::getStatus, true); } lqw.orderByDesc(Express::getSort); @@ -149,9 +150,15 @@ public class ExpressServiceImpl extends ServiceImpl impleme public JSONObject template(String com) { String token = onePassUtil.getToken(); HashMap header = onePassUtil.getCommonHeader(token); - MultiValueMap param = new LinkedMultiValueMap<>(); - param.add("com", com); - return onePassUtil.postFrom(OnePassConstants.ONE_PASS_API_URL + OnePassConstants.ONE_PASS_API_EXPRESS_TEMP_URI, param, header); + return onePassUtil.getData(OnePassConstants.ONE_PASS_API_URL + OnePassConstants.ONE_PASS_API_EXPRESS_TEMP_URI + +"?com="+com+"&is_shipment=1", header); + } + + @Override + public JSONObject templateFor(String com, String type, String is_shipment, String page, String limit) { + String token = onePassUtil.getToken(); + HashMap header = onePassUtil.getCommonHeader(token); + return onePassUtil.getData(OnePassConstants.ONE_PASS_API_URL + OnePassConstants.ONE_PASS_API_EXPRESS_DUMP_RECORD_URI +"?com="+com+"&type="+type+"&is_shipment="+is_shipment+"&page="+page+"&limit="+limit, header); } /** @@ -200,9 +207,9 @@ public class ExpressServiceImpl extends ServiceImpl impleme MultiValueMap param = new LinkedMultiValueMap<>(); // param.add("type", 1);// 快递类型：1，国内运输商；2，国际运输商；3，国际邮政 不传获取全部 param.add("page", 0); - param.add("limit", 1000); + param.add("limit", 9999); - JSONObject post = onePassUtil.postFrom(OnePassConstants.ONE_PASS_API_URL + OnePassConstants.ONE_PASS_API_EXPRESS_URI, param, header); + JSONObject post = onePassUtil.getFrom(OnePassConstants.ONE_PASS_API_URL + OnePassConstants.ONE_PASS_API_EXPRESS_URI, param, header); System.out.println("OnePass Express ALL post = " + post); JSONObject jsonObject = post.getJSONObject("data"); JSONArray jsonArray = jsonObject.getJSONArray("data"); @@ -210,8 +217,8 @@ public class ExpressServiceImpl extends ServiceImpl impleme List expressList = CollUtil.newArrayList(); List codeList = getAllCode(); - jsonArray.forEach(temp -> { - JSONObject object = (JSONObject) temp; + for (int i = 0; i < jsonArray.size(); i++) { + JSONObject object = jsonArray.getJSONObject(i); if (StrUtil.isNotBlank(object.getString("code")) && !codeList.contains(object.getString("code"))) { Express express = new Express(); express.setName(Optional.ofNullable(object.getString("name")).orElse("")); @@ -235,7 +242,8 @@ public class ExpressServiceImpl extends ServiceImpl impleme } expressList.add(express); } - }); + } + if (CollUtil.isNotEmpty(expressList)) { boolean saveBatch = saveBatch(expressList); diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/HomeServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/HomeServiceImpl.java index c24451c5..49b73338 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/HomeServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/HomeServiceImpl.java @@ -1,16 +1,15 @@ package com.zbkj.service.service.impl; import com.zbkj.common.constants.Constants; -import com.zbkj.common.model.order.StoreOrder; +import com.zbkj.common.response.HomeOperatingDataResponse; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.common.response.HomeRateResponse; -import com.zbkj.common.utils.DateUtil; -import com.zbkj.service.service.HomeService; -import com.zbkj.service.service.StoreOrderService; -import com.zbkj.service.service.UserService; -import com.zbkj.service.service.UserVisitRecordService; +import com.zbkj.common.model.order.StoreOrder; +import com.zbkj.service.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.*; /** @@ -18,7 +17,7 @@ import java.util.*; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -37,6 +36,18 @@ public class HomeServiceImpl implements HomeService { @Autowired private UserVisitRecordService userVisitRecordService; + @Autowired + private StoreProductService storeProductService; + + @Autowired + private UserRechargeService userRechargeService; + + @Autowired + private UserBrokerageRecordService brokerageRecordService; + + @Autowired + private UserExtractService userExtractService; + /** * 用户曲线图 * @author Mr.Zhang @@ -117,7 +128,7 @@ public class HomeServiceImpl implements HomeService { */ private Map dataFormat(Map countGroupDate, String dateLimit) { Map map = new LinkedHashMap<>(); - List listDate = DateUtil.getListDate(dateLimit); + List listDate = CrmebDateUtil.getListDate(dateLimit); String[] weekList = new String[]{"周一", "周二", "周三", "周四", "周五", "周六", "周日"}; @@ -162,11 +173,11 @@ public class HomeServiceImpl implements HomeService { List listDate = new ArrayList<>(); String year = ""; if (dateLimit.equals(Constants.SEARCH_DATE_YEAR)) { - year = DateUtil.nowYear(); + year = CrmebDateUtil.nowYear(); } if (dateLimit.equals(Constants.SEARCH_DATE_PRE_YEAR)) { - year = DateUtil.lastYear(); + year = CrmebDateUtil.lastYear(); } //处理年 @@ -298,6 +309,28 @@ public class HomeServiceImpl implements HomeService { return response; } + /** + * 经营数据： + * 1.待发货订单，2.退款中订单，3.待核销订单，4.库存预警 + * 5.上架商品数，6.库存中商品数，7.提现待审核，8.账户充值 + * @return HomeOperatingDataResponse + */ + @Override + public HomeOperatingDataResponse operatingData() { + HomeOperatingDataResponse response = new HomeOperatingDataResponse(); + response.setNotShippingOrderNum(storeOrderService.getNotShippingNum()); + response.setRefundingOrderNum(storeOrderService.getRefundingNum()); + response.setNotWriteOffOrderNum(storeOrderService.getNotWriteOffNum()); + response.setVigilanceInventoryNum(storeProductService.getVigilanceInventoryNum()); + response.setOnSaleProductNum(storeProductService.getOnSaleNum()); + response.setNotSaleProductNum(storeProductService.getNotSaleNum()); + response.setNotAuditNum(userExtractService.getNotAuditNum()); + BigDecimal totalRechargeAmount = userRechargeService.getTotalPrice(); + BigDecimal BrokerageToYueAmount = brokerageRecordService.getTotalYuePrice(); + response.setTotalRechargeAmount(totalRechargeAmount.add(BrokerageToYueAmount)); + return response; + } + /** * 组装订单统计返回数据 * @author Mr.Zhang diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/LogisticsServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/LogisticsServiceImpl.java index ea018a24..db98de08 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/LogisticsServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/LogisticsServiceImpl.java @@ -30,7 +30,7 @@ import java.util.concurrent.TimeUnit; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -76,7 +76,7 @@ public class LogisticsServiceImpl implements LogisticService { return JSONObject.toJavaObject(result, LogisticsResultVo.class); } String logisticsType = systemConfigService.getValueByKeyException("logistics_type"); - if ("1".equals(logisticsType)) {// 平台查询 + if (logisticsType.equals("1")) {// 平台查询 OnePassLogisticsQueryVo queryVo = onePassService.exprQuery(expressNo, com); if (ObjectUtil.isNull(queryVo)) { return resultVo; @@ -86,11 +86,11 @@ public class LogisticsServiceImpl implements LogisticService { String jsonString = JSONObject.toJSONString(resultVo); saveCache(JSONObject.parseObject(jsonString)); } - if ("2".equals(logisticsType)) {// 阿里云查询 + if (logisticsType.equals("2")) {// 阿里云查询 String appCode = systemConfigService.getValueByKey(Constants.CONFIG_KEY_LOGISTICS_APP_CODE); // 顺丰请输入单号 : 收件人或寄件人手机号后四位。例如：123456789:1234 - if (StrUtil.isNotBlank(com) && "shunfengkuaiyun".equals(com)) { + if (StrUtil.isNotBlank(com) && com.equals("shunfengkuaiyun")) { expressNo = expressNo.concat(":").concat(StrUtil.sub(phone, 7, -1)); } String url = Constants.LOGISTICS_API_URL + "?no=" + expressNo; @@ -162,7 +162,7 @@ public class LogisticsServiceImpl implements LogisticService { * @since 2020-07-06 */ private void checkResult(JSONObject data) { - if (!"0".equals(data.getString("status"))){ + if (!data.getString("status").equals("0")){ throw new CrmebException(data.getString("msg")); } } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OnePassServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OnePassServiceImpl.java index d28fe713..7b71e879 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OnePassServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OnePassServiceImpl.java @@ -3,13 +3,17 @@ package com.zbkj.service.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.crypto.SecureUtil; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.zbkj.common.constants.Constants; import com.zbkj.common.request.*; +import com.zbkj.common.request.onepass.OnePassLoginRequest; +import com.zbkj.common.request.onepass.OnePassShipmentCancelOrderRequest; +import com.zbkj.common.request.onepass.OnePassShipmentCreateOrderRequest; import com.zbkj.common.vo.MyRecord; import com.zbkj.common.constants.OnePassConstants; import com.zbkj.common.exception.CrmebException; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.common.utils.RedisUtil; import com.zbkj.common.utils.ValidateFormUtil; import com.zbkj.common.model.express.Express; @@ -17,8 +21,11 @@ import com.zbkj.common.vo.OnePassLoginVo; import com.zbkj.common.vo.OnePassLogisticsQueryVo; import com.zbkj.service.service.ExpressService; import com.zbkj.service.service.OnePassService; +import com.zbkj.service.service.StoreOrderService; import com.zbkj.service.service.SystemConfigService; import com.zbkj.service.util.OnePassUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.support.TransactionTemplate; @@ -46,6 +53,8 @@ import java.util.concurrent.TimeUnit; @Service public class OnePassServiceImpl implements OnePassService { + private final Logger logger = LoggerFactory.getLogger(OnePassServiceImpl.class); + @Autowired private SystemConfigService systemConfigService; @@ -61,88 +70,165 @@ public class OnePassServiceImpl implements OnePassService { @Autowired private ExpressService expressService; + @Autowired + private StoreOrderService storeOrderService; + /** - * 获取用户验证码 + * 保存一号通应用信息 * - * @param phone 手机号 + * @param request 一号通服务中申请的应用信息 + * @return 保存结果 */ @Override - public Object sendUserCode(String phone, Integer types) { - ValidateFormUtil.isPhoneException(phone); - MultiValueMap map = new LinkedMultiValueMap<>(); - map.add("phone", phone); - if (ObjectUtil.isNotNull(types)) { - map.add("types", types); - } - return onePassUtil.postFrom(OnePassConstants.ONE_PASS_API_URL + OnePassConstants.REGISTER_CAPTCHA_URI, map, null); + public Boolean saveOnePassApplicationInfo(OnePassLoginRequest request) { + setConfigSmsInfo(request.getAccessKey(), request.getSecretKey()); + return Boolean.TRUE; } /** - * 注册用户 + * 获取一号通应用信息 * - * @param registerRequest 注册参数 - * @return String + * @return 一号通应用信息 */ @Override - public String register(OnePassRegisterRequest registerRequest) { - ValidateFormUtil.isPhoneException(registerRequest.getPhone()); - MultiValueMap map = new LinkedMultiValueMap<>(); - map.add("account", registerRequest.getAccount()); - map.add("password", SecureUtil.md5(registerRequest.getPassword())); - map.add("phone", registerRequest.getPhone()); - map.add("verify_code", registerRequest.getCode()); - map.add("url", registerRequest.getDomain()); - JSONObject post = onePassUtil.postFrom(OnePassConstants.ONE_PASS_API_URL + OnePassConstants.USER_REGISTER_URI, map, null); + public OnePassLoginRequest getOnePassApplicationInfo() { + return getConfigSmsInfo(); + } - // 获取token存入Redis - String accessToken = OnePassConstants.ONE_PASS_USER_TOKEN_PREFIX.concat(post.getJSONObject("data").getString("access_token")); - Long expiresIn = post.getJSONObject("data").getLong("expires_in"); - expiresIn = expiresIn - DateUtil.getTime(); - String secret = SecureUtil.md5(registerRequest.getPhone() + SecureUtil.md5(registerRequest.getPassword())); - redisUtil.set(StrUtil.format(OnePassConstants.ONE_PASS_TOKEN_KEY_PREFIX, secret), accessToken, expiresIn, TimeUnit.SECONDS); + /** + * 商家寄件 + * + * @param request 寄件请求对象 + * @return 寄件返回数据 + */ + @Override + public JSONObject shipmentCreateOrder(OnePassShipmentCreateOrderRequest request) { + OnePassLoginVo loginVo = onePassUtil.getLoginVo(); + String accessToken = onePassUtil.getToken(loginVo); + HashMap header = onePassUtil.getCommonHeader(accessToken); + setOnePassShipmentCallbackURL(request); + MultiValueMap param = new LinkedMultiValueMap<>(); + param.add("kuaidicom", request.getKuaidicom()); + param.add("man_name", request.getManName()); + param.add("phone",request.getPhone()); + param.add("address",request.getAddress()); + param.add("send_real_name",request.getSendRealName()); + param.add("send_phone",request.getSendPhone()); + param.add("send_address",request.getSendAddress()); + param.add("call_back_url",request.getCallBackUrl()); + param.add("cargo",request.getCargo()); + param.add("service_type",request.getServiceType()); + param.add("payment",request.getPayment()); + param.add("weight",request.getWeight()); + param.add("remark",request.getRemark()); + param.add("day_type",request.getDayType()); + param.add("pickup_start_time",request.getPickupStartTime()); + param.add("pickup_end_time",request.getPickupEndTime()); + param.add("channel_sw",request.getChannelSw()); + param.add("valins_pay",request.getValinsPay()); + param.add("real_name",request.getRealName()); + param.add("send_id_card_type",request.getSendIdCardType()); + param.add("send_id_card",request.getSendIdCard()); + param.add("password_signing",request.getPasswordSigning()); + param.add("op",request.getOp()); + param.add("return_type",request.getReturnType()); + param.add("siid",request.getSiid()); + param.add("tempid",request.getTempid()); + logger.info("一号通-商家寄件:参数:{}", param); + JSONObject jsonObject = onePassUtil.postFrom(OnePassConstants.ONE_PASS_API_URL + OnePassConstants.ONE_PASS_API_SHIPMENT_CREATE_ORDER_URI, param, header); + logger.info("一号通-商家寄件:结果:{}", jsonObject); + return jsonObject.getJSONObject("data"); + } - //更新配置 - setConfigSmsInfo(registerRequest.getPhone(), registerRequest.getPassword()); - return post.getString("msg"); + /** + * 取消商家寄件 + * + * @param request 取消商家寄件请求对象 + * @return 取消寄件返回对象 + */ + @Override + public JSONObject shipmentCancelOrder(OnePassShipmentCancelOrderRequest request) { + OnePassLoginVo loginVo = onePassUtil.getLoginVo(); + String accessToken = onePassUtil.getToken(loginVo); + HashMap header = onePassUtil.getCommonHeader(accessToken); + + MultiValueMap param = new LinkedMultiValueMap<>(); + param.add("task_id", request.getTaskId()); + param.add("order_id", request.getOrderId()); + param.add("cancel_msg",request.getCancelMsg()); + JSONObject jsonObject = onePassUtil.postFrom(OnePassConstants.ONE_PASS_API_URL + OnePassConstants.ONE_PASS_API_SHIPMENT_CANCEL_ORDER_URI, param, header); + logger.info("一号通-商家取消寄件 :{}", jsonObject); + return jsonObject.getJSONObject("data"); + } + + /** + * 获取商家寄件所需的快递公司列表 + * + * @return 商家寄件功能对应的快递公司列表 + */ + @Override + public JSONObject shipmentComs() { + OnePassLoginVo loginVo = onePassUtil.getLoginVo(); + String accessToken = onePassUtil.getToken(loginVo); + HashMap header = onePassUtil.getCommonHeader(accessToken); + JSONObject jsonObject = onePassUtil.getData(OnePassConstants.ONE_PASS_API_URL + OnePassConstants.ONE_PASS_API_SHIPMENT_GET_KUAIDI_COMS_URI, header); + logger.info("一号通-商家寄件-物流地址 :{}", jsonObject); + return jsonObject; + } + + /** + * 商家寄件功能对应的回调 + * order_success 下单成功回调 + * order_take 取件回调 + * order_cancel 用户主动取消回调 + * order_fail 下单失败回调 + * order_receipt 快递签收回调 + * @return 回调数据 + */ + @Override + public Boolean shipmentCallBackMethod(String type, String data) { + logger.info("一号通-商家寄件-回调:type:{}", type); + logger.info("一号通-商家寄件-回调:data:{}", data); + JSONObject jsonObject = new JSONObject(); + try { + jsonObject = JSON.parseObject(com.zbkj.common.utils.OnePassUtil.decrypt(data)); + } catch (Exception e) { + e.printStackTrace(); + logger.error("一号通商家寄件 解密数据失败:{}", e.getMessage()); + } + switch (type){ + case "order_success": + break; + case "order_take": // 取件回调 + storeOrderService.expressForOnePassShipmentTakeCallBack(jsonObject); + break; + case "order_cancel": + case "order_fail": // 下单失败回调 清理掉所有商家寄件的数据 + storeOrderService.expressForOnePassShipmentCancelCallBack(jsonObject); + break; + case "order_receipt": // todo 一号通新增接口，后期可以规划和订单签收结果合并 + break; + + } + + return Boolean.TRUE; } /** * 用户登录 */ @Override - public MyRecord login(OnePassLoginRequest request) { + public Boolean login(OnePassLoginRequest request) { MultiValueMap param = new LinkedMultiValueMap<>(); - param.add("account", request.getAccount()); - String secret = SecureUtil.md5(request.getAccount() + SecureUtil.md5(request.getPassword())); - param.add("secret", secret); + param.add(OnePassConstants.ONE_PASS_ACCESS_KEY, request.getAccessKey()); + param.add(OnePassConstants.ONE_PASS_SECRET_KEY, request.getSecretKey()); JSONObject jsonObject = onePassUtil.postFrom(OnePassConstants.ONE_PASS_API_URL + OnePassConstants.USER_LOGIN_URI, param, null); - setConfigSmsInfo(request.getAccount(), request.getPassword()); String accessToken = OnePassConstants.ONE_PASS_USER_TOKEN_PREFIX.concat(jsonObject.getJSONObject("data").getString("access_token")); Long expiresIn = jsonObject.getJSONObject("data").getLong("expires_in"); - expiresIn = expiresIn - DateUtil.getTime(); - redisUtil.set(StrUtil.format(OnePassConstants.ONE_PASS_TOKEN_KEY_PREFIX, secret), accessToken, expiresIn, TimeUnit.SECONDS); - MyRecord record = new MyRecord(); - record.set("account", request.getAccount()); - return record; - } - - /** - * 判断是否登录 - */ - @Override - public MyRecord isLogin() { - OnePassLoginVo loginVo; - MyRecord record = new MyRecord(); - try { - loginVo = onePassUtil.getLoginVo(); - } catch (Exception e) { - return record.set("status", false); - } - onePassUtil.getToken(loginVo); - record.set("status", true); - record.set("info", loginVo.getAccount()); - return record; + expiresIn = expiresIn - CrmebDateUtil.getTime(); + redisUtil.set(StrUtil.format(OnePassConstants.ONE_PASS_TOKEN_KEY_PREFIX, request.getAccessKey()), accessToken, expiresIn, TimeUnit.SECONDS); + return true; } /** @@ -154,13 +240,13 @@ public class OnePassServiceImpl implements OnePassService { // 判断是否开通电子面单 JSONObject dump = info.getJSONObject("dump"); Integer open = dump.getInteger("open"); - if (open.equals(1)) { - String exportSiid = systemConfigService.getValueByKey("config_export_siid");// 打印机编号 - if (StrUtil.isBlank(exportSiid)) { - dump.put("open", 0); - info.put("dump", dump); - } - } +// if (open.equals(1)) { +// String exportSiid = systemConfigService.getValueByKey("config_export_siid");// 打印机编号 +// if (StrUtil.isBlank(exportSiid)) { +// dump.put("open", 0); +// info.put("dump", dump); +// } +// } return info; } @@ -170,127 +256,10 @@ public class OnePassServiceImpl implements OnePassService { HashMap header = onePassUtil.getCommonHeader(accessToken); JSONObject jsonObject = onePassUtil.postFrom(OnePassConstants.ONE_PASS_API_URL + OnePassConstants.USER_INFO_URI, null, header); JSONObject data = jsonObject.getJSONObject("data"); - data.put("account", loginVo.getAccount()); + data.put("account", loginVo.getAccessKey()); return data; } - /** - * 用户注销 - */ - @Override - public Boolean logOut() { - OnePassLoginVo loginVo = onePassUtil.getLoginVo(); - boolean exists = redisUtil.exists(StrUtil.format(OnePassConstants.ONE_PASS_TOKEN_KEY_PREFIX, loginVo.getSecret())); - if (exists) { - redisUtil.delete(StrUtil.format(OnePassConstants.ONE_PASS_TOKEN_KEY_PREFIX, loginVo.getSecret())); - } - setConfigSmsInfo("", ""); - return true; - } - - /** - * 修改密码 - * - * @param request 修改密码参数 - * @return Boolean - */ - @Override - public Boolean updatePassword(OnePassUpdateRequest request) { - ValidateFormUtil.isPhoneException(request.getPhone()); - MultiValueMap map = new LinkedMultiValueMap<>(); - map.add("account", request.getAccount()); - map.add("password", SecureUtil.md5(request.getPassword())); - map.add("phone", request.getPhone()); - map.add("verify_code", request.getCode()); - onePassUtil.postFrom(OnePassConstants.ONE_PASS_API_URL + OnePassConstants.USER_UPDATE_PASSWORD_URI, map, null); - - setConfigSmsInfo("", ""); - return true; - } - - /** - * 修改用户手机 - * - * @param request 修改手机参数 - * @return Boolean - */ - @Override - public Boolean updatePhone(OnePassUpdateRequest request) { - ValidateFormUtil.isPhoneException(request.getPhone()); - MultiValueMap map = new LinkedMultiValueMap<>(); - map.add("account", request.getAccount()); - map.add("phone", request.getPhone()); - map.add("verify_code", request.getCode()); - - OnePassLoginVo loginVo = onePassUtil.getLoginVo(); - String token = onePassUtil.getToken(loginVo); - HashMap header = onePassUtil.getCommonHeader(token); - onePassUtil.postFrom(OnePassConstants.ONE_PASS_API_URL + OnePassConstants.USER_UPDATE_PHONE_URI, map, header); - onePassUtil.removeToken(loginVo); - setConfigSmsInfo("", ""); - return true; - } - - /** - * 套餐列表 - * - * @param type 套餐类型：sms,短信；expr_query,物流查询；expr_dump,电子面单；copy,产品复制 - * @return JSONObject - */ - @Override - public JSONObject mealList(String type) { - if (!validateMealType(type)) throw new CrmebException("请选择正确的套餐类型"); - - MultiValueMap params = new LinkedMultiValueMap<>(); - params.add("type", type); - String token = onePassUtil.getToken(); - HashMap header = onePassUtil.getCommonHeader(token); - - JSONObject jsonObject = onePassUtil.postFrom(OnePassConstants.ONE_PASS_API_URL + OnePassConstants.ONE_PASS_MEAL_LIST_URI, params, header); - return jsonObject.getJSONObject("data"); - } - - /** - * 套餐购买 - * - * @param request 购买参数 - */ - @Override - public JSONObject mealCode(MealCodeRequest request) { - if (!validateMealType(request.getType())) throw new CrmebException("请选择正确的套餐类型"); - // 获取用户详情 - String token = onePassUtil.getToken(); - HashMap header = onePassUtil.getCommonHeader(token); - JSONObject jsonObject = onePassUtil.postFrom(OnePassConstants.ONE_PASS_API_URL + OnePassConstants.USER_INFO_URI, null, header); - JSONObject data = jsonObject.getJSONObject("data"); - - boolean isGrant = false; - switch (request.getType()) { - case OnePassConstants.ONE_PASS_MEAL_TYPE_SMS: - isGrant = data.getJSONObject("sms").getInteger("open").equals(1); - break; - case OnePassConstants.ONE_PASS_MEAL_TYPE_EXPR: - isGrant = data.getJSONObject("query").getInteger("open").equals(1); - break; - case OnePassConstants.ONE_PASS_MEAL_TYPE_DUMP: - isGrant = data.getJSONObject("dump").getInteger("open").equals(1); - break; - case OnePassConstants.ONE_PASS_MEAL_TYPE_COPY: - isGrant = data.getJSONObject("copy").getInteger("open").equals(1); - break; - } - if (!isGrant) throw new CrmebException("请先开通对应的服务"); - - MultiValueMap params = new LinkedMultiValueMap<>(); - params.add("meal_id", request.getMealId()); - params.add("price", request.getPrice()); - params.add("num", request.getNum()); - params.add("type", request.getType()); - params.add("pay_type", request.getPayType()); - - JSONObject post = onePassUtil.postFrom(OnePassConstants.ONE_PASS_API_URL + OnePassConstants.ONE_PASS_MEAL_CODE_URI, params, header); - return post.getJSONObject("data"); - } /** * 服务开通 @@ -320,35 +289,7 @@ public class OnePassServiceImpl implements OnePassService { return open; } - /** - * 用量记录 - * @param request 用量记录查询参数 - */ - @Override - public JSONObject userRecord(OnePassUserRecordRequest request) { - if (!validateMealType(request.getType())) throw new CrmebException("请选择正确的记录类型"); - MultiValueMap params = new LinkedMultiValueMap<>(); - params.add("type", request.getType()); - params.add("page", request.getPage()); - params.add("limit", request.getLimit()); - if (OnePassConstants.ONE_PASS_MEAL_TYPE_SMS.equals(request.getType())) { -// int status = 3;// 查询全部状态 - if (ObjectUtil.isNotNull(request.getStatus()) && request.getStatus() != 3) { - params.add("status", request.getStatus()); - } - } - String token = onePassUtil.getToken(); - HashMap header = onePassUtil.getCommonHeader(token); - JSONObject jsonObject = onePassUtil.postFrom(OnePassConstants.ONE_PASS_API_URL + OnePassConstants.ONE_PASS_USER_RECORD_URI, params, header); - return jsonObject.getJSONObject("data"); - } - /** - * 复制平台商品 - * @param url 商品链接 - * 平台复制商品示例 - * {"msg":"ok","data":{"image":"http://img.alicdn.com/imgextra/i2/2201504973406/O1CN01C7wCJe1b1zdtDz50j_!!2201504973406.jpg","store_info":"豹纹衣身,潮酷有型","give_integral":0,"cost":0,"temp_id":"","description_images":["http://img.alicdn.com/imgextra/i3/2201504973406/O1CN01tGSA611b1zaDd3sOk_!!2201504973406.jpg","http://img.alicdn.com/imgextra/i1/2201504973406/O1CN01zrSHcP1b1zaPZB9IR_!!2201504973406.jpg","http://img.alicdn.com/imgextra/i2/2201504973406/O1CN01X8KO5g1b1zaJcCOaN_!!2201504973406.jpg","http://img.alicdn.com/imgextra/i2/2201504973406/O1CN01cS03ht1b1zaNO9kKJ_!!2201504973406.jpg","http://img.alicdn.com/imgextra/i1/2201504973406/O1CN01cCfVkZ1b1zaLXTr3v_!!2201504973406.jpg","http://img.alicdn.com/imgextra/i4/2201504973406/O1CN01zqsHfb1b1zaONUmg7_!!2201504973406.jpg","http://img.alicdn.com/imgextra/i1/2201504973406/O1CN01pD7WGr1b1zaLujJVA_!!2201504973406.jpg","http://img.alicdn.com/imgextra/i4/2201504973406/O1CN01hB0cth1b1zaONVO6K_!!2201504973406.jpg","http://img.alicdn.com/imgextra/i4/2201504973406/O1CN01aAWvO51b1zaLNWxzL_!!2201504973406.jpg","http://img.alicdn.com/imgextra/i4/2201504973406/O1CN01DweEqg1b1zaLXSBBL_!!2201504973406.jpg","http://img.alicdn.com/imgextra/i1/2201504973406/O1CN01bk0dqy1b1zaMlYKrE_!!2201504973406.jpg","http://img.alicdn.com/imgextra/i1/2201504973406/O1CN01PwOQL41b1zaJFfOVL_!!2201504973406.jpg","http://img.alicdn.com/imgextra/i1/2201504973406/O1CN01Npc2Nx1b1zaLXSmZ2_!!2201504973406.jpg","http://img.alicdn.com/imgextra/i3/2201504973406/O1CN01CYZLU51b1zaDd2fZG_!!2201504973406.jpg","http://img.alicdn.com/imgextra/i1/2201504973406/O1CN01tXnKqb1b1zaJcAqxs_!!2201504973406.jpg","http://img.alicdn.com/imgextra/i3/2201504973406/O1CN0145DNqP1b1zaLuhZRf_!!2201504973406.jpg","http://img.alicdn.com/imgextra/i1/2201504973406/O1CN01QBjDyr1b1zaPZ9wTi_!!2201504973406.jpg","http://img.alicdn.com/imgextra/i3/2201504973406/O1CN01120POL1b1zaNOAHdT_!!2201504973406.jpg","http://img.alicdn.com/imgextra/i1/2201504973406/O1CN01C0YYiq1b1zaLNXdZZ_!!2201504973406.jpg","http://img.alicdn.com/imgextra/i4/2201504973406/O1CN01txpuLk1b1zaNO9LQZ_!!2201504973406.jpg"],"description":"","cate_id":"","slider_image":["http://img.alicdn.com/imgextra/i2/2201504973406/O1CN01C7wCJe1b1zdtDz50j_!!2201504973406.jpg","http://img.alicdn.com/imgextra/i4/2201504973406/O1CN01y07EFV1b1zaLru5es_!!2201504973406.jpg","http://img.alicdn.com/imgextra/i3/2201504973406/O1CN01dvxZXQ1b1zaJFgGWj_!!2201504973406.jpg","http://img.alicdn.com/imgextra/i2/2201504973406/O1CN0178H0r51b1zaLrvZ56_!!2201504973406.jpg","http://img.alicdn.com/imgextra/i3/2201504973406/O1CN01Rw9wYQ1b1zaPznzFQ_!!2201504973406.jpg"],"soure_link":"","attrs":[],"unit_name":"件","postage":0,"video_link":"","price":0,"store_name":"CacheCache短袖t恤女装2019新款潮豹纹牛油果绿抹茶绿古着感少女","ficti":0,"keyword":"","stock":0,"add_time":0,"items":[{"detail":["160/84A/S","165/88A/M","170/92A/L","175/96A/XL"],"value":"尺码"},{"detail":["蜡黄色/757"],"value":"主要颜色"}],"ot_price":0,"info":{"header":[{"minWidth":120,"title":"尺码","align":"center","key":"value1"},{"minWidth":120,"title":"主要颜色","align":"center","key":"value2"},{"minWidth":80,"slot":"pic","title":"图片","align":"center"},{"minWidth":95,"slot":"price","title":"售价","align":"center"},{"minWidth":95,"slot":"cost","title":"成本价","align":"center"},{"minWidth":95,"slot":"ot_price","title":"原价","align":"center"},{"minWidth":95,"slot":"stock","title":"库存","align":"center"},{"minWidth":120,"slot":"bar_code","title":"商品编号","align":"center"},{"minWidth":95,"slot":"weight","title":"重量(KG)","align":"center"},{"minWidth":95,"slot":"volume","title":"体积(m³)","align":"center"},{"minWidth":70,"slot":"action","title":"操作","align":"center"}],"attr":[{"detail":["160/84A/S","165/88A/M","170/92A/L","175/96A/XL"],"value":"尺码"},{"detail":["蜡黄色/757"],"value":"主要颜色"}],"value":[{"brokerage":0,"cost":0,"value2":"蜡黄色/757","value1":"160/84A/S","weight":0,"pic":"","volume":0,"brokerage_two":0,"price":0,"bar_code":"","detail":{"主要颜色":"蜡黄色/757","尺码":"160/84A/S"},"stock":0,"ot_price":0},{"brokerage":0,"cost":0,"value2":"蜡黄色/757","value1":"165/88A/M","weight":0,"pic":"","volume":0,"brokerage_two":0,"price":0,"bar_code":"","detail":{"主要颜色":"蜡黄色/757","尺码":"165/88A/M"},"stock":0,"ot_price":0},{"brokerage":0,"cost":0,"value2":"蜡黄色/757","value1":"170/92A/L","weight":0,"pic":"","volume":0,"brokerage_two":0,"price":0,"bar_code":"","detail":{"主要颜色":"蜡黄色/757","尺码":"170/92A/L"},"stock":0,"ot_price":0},{"brokerage":0,"cost":0,"value2":"蜡黄色/757","value1":"175/96A/XL","weight":0,"pic":"","volume":0,"brokerage_two":0,"price":0,"bar_code":"","detail":{"主要颜色":"蜡黄色/757","尺码":"175/96A/XL"},"stock":0,"ot_price":0}]}},"status":200} - */ @Override public JSONObject copyGoods(String url) { HashMap header = onePassUtil.getCommonHeader(onePassUtil.getToken()); @@ -390,46 +331,40 @@ public class OnePassServiceImpl implements OnePassService { params.add("num", expressNo); JSONObject post = onePassUtil.postFrom(OnePassConstants.ONE_PASS_API_URL + OnePassConstants.ONE_PASS_API_EXPRESS_QUEARY_URI, params, header); String dataStr = post.getString("data"); - if (StrUtil.isBlank(dataStr) || "[]".equals(dataStr)) { + if (StrUtil.isBlank(dataStr) || dataStr.equals("[]")) { return null; } JSONObject jsonObject = post.getJSONObject("data"); return JSONObject.toJavaObject(jsonObject, OnePassLogisticsQueryVo.class); } - /** - * 修改手机号——验证账号密码 - * @return Boolean - */ - @Override - public Boolean beforeUpdatePhoneValidator(OnePassLoginRequest request) { - OnePassLoginVo loginVo = onePassUtil.getLoginVo(); - if (!loginVo.getAccount().equals(request.getAccount())) { - throw new CrmebException("账号不匹配"); - } - String secret = SecureUtil.md5(request.getAccount() + SecureUtil.md5(request.getPassword())); - if (!loginVo.getSecret().equals(secret)) { - throw new CrmebException("密码不匹配"); - } - return Boolean.TRUE; - } /** * 校验一号通账号是否配置 */ @Override public Boolean checkAccount() { - String account = systemConfigService.getValueByKey("sms_account");// 获取配置账号 + String account = systemConfigService.getValueByKey(OnePassConstants.ONE_PASS_ACCESS_KEY);// 获取配置账号 if (StrUtil.isBlank(account)) { return Boolean.FALSE; } - String token = systemConfigService.getValueByKey("sms_token"); //获取配置密码 + String token = systemConfigService.getValueByKey(OnePassConstants.ONE_PASS_SECRET_KEY); //获取配置密码 if (StrUtil.isBlank(token)) { return Boolean.FALSE; } return Boolean.TRUE; } + + + + + + + + + ///////////////////////////////////////////////////// 工具方法 + /** * 物流、电子面单开通参数校验 */ @@ -536,19 +471,37 @@ public class OnePassServiceImpl implements OnePassService { } /** - * 更新sms配置信息 + * 配置一号通应用 appid 和 密钥信息 * - * @param account 账号 - * @param password 密码 - * @author Mr.Zhang - * @since 2020-04-16 + * @param accessKey 账号 + * @param secretKey 密码 */ - private void setConfigSmsInfo(String account, String password) { - boolean accountResult = systemConfigService.updateOrSaveValueByName("sms_account", account); - boolean tokenResult = systemConfigService.updateOrSaveValueByName("sms_token", password); + private void setConfigSmsInfo(String accessKey, String secretKey) { + boolean accountResult = systemConfigService.updateOrSaveValueByName(OnePassConstants.ONE_PASS_ACCESS_KEY, accessKey); + boolean tokenResult = systemConfigService.updateOrSaveValueByName(OnePassConstants.ONE_PASS_SECRET_KEY, secretKey); if (!accountResult || !tokenResult) { throw new CrmebException("数据更新失败！"); } } + + + /** + * 获取一号通 应用配置信息 + * @return 应用配置 + */ + private OnePassLoginRequest getConfigSmsInfo() { + OnePassLoginRequest onePassLoginRequest = new OnePassLoginRequest(); + onePassLoginRequest.setAccessKey(systemConfigService.getValueByKey(OnePassConstants.ONE_PASS_ACCESS_KEY)); + onePassLoginRequest.setSecretKey(systemConfigService.getValueByKey(OnePassConstants.ONE_PASS_SECRET_KEY)); + return onePassLoginRequest; + } + + /** + * 一号通 商家发货 获取预置好的回调地址 + */ + private void setOnePassShipmentCallbackURL(OnePassShipmentCreateOrderRequest request){ + request.setCallBackUrl(systemConfigService.getValueByKey(Constants.CONFIG_KEY_API_URL) + OnePassConstants.ONE_PASS_API_SHIPMENT_CALLBACK_URI); + } + } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderPayServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderPayServiceImpl.java index a1cf0a41..6b6e0bc3 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderPayServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderPayServiceImpl.java @@ -2,9 +2,12 @@ package com.zbkj.service.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; + import com.alibaba.fastjson.JSONObject; + import com.zbkj.common.constants.*; import com.zbkj.common.exception.CrmebException; import com.zbkj.common.model.combination.StoreCombination; @@ -19,10 +22,12 @@ import com.zbkj.common.model.sms.SmsTemplate; import com.zbkj.common.model.system.SystemAdmin; import com.zbkj.common.model.system.SystemNotification; import com.zbkj.common.model.user.*; + import com.zbkj.common.request.OrderPayRequest; import com.zbkj.common.response.OrderPayResultResponse; +import com.zbkj.common.response.PayConfigResponse; import com.zbkj.common.utils.CrmebUtil; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.common.utils.RedisUtil; import com.zbkj.common.utils.WxPayUtil; import com.zbkj.common.vo.*; @@ -37,7 +42,9 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.support.TransactionTemplate; + import java.math.BigDecimal; + import java.util.HashMap; import java.util.List; import java.util.Map; @@ -50,7 +57,7 @@ import java.util.stream.Collectors; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -160,13 +167,29 @@ public class OrderPayServiceImpl implements OrderPayService { @Autowired private SmsTemplateService smsTemplateService; + /** + * 获取支付配置 + */ + @Override + public PayConfigResponse getPayConfig() { + String payWxOpen = systemConfigService.getValueByKey(SysConfigConstants.CONFIG_PAY_WEIXIN_OPEN); + String yuePayStatus = systemConfigService.getValueByKey(SysConfigConstants.CONFIG_YUE_PAY_STATUS); + PayConfigResponse response = new PayConfigResponse(); + response.setYuePayStatus(Constants.CONFIG_FORM_SWITCH_OPEN.equals(yuePayStatus)); + response.setPayWechatOpen(Constants.CONFIG_FORM_SWITCH_OPEN.equals(payWxOpen)); + if (Constants.CONFIG_FORM_SWITCH_OPEN.equals(yuePayStatus)) { + User user = userService.getInfo(); + response.setUserBalance(user.getNowMoney()); + } + return response; + } + /** * 支付成功处理 * @param storeOrder 订单 */ @Override public Boolean paySuccess(StoreOrder storeOrder) { - User user = userService.getById(storeOrder.getUid()); List billList = CollUtil.newArrayList(); @@ -210,15 +233,15 @@ public class OrderPayServiceImpl implements OrderPayService { // 获取商品额外赠送积分 List orderInfoList = storeOrderInfoService.getListByOrderNo(storeOrder.getOrderId()); if (orderInfoList.get(0).getProductType().equals(0)) { - List productIds = orderInfoList.stream().map(StoreOrderInfo::getProductId).collect(Collectors.toList()); - if (productIds.size() > 0) { - List products = storeProductService.getListInIds(productIds); - int sumIntegral = products.stream().mapToInt(StoreProduct::getGiveIntegral).sum(); - if (sumIntegral > 0) { - // 生成积分记录 - UserIntegralRecord integralRecord = integralRecordInit(storeOrder, user.getIntegral(), sumIntegral, "product"); - integralList.add(integralRecord); - } + int sumIntegral = 0; + for (StoreOrderInfo orderInfo : orderInfoList) { + StoreProduct product = storeProductService.getById(orderInfo.getProductId()); + sumIntegral += product.getGiveIntegral() * orderInfo.getPayNum(); + } + if (sumIntegral > 0) { + // 生成积分记录 + UserIntegralRecord integralRecord = integralRecordInit(storeOrder, user.getIntegral(), sumIntegral, "product"); + integralList.add(integralRecord); } } @@ -233,9 +256,9 @@ public class OrderPayServiceImpl implements OrderPayService { // 分销员逻辑 if (!user.getIsPromoter()) { String funcStatus = systemConfigService.getValueByKey(SysConfigConstants.CONFIG_KEY_BROKERAGE_FUNC_STATUS); - if ("1".equals(funcStatus)) { + if (funcStatus.equals("1")) { String broQuota = systemConfigService.getValueByKey(SysConfigConstants.CONFIG_KEY_STORE_BROKERAGE_QUOTA); - if (!"-1".equals(broQuota) && storeOrder.getPayPrice().compareTo(new BigDecimal(broQuota)) >= 0) {// -1 不成为分销员 + if (!broQuota.equals("-1") && storeOrder.getPayPrice().compareTo(new BigDecimal(broQuota)) >= 0) {// -1 不成为分销员 user.setIsPromoter(true); user.setPromoterTime(cn.hutool.core.date.DateUtil.date()); } @@ -247,6 +270,7 @@ public class OrderPayServiceImpl implements OrderPayService { storeOrderStatusService.createLog(storeOrder.getId(), Constants.ORDER_LOG_PAY_SUCCESS, Constants.ORDER_LOG_MESSAGE_PAY_SUCCESS); // 用户信息变更 + user.setUpdateTime(DateUtil.date()); userService.updateById(user); //资金变动 @@ -413,7 +437,7 @@ public class OrderPayServiceImpl implements OrderPayService { private List assignCommission(StoreOrder storeOrder) { // 检测商城是否开启分销功能 String isOpen = systemConfigService.getValueByKey(Constants.CONFIG_KEY_STORE_BROKERAGE_IS_OPEN); - if(StrUtil.isBlank(isOpen) || "0".equals(isOpen)){ + if(StrUtil.isBlank(isOpen) || isOpen.equals("0")){ return CollUtil.newArrayList(); } // 营销产品不参与 @@ -446,7 +470,7 @@ public class OrderPayServiceImpl implements OrderPayService { brokerageRecord.setMark(StrUtil.format("获得推广佣金，分佣{}", brokerage)); brokerageRecord.setStatus(BrokerageRecordConstants.BROKERAGE_RECORD_STATUS_CREATE); brokerageRecord.setFrozenTime(Integer.valueOf(Optional.ofNullable(fronzenTime).orElse("0"))); - brokerageRecord.setCreateTime(DateUtil.nowDateTime()); + brokerageRecord.setCreateTime(CrmebDateUtil.nowDateTime()); brokerageRecord.setBrokerageLevel(record.getInt("index")); return brokerageRecord; }).collect(Collectors.toList()); @@ -535,7 +559,7 @@ public class OrderPayServiceImpl implements OrderPayService { } // 判断分销模式 String model = systemConfigService.getValueByKey(Constants.CONFIG_KEY_STORE_BROKERAGE_MODEL); - if (StrUtil.isNotBlank(model) && "1".equals(model) && !spreadUser.getIsPromoter()) { + if (StrUtil.isNotBlank(model) && model.equals("1") && !spreadUser.getIsPromoter()) { // 指定分销模式下：不是推广员不参与分销 return recordList; } @@ -549,7 +573,7 @@ public class OrderPayServiceImpl implements OrderPayService { if (ObjectUtil.isNull(spreadSpreadUser)) { return recordList; } - if (StrUtil.isNotBlank(model) && "1".equals(model) && !spreadSpreadUser.getIsPromoter()) { + if (StrUtil.isNotBlank(model) && model.equals("1") && !spreadSpreadUser.getIsPromoter()) { // 指定分销模式下：不是推广员不参与分销 return recordList; } @@ -577,7 +601,8 @@ public class OrderPayServiceImpl implements OrderPayService { throw new CrmebException("用户积分不足"); } storeOrder.setPaid(true); - storeOrder.setPayTime(DateUtil.nowDateTime()); + storeOrder.setPayTime(CrmebDateUtil.nowDateTime()); + storeOrder.setUpdateTime(DateUtil.date()); Boolean execute = transactionTemplate.execute(e -> { // 订单修改 storeOrderService.updateById(storeOrder); @@ -642,6 +667,7 @@ public class OrderPayServiceImpl implements OrderPayService { storePinkService.save(storePink); // 如果是开团，需要更新订单数据 storeOrder.setPinkId(storePink.getId()); + storeOrder.setUpdateTime(DateUtil.date()); storeOrderService.updateById(storeOrder); } @@ -674,35 +700,34 @@ public class OrderPayServiceImpl implements OrderPayService { User user = userService.getById(storeOrder.getUid()); if (ObjectUtil.isNull(user)) throw new CrmebException("用户不存在"); - // 判断订单是否还是之前的支付类型 - if (!storeOrder.getPayType().equals(orderPayRequest.getPayType())) { - // 根据支付类型进行校验,更换支付类型 - storeOrder.setPayType(orderPayRequest.getPayType()); - // 余额支付 - if (orderPayRequest.getPayType().equals(PayConstants.PAY_TYPE_YUE)) { - if (user.getNowMoney().compareTo(storeOrder.getPayPrice()) < 0) { - throw new CrmebException("用户余额不足"); - } - storeOrder.setIsChannel(3); + // 根据支付类型进行校验,更换支付类型 + storeOrder.setPayType(orderPayRequest.getPayType()); + // 余额支付 + if (orderPayRequest.getPayType().equals(PayConstants.PAY_TYPE_YUE)) { + if (user.getNowMoney().compareTo(storeOrder.getPayPrice()) < 0) { + throw new CrmebException("用户余额不足"); } - if (orderPayRequest.getPayType().equals(PayConstants.PAY_TYPE_WE_CHAT)) { - switch (orderPayRequest.getPayChannel()){ - case PayConstants.PAY_CHANNEL_WE_CHAT_H5:// H5 - storeOrder.setIsChannel(2); - break; - case PayConstants.PAY_CHANNEL_WE_CHAT_PUBLIC:// 公众号 - storeOrder.setIsChannel(0); - break; - case PayConstants.PAY_CHANNEL_WE_CHAT_PROGRAM:// 小程序 - storeOrder.setIsChannel(1); - break; - } - } - - boolean changePayType = storeOrderService.updateById(storeOrder); - if (!changePayType) { - throw new CrmebException("变更订单支付类型失败!"); + storeOrder.setPayType(PayConstants.PAY_TYPE_YUE); + storeOrder.setIsChannel(3); + } + if (orderPayRequest.getPayType().equals(PayConstants.PAY_TYPE_WE_CHAT)) { + switch (orderPayRequest.getPayChannel()){ + case PayConstants.PAY_CHANNEL_WE_CHAT_H5:// H5 + storeOrder.setIsChannel(2); + break; + case PayConstants.PAY_CHANNEL_WE_CHAT_PUBLIC:// 公众号 + storeOrder.setIsChannel(0); + break; + case PayConstants.PAY_CHANNEL_WE_CHAT_PROGRAM:// 小程序 + storeOrder.setIsChannel(1); + break; } + storeOrder.setPayType(PayConstants.PAY_TYPE_WE_CHAT); + } + storeOrder.setUpdateTime(DateUtil.date()); + boolean changePayType = storeOrderService.updateById(storeOrder); + if (!changePayType) { + throw new CrmebException("变更订单支付类型失败!"); } if (user.getIntegral() < storeOrder.getUseIntegral()) { @@ -725,6 +750,7 @@ public class OrderPayServiceImpl implements OrderPayService { // 预下单 Map unifiedorder = unifiedorder(storeOrder, ip); response.setStatus(true); + WxPayJsResultVo vo = new WxPayJsResultVo(); vo.setAppId(unifiedorder.get("appId")); vo.setNonceStr(unifiedorder.get("nonceStr")); @@ -741,8 +767,10 @@ public class OrderPayServiceImpl implements OrderPayService { } // 更新商户订单号 storeOrder.setOutTradeNo(unifiedorder.get("outTradeNo")); + storeOrder.setUpdateTime(DateUtil.date()); storeOrderService.updateById(storeOrder); response.setJsConfig(vo); + return response; } // 余额支付 @@ -751,6 +779,7 @@ public class OrderPayServiceImpl implements OrderPayService { response.setStatus(yueBoolean); return response; } + if (storeOrder.getPayType().equals(PayConstants.PAY_TYPE_OFFLINE)) { throw new CrmebException("暂时不支持线下支付"); } @@ -774,9 +803,11 @@ public class OrderPayServiceImpl implements OrderPayService { if (storeOrder.getIsChannel() == 1) {// 小程序 userToken = userTokenService.getTokenByUserId(storeOrder.getUid(), 2); } - if (storeOrder.getIsChannel() == 2) {// H5 + // H5 + if (storeOrder.getIsChannel() == 2) { userToken.setToken(""); } + if (ObjectUtil.isNull(userToken)) { throw new CrmebException("该用户没有openId"); } @@ -816,7 +847,7 @@ public class OrderPayServiceImpl implements OrderPayService { String paySign = WxPayUtil.getSign(map, signKey); map.put("paySign", paySign); map.put("prepayId", responseVo.getPrepayId()); - map.put("prepayTime", DateUtil.nowDateTimeStr()); + map.put("prepayTime", CrmebDateUtil.nowDateTimeStr()); map.put("outTradeNo", unifiedorderVo.getOut_trade_no()); if (storeOrder.getIsChannel() == 2) { map.put("mweb_url", responseVo.getMWebUrl()); @@ -829,7 +860,6 @@ public class OrderPayServiceImpl implements OrderPayService { * @return 微信预下单对象 */ private CreateOrderRequestVo getUnifiedorderVo(StoreOrder storeOrder, String openid, String ip, String appId, String mchId, String signKey) { - // 获取域名 String domain = systemConfigService.getValueByKeyException(Constants.CONFIG_KEY_SITE_URL); String apiDomain = systemConfigService.getValueByKeyException(Constants.CONFIG_KEY_API_URL); @@ -856,6 +886,10 @@ public class OrderPayServiceImpl implements OrderPayService { vo.setTrade_type(PayConstants.WX_PAY_TRADE_TYPE_H5); vo.setOpenid(null); } + if (storeOrder.getIsChannel() == 4 || storeOrder.getIsChannel() == 5) { + vo.setTrade_type("APP"); + vo.setOpenid(null); + } CreateOrderH5SceneInfoVo createOrderH5SceneInfoVo = new CreateOrderH5SceneInfoVo( new CreateOrderH5SceneInfoDetailVo( domain, @@ -926,17 +960,17 @@ public class OrderPayServiceImpl implements OrderPayService { integralRecord.setTitle(IntegralRecordConstants.BROKERAGE_RECORD_TITLE_ORDER); integralRecord.setIntegral(integral); integralRecord.setBalance(balance); - if ("order".equals(type)){ + if (type.equals("order")){ integralRecord.setMark(StrUtil.format("用户付款成功,订单增加{}积分", integral)); } - if ("product".equals(type)) { + if (type.equals("product")) { integralRecord.setMark(StrUtil.format("用户付款成功,商品增加{}积分", integral)); } integralRecord.setStatus(IntegralRecordConstants.INTEGRAL_RECORD_STATUS_CREATE); // 获取积分冻结期 String fronzenTime = systemConfigService.getValueByKey(Constants.CONFIG_KEY_STORE_INTEGRAL_EXTRACT_TIME); integralRecord.setFrozenTime(Integer.valueOf(Optional.ofNullable(fronzenTime).orElse("0"))); - integralRecord.setCreateTime(DateUtil.nowDateTime()); + integralRecord.setCreateTime(CrmebDateUtil.nowDateTime()); return integralRecord; } @@ -976,9 +1010,6 @@ public class OrderPayServiceImpl implements OrderPayService { return ; } // 组装数据 -// temMap.put("character_string1", storeOrder.getOrderId()); -// temMap.put("amount2", storeOrder.getPayPrice().toString() + "元"); -// temMap.put("thing7", "您的订单已支付成功"); temMap.put("character_string3", storeOrder.getOrderId()); temMap.put("amount9", storeOrder.getPayPrice().toString() + "元"); temMap.put("thing6", "您的订单已支付成功"); @@ -1002,7 +1033,7 @@ public class OrderPayServiceImpl implements OrderPayService { for (int i = 0; i < couponsForGiveUser.size();) { StoreProductCoupon storeProductCoupon = couponsForGiveUser.get(i); MyRecord record = storeCouponUserService.paySuccessGiveAway(storeProductCoupon.getIssueCouponId(), storeOrder.getUid()); - if ("fail".equals(record.getStr("status"))) { + if (record.getStr("status").equals("fail")) { logger.error(StrUtil.format("支付成功领取优惠券失败，失败原因：{}", record.getStr("errMsg"))); couponsForGiveUser.remove(i); continue; diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java index 834e4e04..44ff2604 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java @@ -2,15 +2,18 @@ package com.zbkj.service.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageInfo; import com.zbkj.common.constants.*; import com.zbkj.common.exception.CrmebException; import com.zbkj.common.model.bargain.StoreBargain; import com.zbkj.common.model.bargain.StoreBargainUser; import com.zbkj.common.model.cat.StoreCart; +import com.zbkj.common.model.category.Category; import com.zbkj.common.model.combination.StoreCombination; import com.zbkj.common.model.coupon.StoreCouponUser; import com.zbkj.common.model.express.Express; @@ -35,7 +38,7 @@ import com.zbkj.common.page.CommonPage; import com.zbkj.common.request.*; import com.zbkj.common.response.*; import com.zbkj.common.utils.CrmebUtil; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.common.utils.RedisUtil; import com.zbkj.common.vo.*; import com.zbkj.service.delete.OrderUtils; @@ -46,28 +49,28 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.support.TransactionTemplate; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; /** * H5端订单操作 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- + * +---------------------------------------------------------------------- + * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] + * +---------------------------------------------------------------------- + * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved. + * +---------------------------------------------------------------------- + * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 + * +---------------------------------------------------------------------- + * | Author: CRMEB Team + * +---------------------------------------------------------------------- */ @Service public class OrderServiceImpl implements OrderService { @@ -119,12 +122,8 @@ public class OrderServiceImpl implements OrderService { @Autowired private StoreSeckillService storeSeckillService; - private StoreCombinationService storeCombinationService; - @Autowired - public void setStoreCombinationService(ApplicationContext applicationContext) { - this.storeCombinationService = applicationContext.getBean(StoreCombinationService.class); - } + private StoreCombinationService storeCombinationService; @Autowired private StoreBargainService storeBargainService; @@ -177,8 +176,12 @@ public class OrderServiceImpl implements OrderService { @Autowired private SmsTemplateService smsTemplateService; + @Autowired + private CategoryService categoryService; + /** * 发送后台管理员下单提醒通知短信 + * * @param orderNo 订单编号 */ @Async @@ -191,7 +194,7 @@ public class OrderServiceImpl implements OrderService { // 查询可已发送短信的管理员 List systemAdminList = systemAdminService.findIsSmsList(); if (CollUtil.isEmpty(systemAdminList)) { - return ; + return; } // 发送短信 SmsTemplate smsTemplate = smsTemplateService.getDetail(notification.getSmsId()); @@ -201,6 +204,7 @@ public class OrderServiceImpl implements OrderService { /** * 删除已完成订单 + * * @param id Integer 订单id * @return 删除结果 */ @@ -227,6 +231,7 @@ public class OrderServiceImpl implements OrderService { //可以删除 storeOrder.setIsDel(true); + storeOrder.setUpdateTime(DateUtil.date()); Boolean execute = transactionTemplate.execute(e -> { storeOrderService.updateById(storeOrder); //日志 @@ -238,6 +243,7 @@ public class OrderServiceImpl implements OrderService { /** * 创建订单商品评价 + * * @param request 请求参数 * @return Boolean */ @@ -251,6 +257,7 @@ public class OrderServiceImpl implements OrderService { /** * 订单收货 + * * @param id Integer 订单id */ @Override @@ -259,8 +266,10 @@ public class OrderServiceImpl implements OrderService { if (!storeOrder.getStatus().equals(Constants.ORDER_STATUS_INT_SPIKE)) { throw new CrmebException("订单状态错误"); } + //已收货，待评价 storeOrder.setStatus(Constants.ORDER_STATUS_INT_BARGAIN); + storeOrder.setUpdateTime(DateUtil.date()); boolean result = storeOrderService.updateById(storeOrder); if (result) { //后续操作放入redis @@ -271,6 +280,7 @@ public class OrderServiceImpl implements OrderService { /** * 订单取消 + * * @param id Integer 订单id */ @Override @@ -279,6 +289,7 @@ public class OrderServiceImpl implements OrderService { //已收货，待评价 storeOrder.setIsDel(true); storeOrder.setIsSystemDel(true); + storeOrder.setUpdateTime(DateUtil.date()); boolean result = storeOrderService.updateById(storeOrder); //后续操作放入redis @@ -288,6 +299,7 @@ public class OrderServiceImpl implements OrderService { /** * 订单退款申请 + * * @param request OrderRefundApplyRequest 退款参数 */ @Override @@ -311,15 +323,16 @@ public class OrderServiceImpl implements OrderService { } existStoreOrder.setRefundStatus(1); - existStoreOrder.setRefundReasonTime(DateUtil.nowDateTime()); + existStoreOrder.setRefundReasonTime(CrmebDateUtil.nowDateTime()); existStoreOrder.setRefundReasonWap(request.getText()); existStoreOrder.setRefundReasonWapExplain(request.getExplain()); existStoreOrder.setRefundReasonWapImg(systemAttachmentService.clearPrefix(request.getReasonImage())); existStoreOrder.setRefundPrice(BigDecimal.ZERO); + existStoreOrder.setUpdateTime(DateUtil.date()); Boolean execute = transactionTemplate.execute(e -> { storeOrderService.updateById(existStoreOrder); - storeOrderStatusService.createLog(existStoreOrder.getId(), Constants.ORDER_LOG_REFUND_APPLY, "用户申请退款原因：" + request.getText()); + storeOrderStatusService.createLog(existStoreOrder.getId(), Constants.ORDER_LOG_REFUND_APPLY, "用户申请退款原因：" + request.getExplain()); return Boolean.TRUE; }); @@ -345,6 +358,7 @@ public class OrderServiceImpl implements OrderService { /** * 订单退款申请Task使用 + * * @param applyList OrderRefundApplyRequest 退款参数 */ @Override @@ -385,7 +399,8 @@ public class OrderServiceImpl implements OrderService { storeOrder.setRefundReasonWapExplain(request.getExplain()); storeOrder.setRefundReason(request.getText()); storeOrder.setRefundPrice(BigDecimal.ZERO); - storeOrder.setRefundReasonTime(DateUtil.nowDateTime()); + storeOrder.setRefundReasonTime(CrmebDateUtil.nowDateTime()); + storeOrder.setUpdateTime(DateUtil.date()); orderList.add(storeOrder); // 发送用户退款管理员提醒短信 @@ -400,15 +415,20 @@ public class OrderServiceImpl implements OrderService { /** * 订单列表 - * @param status 类型 + * + * @param status 类型 * @param pageRequest 分页 * @return CommonPage */ @Override - public CommonPage list(Integer status, PageParamRequest pageRequest) { + public PageInfo list(String keywords, Integer status, PageParamRequest pageRequest) { Integer userId = userService.getUserIdException(); - List orderList = storeOrderService.getUserOrderList(userId, status, pageRequest); + PageInfo orderPageInfo = storeOrderService.getUserOrderList_2_3(keywords,userId, status, pageRequest); + List orderList = orderPageInfo.getList(); + if (CollUtil.isEmpty(orderList)) { + return CommonPage.copyPageInfo(orderPageInfo, CollUtil.newArrayList()); + } CommonPage storeOrderCommonPage = CommonPage.restPage(orderList); List responseList = CollUtil.newArrayList(); for (StoreOrder storeOrder : orderList) { @@ -428,18 +448,20 @@ public class OrderServiceImpl implements OrderService { orderInfoResponse.setCartNum(e.getPayNum()); orderInfoResponse.setPrice(ObjectUtil.isNotNull(e.getVipPrice()) ? e.getVipPrice() : e.getPrice()); orderInfoResponse.setProductId(e.getProductId()); + orderInfoResponse.setAttrId(e.getUnique()); + orderInfoResponse.setIsReply(e.getIsReply()?1:0); infoResponseList.add(orderInfoResponse); }); infoResponse.setOrderInfoList(infoResponseList); responseList.add(infoResponse); } - CommonPage detailPage = CommonPage.restPage(responseList); - BeanUtils.copyProperties(storeOrderCommonPage, detailPage, "list"); - return detailPage; + + return CommonPage.copyPageInfo(orderPageInfo, responseList); } /** * 获取订单活动类型 + * * @param storeOrder 订单都西昂 * @return 活动类型 */ @@ -464,6 +486,7 @@ public class OrderServiceImpl implements OrderService { /** * 获取H5订单状态 + * * @param storeOrder 订单对象 */ private String getH5OrderStatus(StoreOrder storeOrder) { @@ -496,6 +519,7 @@ public class OrderServiceImpl implements OrderService { /** * 订单详情 + * * @param orderId 订单id */ @Override @@ -525,7 +549,7 @@ public class OrderServiceImpl implements OrderService { orderInfoResponse.setPrice(ObjectUtil.isNotNull(e.getVipPrice()) ? e.getVipPrice() : e.getPrice()); orderInfoResponse.setProductId(e.getProductId()); orderInfoResponse.setIsReply(e.getIsReply() ? 1 : 0); - orderInfoResponse.setAttrId(e.getAttrValueId()); + orderInfoResponse.setAttrId(e.getAttrValueId()+""); orderInfoResponse.setSku(e.getSku()); infoResponseList.add(orderInfoResponse); }); @@ -536,7 +560,6 @@ public class OrderServiceImpl implements OrderService { systemStorePram.setId(storeOrder.getStoreId()); storeOrderDetailResponse.setSystemStore(systemStoreService.getByCondition(systemStorePram)); // 腾讯云地图key - storeOrderDetailResponse.setMapKey(systemConfigService.getValueByKey(SysConfigConstants.CONFIG_SITE_TENG_XUN_MAP_KEY)); BeanUtils.copyProperties(storeOrder, storeOrderDetailResponse); storeOrderDetailResponse.setStatusPic(orderStatusVo.getStr("statusPic")); storeOrderDetailResponse.setOrderStatusMsg(orderStatusVo.getStr("msg")); @@ -548,6 +571,7 @@ public class OrderServiceImpl implements OrderService { /** * 获取订单状态相关信息 + * * @return MyRecord */ private MyRecord getOrderStatusVo(StoreOrder storeOrder) { @@ -556,16 +580,15 @@ public class OrderServiceImpl implements OrderService { record.set("type", 0); record.set("title", "未支付"); record.set("msg", "订单未支付"); - List configKeys = new ArrayList<>(); - configKeys.add("order_cancel_time"); - configKeys.add("order_activity_time"); - configKeys.add("order_bargain_time"); - configKeys.add("order_seckill_time"); - configKeys.add("order_pink_time"); - List configValues = systemConfigService.getValuesByKes(configKeys); + String orderCancelTime; + if (storeOrder.getBargainId() <= 0 && storeOrder.getPinkId() <= 0 && storeOrder.getSeckillId() <= 0) { + orderCancelTime = systemConfigService.getValueByKey("order_cancel_time"); + } else { + orderCancelTime = systemConfigService.getValueByKey("order_activity_time"); + } Date timeSpace; - timeSpace = DateUtil.addSecond(storeOrder.getCreateTime(),Double.valueOf(configValues.get(0)).intValue() * 3600); - record.set("msg", "请在" + DateUtil.dateToStr(timeSpace, Constants.DATE_FORMAT) +"前完成支付"); + timeSpace = CrmebDateUtil.addSecond(storeOrder.getCreateTime(), Double.valueOf(orderCancelTime).intValue() * 3600); + record.set("msg", "请在" + CrmebDateUtil.dateToStr(timeSpace, Constants.DATE_FORMAT) + "前完成支付"); } else if (storeOrder.getRefundStatus() == 1) { record.set("type", -1); record.set("title", "申请退款中"); @@ -589,7 +612,7 @@ public class OrderServiceImpl implements OrderService { storeOrderStatus.setOid(storeOrder.getId()); storeOrderStatus.setChangeType(Constants.ORDER_LOG_DELIVERY); List sOrderStatusResults = storeOrderStatusService.getByEntity(storeOrderStatus); - if (sOrderStatusResults.size()>0) { + if (sOrderStatusResults.size() > 0) { record.set("type", 2); record.set("title", "待收货"); record.set("msg", "商家已送货,请耐心等待"); @@ -599,17 +622,17 @@ public class OrderServiceImpl implements OrderService { storeOrderStatus.setOid(storeOrder.getId()); storeOrderStatus.setChangeType(Constants.ORDER_LOG_EXPRESS); List sOrderStatusResults = storeOrderStatusService.getByEntity(storeOrderStatus); - if (sOrderStatusResults.size()>0) { + if (sOrderStatusResults.size() > 0) { record.set("type", 2); record.set("title", "待收货"); record.set("msg", "商家已发货,请耐心等待"); } - }else { + } else { StoreOrderStatus storeOrderStatus = new StoreOrderStatus(); storeOrderStatus.setOid(storeOrder.getId()); storeOrderStatus.setChangeType(Constants.ORDER_LOG_DELIVERY_VI); List sOrderStatusResults = storeOrderStatusService.getByEntity(storeOrderStatus); - if (sOrderStatusResults.size()>0) { + if (sOrderStatusResults.size() > 0) { record.set("type", 2); record.set("title", "待收货"); record.set("msg", "服务商已虚拟发货"); @@ -619,11 +642,11 @@ public class OrderServiceImpl implements OrderService { record.set("msg", "退款拒绝订单已发货"); } } - }else if (storeOrder.getStatus() == 2) { + } else if (storeOrder.getStatus() == 2) { record.set("type", 3); record.set("title", "待评价"); record.set("msg", "已收货,快去评价一下吧"); - }else if (storeOrder.getStatus() == 3) { + } else if (storeOrder.getStatus() == 3) { record.set("type", 4); record.set("title", "交易完成"); record.set("msg", "交易完成,感谢您的支持"); @@ -633,7 +656,7 @@ public class OrderServiceImpl implements OrderService { String orderPayTypeStr = orderUtils.getOrderPayTypeStr(storeOrder.getPayType()); record.set("payTypeStr", orderPayTypeStr); if (StringUtils.isNotBlank(storeOrder.getDeliveryType())) { - record.set("deliveryType", StringUtils.isNotBlank(storeOrder.getDeliveryType()) ? storeOrder.getDeliveryType():"其他方式"); + record.set("deliveryType", StringUtils.isNotBlank(storeOrder.getDeliveryType()) ? storeOrder.getDeliveryType() : "其他方式"); } // 获取商品状态图片 ignore @@ -649,6 +672,7 @@ public class OrderServiceImpl implements OrderService { /** * 订单tap data + * * @return 订单状态数据量 */ @Override @@ -694,6 +718,7 @@ public class OrderServiceImpl implements OrderService { /** * 查询退款理由 + * * @return 退款理由集合 */ @Override @@ -706,11 +731,12 @@ public class OrderServiceImpl implements OrderService { /** * 订单物流查看 + * * @param orderId 订单id */ @Override public Object expressOrder(String orderId) { - HashMap resultMap = new HashMap<>(); + HashMap resultMap = new HashMap<>(); StoreOrder storeOrderPram = new StoreOrder(); storeOrderPram.setOrderId(orderId); StoreOrder existOrder = storeOrderService.getByEntityOne(storeOrderPram); @@ -751,7 +777,7 @@ public class OrderServiceImpl implements OrderService { } /** - *获取待评价信息 + * 获取待评价信息 */ @Override public OrderProductReplyResponse getReplyProduct(GetProductReply productReply) { @@ -769,6 +795,7 @@ public class OrderServiceImpl implements OrderService { /** * 获取申请订单退款信息 + * * @param orderId 订单编号 * @return ApplyRefundOrderInfoResponse */ @@ -795,6 +822,7 @@ public class OrderServiceImpl implements OrderService { /** * 订单预下单 + * * @param request 预下单请求参数 * @return PreOrderResponse */ @@ -838,7 +866,7 @@ public class OrderServiceImpl implements OrderService { orderInfoVo.setUserIntegral(user.getIntegral()); orderInfoVo.setUserBalance(user.getNowMoney()); // 缓存订单 - String key = user.getUid() + DateUtil.getNowTime().toString()+CrmebUtil.getUuid(); + String key = user.getUid() + CrmebDateUtil.getNowTime().toString() + CrmebUtil.getUuid(); redisUtil.set("user_order:" + key, JSONObject.toJSONString(orderInfoVo), Constants.ORDER_CASH_CONFIRM, TimeUnit.MINUTES); MyRecord record = new MyRecord(); record.set("preOrderNo", key); @@ -847,6 +875,7 @@ public class OrderServiceImpl implements OrderService { /** * 加载预下单信息 + * * @param preOrderNo 预下单号 * @return 预下单信息 */ @@ -883,6 +912,7 @@ public class OrderServiceImpl implements OrderService { /** * 计算订单价格 + * * @param request 计算订单价格请求对象 * @return ComputedOrderPriceResponse */ @@ -902,6 +932,7 @@ public class OrderServiceImpl implements OrderService { /** * 创建订单 + * * @param request 创建订单请求参数 * @return MyRecord 订单编号 */ @@ -917,15 +948,6 @@ public class OrderServiceImpl implements OrderService { String orderVoString = redisUtil.get(key).toString(); OrderInfoVo orderInfoVo = JSONObject.parseObject(orderVoString, OrderInfoVo.class); - // 检测支付方式 - if (!orderUtils.checkPayType(request.getPayType())) throw new CrmebException("暂不支持该支付方式，请刷新页面或者联系管理员"); - - if (request.getPayType().equals(PayConstants.PAY_TYPE_WE_CHAT)) { - // 检测支付渠道 - if (StrUtil.isBlank(request.getPayChannel())) throw new CrmebException("支付渠道不能为空!"); - if (!OrderUtils.checkPayChannel(request.getPayChannel())) throw new CrmebException("支付渠道不存在!"); - } - // 校验商品库存 List skuRecordList = validateProductStock(orderInfoVo, user); @@ -941,20 +963,20 @@ public class OrderServiceImpl implements OrderService { request.setRealName(userAddress.getRealName()); request.setPhone(userAddress.getPhone()); userAddressStr = userAddress.getProvince() + userAddress.getCity() + userAddress.getDistrict() + userAddress.getDetail(); - }else if (request.getShippingType() == 2) { // 到店自提 + } else if (request.getShippingType() == 2) { // 到店自提 if (StringUtils.isBlank(request.getRealName()) || StringUtils.isBlank(request.getPhone())) { throw new CrmebException("请填写姓名和电话"); } // 自提开关是否打开 String storeSelfMention = systemConfigService.getValueByKey(SysConfigConstants.CONFIG_KEY_STORE_SELF_MENTION); - if ("false".equals(storeSelfMention)) { + if (storeSelfMention.equals("false")) { throw new CrmebException("请先联系管理员开启门店自提"); } SystemStore systemStore = systemStoreService.getById(request.getStoreId()); if (ObjectUtil.isNull(systemStore) || systemStore.getIsDel() || !systemStore.getIsShow()) { throw new CrmebException("暂无门店无法选择门店自提"); } - verifyCode = CrmebUtil.randomCount(1111111111,999999999)+""; + verifyCode = CrmebUtil.randomCount(1111111111, 999999999) + ""; userAddressStr = systemStore.getName(); } @@ -1037,34 +1059,6 @@ public class OrderServiceImpl implements OrderService { } } - // 支付渠道 默认：余额支付 - int isChannel = 3; - if (request.getPayType().equals(PayConstants.PAY_TYPE_WE_CHAT)) { - switch (request.getPayChannel()) { - case PayConstants.PAY_CHANNEL_WE_CHAT_H5:// H5 - isChannel = 2; - break; - case PayConstants.PAY_CHANNEL_WE_CHAT_PUBLIC:// 公众号 - isChannel = 0; - break; - case PayConstants.PAY_CHANNEL_WE_CHAT_PROGRAM:// 小程序 - isChannel = 1; - break; - case PayConstants.PAY_CHANNEL_WE_CHAT_APP_IOS:// app ios - isChannel = 4; - break; - case PayConstants.PAY_CHANNEL_WE_CHAT_APP_ANDROID:// app android - isChannel = 5; - break; - } - } - if (request.getPayType().equals(PayConstants.PAY_TYPE_ALI_PAY)) { - isChannel = 6; - if (request.getPayChannel().equals(PayConstants.PAY_CHANNEL_ALI_APP_PAY)) { - isChannel = 7; - } - } - StoreOrder storeOrder = new StoreOrder(); storeOrder.setUid(user.getUid()); storeOrder.setOrderId(orderNo); @@ -1089,7 +1083,7 @@ public class OrderServiceImpl implements OrderService { storeOrder.setPayPrice(computedOrderPriceResponse.getPayFee()); storeOrder.setPayPostage(computedOrderPriceResponse.getFreightFee()); storeOrder.setDeductionPrice(computedOrderPriceResponse.getDeductionPrice()); - storeOrder.setPayType(request.getPayType()); +// storeOrder.setPayType(request.getPayType()); storeOrder.setUseIntegral(computedOrderPriceResponse.getUsedIntegral()); storeOrder.setGainIntegral(gainIntegral); storeOrder.setMark(StringEscapeUtils.escapeHtml4(request.getMark())); @@ -1098,9 +1092,9 @@ public class OrderServiceImpl implements OrderService { storeOrder.setSeckillId(orderInfoVo.getSeckillId()); storeOrder.setBargainId(orderInfoVo.getBargainId()); storeOrder.setBargainUserId(orderInfoVo.getBargainUserId()); - storeOrder.setCreateTime(DateUtil.nowDateTime()); + storeOrder.setCreateTime(CrmebDateUtil.nowDateTime()); storeOrder.setShippingType(request.getShippingType()); - storeOrder.setIsChannel(isChannel); +// storeOrder.setIsChannel(isChannel); storeOrder.setPaid(false); storeOrder.setCost(BigDecimal.ZERO); storeOrder.setType(0); @@ -1121,41 +1115,41 @@ public class OrderServiceImpl implements OrderService { // 需要根据是否活动商品，扣减不同的库存 if (storeOrder.getSeckillId() > 0) {// 秒杀扣库存 MyRecord skuRecord = skuRecordList.get(0); + // 普通商品口库存 + storeProductService.operationStock(skuRecord.getInt("productId"), skuRecord.getInt("num"), "sub", skuRecord.getInt("productVersion")); + // 普通商品规格扣库存 + storeProductAttrValueService.operationStock(skuRecord.getInt("attrValueId"), skuRecord.getInt("num"), "sub", Constants.PRODUCT_TYPE_NORMAL, skuRecord.getInt("attrValueVersion")); + // 秒杀商品规格扣库存 + storeProductAttrValueService.operationStock(skuRecord.getInt("activityAttrValueId"), skuRecord.getInt("num"), "sub", Constants.PRODUCT_TYPE_SECKILL, skuRecord.getInt("activityAttrValueVersion")); // 秒杀商品扣库存 storeSeckillService.operationStock(skuRecord.getInt("activityId"), skuRecord.getInt("num"), "sub"); - // 秒杀商品规格扣库存 - storeProductAttrValueService.operationStock(skuRecord.getInt("activityAttrValueId"), skuRecord.getInt("num"), "sub", Constants.PRODUCT_TYPE_SECKILL); - // 普通商品口库存 - storeProductService.operationStock(skuRecord.getInt("productId"), skuRecord.getInt("num"), "sub"); - // 普通商品规格扣库存 - storeProductAttrValueService.operationStock(skuRecord.getInt("attrValueId"), skuRecord.getInt("num"), "sub", Constants.PRODUCT_TYPE_NORMAL); } else if (storeOrder.getBargainId() > 0) {// 砍价扣库存 MyRecord skuRecord = skuRecordList.get(0); + // 普通商品口库存 + storeProductService.operationStock(skuRecord.getInt("productId"), skuRecord.getInt("num"), "sub", skuRecord.getInt("productVersion")); + // 普通商品规格扣库存 + storeProductAttrValueService.operationStock(skuRecord.getInt("attrValueId"), skuRecord.getInt("num"), "sub", Constants.PRODUCT_TYPE_NORMAL, skuRecord.getInt("attrValueVersion")); + // 砍价商品规格扣库存 + storeProductAttrValueService.operationStock(skuRecord.getInt("activityAttrValueId"), skuRecord.getInt("num"), "sub", Constants.PRODUCT_TYPE_BARGAIN, skuRecord.getInt("activityAttrValueVersion")); // 砍价商品扣库存 storeBargainService.operationStock(skuRecord.getInt("activityId"), skuRecord.getInt("num"), "sub"); - // 砍价商品规格扣库存 - storeProductAttrValueService.operationStock(skuRecord.getInt("activityAttrValueId"), skuRecord.getInt("num"), "sub", Constants.PRODUCT_TYPE_BARGAIN); - // 普通商品口库存 - storeProductService.operationStock(skuRecord.getInt("productId"), skuRecord.getInt("num"), "sub"); - // 普通商品规格扣库存 - storeProductAttrValueService.operationStock(skuRecord.getInt("attrValueId"), skuRecord.getInt("num"), "sub", Constants.PRODUCT_TYPE_NORMAL); } else if (storeOrder.getCombinationId() > 0) {// 拼团扣库存 MyRecord skuRecord = skuRecordList.get(0); - // 拼团商品扣库存 - Boolean operationStock = storeCombinationService.operationStock(skuRecord.getInt("activityId"), skuRecord.getInt("num"), "sub"); - System.out.println("拼团商品扣库存operationStock " + operationStock); - // 拼团商品规格扣库存 - storeProductAttrValueService.operationStock(skuRecord.getInt("activityAttrValueId"), skuRecord.getInt("num"), "sub", Constants.PRODUCT_TYPE_PINGTUAN); // 普通商品口库存 - storeProductService.operationStock(skuRecord.getInt("productId"), skuRecord.getInt("num"), "sub"); + storeProductService.operationStock(skuRecord.getInt("productId"), skuRecord.getInt("num"), "sub", skuRecord.getInt("productVersion")); // 普通商品规格扣库存 - storeProductAttrValueService.operationStock(skuRecord.getInt("attrValueId"), skuRecord.getInt("num"), "sub", Constants.PRODUCT_TYPE_NORMAL); - } else { // 普通商品 + storeProductAttrValueService.operationStock(skuRecord.getInt("attrValueId"), skuRecord.getInt("num"), "sub", Constants.PRODUCT_TYPE_NORMAL, skuRecord.getInt("attrValueVersion")); + // 拼团商品规格扣库存 + storeProductAttrValueService.operationStock(skuRecord.getInt("activityAttrValueId"), skuRecord.getInt("num"), "sub", Constants.PRODUCT_TYPE_PINGTUAN, skuRecord.getInt("activityAttrValueVersion")); + // 拼团商品扣库存 + storeCombinationService.operationStock(skuRecord.getInt("activityId"), skuRecord.getInt("num"), "sub"); + } + else { // 普通商品 for (MyRecord skuRecord : skuRecordList) { // 普通商品口库存 - storeProductService.operationStock(skuRecord.getInt("productId"), skuRecord.getInt("num"), "sub"); + storeProductService.operationStock(skuRecord.getInt("productId"), skuRecord.getInt("num"), "sub", skuRecord.getInt("productVersion")); // 普通商品规格扣库存 - storeProductAttrValueService.operationStock(skuRecord.getInt("attrValueId"), skuRecord.getInt("num"), "sub", Constants.PRODUCT_TYPE_NORMAL); + storeProductAttrValueService.operationStock(skuRecord.getInt("attrValueId"), skuRecord.getInt("num"), "sub", Constants.PRODUCT_TYPE_NORMAL, skuRecord.getInt("attrValueVersion")); } } @@ -1163,6 +1157,7 @@ public class OrderServiceImpl implements OrderService { storeOrderInfos.forEach(info -> info.setOrderId(storeOrder.getId())); // 优惠券修改 if (storeOrder.getCouponId() > 0) { + finalStoreCouponUser.setUpdateTime(DateUtil.date()); storeCouponUserService.updateById(finalStoreCouponUser); } // 保存购物车商品详情 @@ -1198,6 +1193,7 @@ public class OrderServiceImpl implements OrderService { /** * 获取支付配置 + * * @return PreOrderResponse */ @Override @@ -1216,6 +1212,7 @@ public class OrderServiceImpl implements OrderService { /** * 校验商品库存（生成订单） + * * @param orderInfoVo 订单详情Vo * @return List * skuRecord 扣减库存对象 @@ -1239,12 +1236,16 @@ public class OrderServiceImpl implements OrderService { MyRecord seckillRecord = commonValidateSeckill(storeSeckill, seckillAttrValue, user, detailVo.getPayNum()); // 主商品sku StoreProductAttrValue productAttrValue = seckillRecord.get("productAttrValue"); + StoreProduct product = seckillRecord.get("product"); MyRecord record = new MyRecord(); record.set("activityId", seckillId); record.set("activityAttrValueId", seckillAttrValue.getId()); + record.set("activityAttrValueVersion", seckillAttrValue.getVersion()); record.set("productId", storeSeckill.getProductId()); + record.set("productVersion", product.getVersion()); record.set("attrValueId", productAttrValue.getId()); + record.set("attrValueVersion", productAttrValue.getVersion()); record.set("num", detailVo.getPayNum()); recordList.add(record); return recordList; @@ -1263,12 +1264,16 @@ public class OrderServiceImpl implements OrderService { } MyRecord bargainRecord = commonValidateBargain(storeBargain, bargainAttrValue, orderInfoVo.getBargainUserId(), user, detailVo.getPayNum()); StoreProductAttrValue productAttrValue = bargainRecord.get("productAttrValue"); + StoreProduct product = bargainRecord.get("product"); MyRecord record = new MyRecord(); record.set("activityId", bargainId); record.set("activityAttrValueId", bargainAttrValue.getId()); + record.set("activityAttrValueVersion", bargainAttrValue.getVersion()); record.set("productId", storeBargain.getProductId()); + record.set("productVersion", product.getVersion()); record.set("attrValueId", productAttrValue.getId()); + record.set("attrValueVersion", productAttrValue.getVersion()); record.set("num", detailVo.getPayNum()); recordList.add(record); return recordList; @@ -1284,16 +1289,21 @@ public class OrderServiceImpl implements OrderService { } MyRecord combinationRecord = commonValidateCombination(storeCombination, combinationAttrValue, user, detailVo.getPayNum()); StoreProductAttrValue productAttrValue = combinationRecord.get("productAttrValue"); + StoreProduct product = combinationRecord.get("product"); MyRecord record = new MyRecord(); record.set("activityId", combinationId); record.set("activityAttrValueId", combinationAttrValue.getId()); + record.set("activityAttrValueVersion", combinationAttrValue.getVersion()); record.set("productId", storeCombination.getProductId()); + record.set("productVersion", product.getVersion()); record.set("attrValueId", productAttrValue.getId()); + record.set("attrValueVersion", productAttrValue.getVersion()); record.set("num", detailVo.getPayNum()); recordList.add(record); return recordList; } + // 普通商品 List orderDetailList = orderInfoVo.getOrderDetailList(); orderDetailList.forEach(e -> { @@ -1323,6 +1333,8 @@ public class OrderServiceImpl implements OrderService { record.set("productId", e.getProductId()); record.set("num", e.getPayNum()); record.set("attrValueId", e.getAttrValueId()); + record.set("productVersion", storeProduct.getVersion()); + record.set("attrValueVersion", attrValue.getVersion()); recordList.add(record); }); return recordList; @@ -1331,18 +1343,19 @@ public class OrderServiceImpl implements OrderService { /** * 校验预下单商品信息 + * * @param request 预下单请求参数 * @return OrderInfoVo */ private OrderInfoVo validatePreOrderRequest(PreOrderRequest request, User user) { OrderInfoVo orderInfoVo = new OrderInfoVo(); List detailVoList = CollUtil.newArrayList(); - if ("shoppingCart".equals(request.getPreOrderType())) {// 购物车购买 + if (request.getPreOrderType().equals("shoppingCart")) {// 购物车购买 detailVoList = validatePreOrderShopping(request, user); List cartIdList = request.getOrderDetails().stream().map(PreOrderDetailRequest::getShoppingCartId).distinct().collect(Collectors.toList()); orderInfoVo.setCartIdList(cartIdList); } - if ("buyNow".equals(request.getPreOrderType())) {// 立即购买 + if (request.getPreOrderType().equals("buyNow")) {// 立即购买 // 立即购买只会有一条详情 PreOrderDetailRequest detailRequest = request.getOrderDetails().get(0); if (detailRequest.getSeckillId() > 0) {// 秒杀 @@ -1356,7 +1369,7 @@ public class OrderServiceImpl implements OrderService { detailVoList.add(validatePreOrderCombination(detailRequest, user)); orderInfoVo.setCombinationId(detailRequest.getCombinationId()); orderInfoVo.setPinkId(detailRequest.getPinkId()); - } else { + } else { // 普通商品 if (ObjectUtil.isNull(detailRequest.getProductId())) { throw new CrmebException("商品编号不能为空"); @@ -1407,14 +1420,15 @@ public class OrderServiceImpl implements OrderService { detailVo.setIsSub(storeProduct.getIsSub()); detailVo.setProductType(Constants.PRODUCT_TYPE_NORMAL); detailVo.setVipPrice(detailVo.getPrice()); - detailVo.setGiveIntegral(storeProduct.getGiveIntegral()); if (ObjectUtil.isNotNull(userLevel)) { - detailVo.setVipPrice(detailVo.getPrice()); + BigDecimal vipPrice = detailVo.getPrice().multiply(new BigDecimal(userLevel.getDiscount())).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_HALF_UP); + detailVo.setVipPrice(vipPrice); } + detailVo.setGiveIntegral(storeProduct.getGiveIntegral()); detailVoList.add(detailVo); } } - if ("again".equals(request.getPreOrderType())) {// 再次购买 + if (request.getPreOrderType().equals("again")) {// 再次购买 PreOrderDetailRequest detailRequest = request.getOrderDetails().get(0); detailVoList = validatePreOrderAgain(detailRequest, user); } @@ -1424,8 +1438,9 @@ public class OrderServiceImpl implements OrderService { /** * 购物车预下单校验 + * * @param request 请求参数 - * @param user 用户 + * @param user 用户 * @return List */ private List validatePreOrderShopping(PreOrderRequest request, User user) { @@ -1491,8 +1506,9 @@ public class OrderServiceImpl implements OrderService { /** * 秒杀预下单校验 + * * @param detailRequest 请求参数 - * @param user 用户 + * @param user 用户 * @return OrderInfoDetailVo */ private OrderInfoDetailVo validatePreOrderSeckill(PreOrderDetailRequest detailRequest, User user) { @@ -1524,9 +1540,10 @@ public class OrderServiceImpl implements OrderService { /** * 公共校验秒杀 - * @param storeSeckill 秒杀商品 + * + * @param storeSeckill 秒杀商品 * @param seckillAttrValue 秒杀商品规格属性 - * @param user 用户 + * @param user 用户 * @return MyRecord */ private MyRecord commonValidateSeckill(StoreSeckill storeSeckill, StoreProductAttrValue seckillAttrValue, User user, Integer productNum) { @@ -1560,8 +1577,8 @@ public class OrderServiceImpl implements OrderService { } // 判断日期是否过期 DateTime nowDateTime = cn.hutool.core.date.DateUtil.date(); - String stopTimeStr = DateUtil.dateToStr(storeSeckill.getStopTime(), Constants.DATE_FORMAT_DATE); - Date stopDate = DateUtil.strToDate( stopTimeStr + " " + seckillManger.getEndTime() +":00:00", Constants.DATE_FORMAT); + String stopTimeStr = CrmebDateUtil.dateToStr(storeSeckill.getStopTime(), Constants.DATE_FORMAT_DATE); + Date stopDate = CrmebDateUtil.strToDate(stopTimeStr + " " + seckillManger.getEndTime() + ":00:00", Constants.DATE_FORMAT); if (nowDateTime.getTime() - stopDate.getTime() >= 0) { throw new CrmebException("秒杀商品已过期"); } @@ -1589,13 +1606,15 @@ public class OrderServiceImpl implements OrderService { MyRecord record = new MyRecord(); record.set("productAttrValue", productAttrValue); + record.set("product", product); return record; } /** * 砍价预下单校验 + * * @param detailRequest 请求参数 - * @param user 用户 + * @param user 用户 * @return OrderInfoDetailVo */ private OrderInfoDetailVo validatePreOrderBargain(PreOrderDetailRequest detailRequest, User user) { @@ -1629,11 +1648,12 @@ public class OrderServiceImpl implements OrderService { /** * 公共校验砍价 - * @param storeBargain 砍价商品 + * + * @param storeBargain 砍价商品 * @param bargainAttrValue 砍价商品规格属性 - * @param bargainUserId 砍价活动id - * @param user 用户 - * @param productNum 购买数量 + * @param bargainUserId 砍价活动id + * @param user 用户 + * @param productNum 购买数量 * @return MyRecord */ private MyRecord commonValidateBargain(StoreBargain storeBargain, StoreProductAttrValue bargainAttrValue, Integer bargainUserId, User user, Integer productNum) { @@ -1699,13 +1719,15 @@ public class OrderServiceImpl implements OrderService { MyRecord record = new MyRecord(); record.set("productAttrValue", productAttrValue); + record.set("product", product); return record; } /** * 拼团预下单校验 + * * @param detailRequest 请求参数 - * @param user 用户 + * @param user 用户 * @return OrderInfoDetailVo */ private OrderInfoDetailVo validatePreOrderCombination(PreOrderDetailRequest detailRequest, User user) { @@ -1738,10 +1760,11 @@ public class OrderServiceImpl implements OrderService { /** * 公共校验拼团 - * @param storeCombination 砍价商品 + * + * @param storeCombination 砍价商品 * @param combinationAttrValue 砍价商品规格属性 - * @param user 用户 - * @param productNum 购买数量 + * @param user 用户 + * @param productNum 购买数量 * @return MyRecord */ private MyRecord commonValidateCombination(StoreCombination storeCombination, StoreProductAttrValue combinationAttrValue, User user, Integer productNum) { @@ -1795,11 +1818,13 @@ public class OrderServiceImpl implements OrderService { MyRecord record = new MyRecord(); record.set("productAttrValue", productAttrValue); + record.set("product", product); return record; } /** * 再次下单预下单校验 + * * @param detailRequest 请求参数 * @return List */ @@ -1868,7 +1893,8 @@ public class OrderServiceImpl implements OrderService { tempDetailVo.setProductType(Constants.PRODUCT_TYPE_NORMAL); tempDetailVo.setVipPrice(attrValue.getPrice()); if (ObjectUtil.isNotNull(finalUserLevel)) { - tempDetailVo.setVipPrice(attrValue.getPrice()); + BigDecimal vipPrice = attrValue.getPrice().multiply(new BigDecimal(finalUserLevel.getDiscount())).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_HALF_UP); + tempDetailVo.setVipPrice(vipPrice); } detailVoList.add(tempDetailVo); }); @@ -1890,115 +1916,163 @@ public class OrderServiceImpl implements OrderService { * 计算订单运费 */ private void getFreightFee(OrderInfoVo orderInfoVo, UserAddress userAddress) { + BigDecimal freightFee = BigDecimal.ZERO; + if (ObjectUtil.isNull(userAddress) || userAddress.getCityId() <= 0) { + orderInfoVo.setFreightFee(BigDecimal.ZERO); + return; + } // 判断是否满额包邮 type=1按件数 2按重量 3按体积 // 全场满额包邮开关 String postageSwitchString = systemConfigService.getValueByKey(SysConfigConstants.STORE_FEE_POSTAGE_SWITCH); - // 全场满额包邮金额 - String storeFreePostageString = systemConfigService.getValueByKey(SysConfigConstants.STORE_FEE_POSTAGE); + if (postageSwitchString.equals("'1'")) { + // 全场满额包邮金额 + String storeFreePostageString = systemConfigService.getValueByKey(SysConfigConstants.STORE_FEE_POSTAGE); + if (storeFreePostageString.equals("0") || orderInfoVo.getProTotalFee().compareTo(new BigDecimal(storeFreePostageString)) >= 0) { + orderInfoVo.setFreightFee(BigDecimal.ZERO); + return; + } + } + + // 按模板构建MAP + Map tempMap = CollUtil.newHashMap(); + orderInfoVo.getOrderDetailList().forEach(e -> { + Integer tempId = e.getTempId(); + if (tempMap.containsKey(tempId)) { + MyRecord record = tempMap.get(tempId); + record.set("totalPrice", record.getBigDecimal("totalPrice").add(e.getPrice().multiply(BigDecimal.valueOf(e.getPayNum())))); + record.set("totalNum", record.getInt("totalNum") + e.getPayNum()); + BigDecimal weight = e.getWeight().multiply(BigDecimal.valueOf(e.getPayNum())); + record.set("weight", record.getBigDecimal("weight").add(weight)); + BigDecimal volume = e.getVolume().multiply(BigDecimal.valueOf(e.getPayNum())); + record.set("volume", record.getBigDecimal("volume").add(volume)); + } else { + MyRecord record = new MyRecord(); + record.set("totalPrice", e.getPrice().multiply(BigDecimal.valueOf(e.getPayNum()))); + record.set("totalNum", e.getPayNum()); + record.set("tempId", e.getTempId()); + BigDecimal weight = e.getWeight().multiply(BigDecimal.valueOf(e.getPayNum())); + record.set("weight", weight); + BigDecimal volume = e.getVolume().multiply(BigDecimal.valueOf(e.getPayNum())); + record.set("volume", volume); + tempMap.put(tempId, record); + } + }); + + // 指定包邮（单品运费模板）> 指定区域配送（单品运费模板） + int cityId = userAddress.getCityId(); BigDecimal storePostage = BigDecimal.ZERO; - if ("true".equals(postageSwitchString) && ("0".equals(storeFreePostageString) || orderInfoVo.getProTotalFee().compareTo(new BigDecimal(storeFreePostageString)) >= 0)) { - storePostage = BigDecimal.ZERO; - } else if (ObjectUtil.isNull(userAddress) || userAddress.getCityId() <= 0) { - // 用户地址不存在，默认运费为0元 - storePostage = BigDecimal.ZERO; - } else { - // 有用户地址的情况下 - // 运费根据商品计算 - Map proMap = CollUtil.newHashMap(); - orderInfoVo.getOrderDetailList().forEach(e -> { - Integer proId = e.getProductId(); - if (proMap.containsKey(proId)) { - MyRecord record = proMap.get(proId); - record.set("totalPrice", record.getBigDecimal("totalPrice").add(e.getPrice().multiply(BigDecimal.valueOf(e.getPayNum())))); - record.set("totalNum", record.getInt("totalNum") + e.getPayNum()); - BigDecimal weight = e.getWeight().multiply(BigDecimal.valueOf(e.getPayNum())); - record.set("weight", record.getBigDecimal("weight").add(weight)); - BigDecimal volume = e.getVolume().multiply(BigDecimal.valueOf(e.getPayNum())); - record.set("volume", record.getBigDecimal("volume").add(volume)); - } else { - MyRecord record = new MyRecord(); - record.set("totalPrice", e.getPrice().multiply(BigDecimal.valueOf(e.getPayNum()))); - record.set("totalNum", e.getPayNum()); - record.set("tempId", e.getTempId()); - record.set("proId", proId); - BigDecimal weight = e.getWeight().multiply(BigDecimal.valueOf(e.getPayNum())); - record.set("weight", weight); - BigDecimal volume = e.getVolume().multiply(BigDecimal.valueOf(e.getPayNum())); - record.set("volume", volume); - - proMap.put(proId, record); - } - }); - - // 指定包邮（单品运费模板）> 指定区域配送（单品运费模板） - int cityId = userAddress.getCityId(); - - for (Map.Entry m : proMap.entrySet()) { - MyRecord value = m.getValue(); - Integer tempId = value.getInt("tempId"); - ShippingTemplates shippingTemplate = shippingTemplatesService.getById(tempId); - if (shippingTemplate.getAppoint()) {// 指定包邮 - // 判断是否在指定包邮区域内 - // 必须满足件数 + 金额 才能包邮 - ShippingTemplatesFree shippingTemplatesFree = shippingTemplatesFreeService.getByTempIdAndCityId(tempId, cityId); - if (ObjectUtil.isNotNull(shippingTemplatesFree)) { // 在包邮区域内 - BigDecimal freeNum = shippingTemplatesFree.getNumber(); - BigDecimal multiply = value.getBigDecimal("totalPrice"); - if (new BigDecimal(value.getInt("totalNum")).compareTo(freeNum) >= 0 && multiply.compareTo(shippingTemplatesFree.getPrice()) >= 0) { - // 满足件数 + 金额 = 包邮 + for (Map.Entry m : tempMap.entrySet()) { + MyRecord value = m.getValue(); + Integer tempId = value.getInt("tempId"); + ShippingTemplates shippingTemplate = shippingTemplatesService.getById(tempId); + if (shippingTemplate.getAppoint().equals(0)) { + continue; + } + if (shippingTemplate.getAppoint().equals(2)) { + ShippingTemplatesFree shippingTemplatesFree = shippingTemplatesFreeService.getByTempIdAndCityId(tempId, cityId); + if (ObjectUtil.isNotNull(shippingTemplatesFree)) { + BigDecimal multiply = value.getBigDecimal("totalPrice"); + if (multiply.compareTo(shippingTemplatesFree.getPrice()) >= 0) { + continue; + } + if (shippingTemplate.getType().equals(1)) { + if (BigDecimal.valueOf(value.getInt("totalNum")).compareTo(shippingTemplatesFree.getNumber()) >= 0) { continue; } } - } - // 不满足指定包邮条件，走指定区域配送 - ShippingTemplatesRegion shippingTemplatesRegion = shippingTemplatesRegionService.getByTempIdAndCityId(tempId, cityId); - if (ObjectUtil.isNull(shippingTemplatesRegion)) { - throw new CrmebException("计算运费时，未找到全国运费配置"); - } + BigDecimal surplus = shippingTemplate.getType().equals(2) ? value.getBigDecimal("weight") : value.getBigDecimal("volume"); + if (surplus.compareTo(shippingTemplatesFree.getNumber()) >= 0) { + continue; + } - // 判断计费方式：件数、重量、体积 - switch (shippingTemplate.getType()) { - case 1: // 件数 - // 判断件数是否超过首件 - Integer num = value.getInt("totalNum"); - if (num <= shippingTemplatesRegion.getFirst().intValue()) { - storePostage = storePostage.add(shippingTemplatesRegion.getFirstPrice()); - } else {// 超过首件的需要计算续件 - int renewalNum = num - shippingTemplatesRegion.getFirst().intValue(); - // 剩余件数/续件 = 需要计算的续件费用的次数 - BigDecimal divide = new BigDecimal(renewalNum).divide(shippingTemplatesRegion.getRenewal(), 0, BigDecimal.ROUND_UP); - BigDecimal renewalPrice = shippingTemplatesRegion.getRenewalPrice().multiply(divide); - storePostage = storePostage.add(shippingTemplatesRegion.getFirstPrice()).add(renewalPrice); - } - break; - case 2: // 重量 - BigDecimal weight = value.getBigDecimal("weight"); - if (weight.compareTo(shippingTemplatesRegion.getFirst()) <= 0) { - storePostage = storePostage.add(shippingTemplatesRegion.getFirstPrice()); - } else {// 超过首件的需要计算续件 - BigDecimal renewalNum = weight.subtract(shippingTemplatesRegion.getFirst()); - // 剩余件数/续件 = 需要计算的续件费用的次数 - BigDecimal divide = renewalNum.divide(shippingTemplatesRegion.getRenewal(), 0, BigDecimal.ROUND_UP); - BigDecimal renewalPrice = shippingTemplatesRegion.getRenewalPrice().multiply(divide); - storePostage = storePostage.add(shippingTemplatesRegion.getFirstPrice()).add(renewalPrice); - } - break; - case 3: // 体积 - BigDecimal volume = value.getBigDecimal("volume"); - if (volume.compareTo(shippingTemplatesRegion.getFirst()) <= 0) { - storePostage = storePostage.add(shippingTemplatesRegion.getFirstPrice()); - } else {// 超过首件的需要计算续件 - BigDecimal renewalNum = volume.subtract(shippingTemplatesRegion.getFirst()); - // 剩余件数/续件 = 需要计算的续件费用的次数 - BigDecimal divide = renewalNum.divide(shippingTemplatesRegion.getRenewal(), 0, BigDecimal.ROUND_UP); - BigDecimal renewalPrice = shippingTemplatesRegion.getRenewalPrice().multiply(divide); - storePostage = storePostage.add(shippingTemplatesRegion.getFirstPrice()).add(renewalPrice); - } - break; } } + ShippingTemplatesRegion shippingTemplatesRegion = shippingTemplatesRegionService.getByTempIdAndCityId(tempId, cityId); + if (shippingTemplate.getAppoint().equals(1) && ObjectUtil.isNull(shippingTemplatesRegion)) { + continue; + } + if (ObjectUtil.isNull(shippingTemplatesRegion)) { + shippingTemplatesRegion = shippingTemplatesRegionService.getByTempIdAndCityId(tempId, 0); + } + BigDecimal postageFee = BigDecimal.ZERO; + // 判断计费方式：件数、重量、体积 + switch (shippingTemplate.getType()) { + case 1: // 件数 + // 判断件数是否超过首件 + Integer num = value.getInt("totalNum"); + if (num <= shippingTemplatesRegion.getFirst().intValue()) { + storePostage = storePostage.add(shippingTemplatesRegion.getFirstPrice()); + postageFee = shippingTemplatesRegion.getFirstPrice(); + } else {// 超过首件的需要计算续件 + int renewalNum = num - shippingTemplatesRegion.getFirst().intValue(); + // 剩余件数/续件 = 需要计算的续件费用的次数 + BigDecimal renewalPrice = shippingTemplatesRegion.getRenewalPrice().multiply(new BigDecimal(String.valueOf(renewalNum)).divide(shippingTemplatesRegion.getRenewal(), 0, RoundingMode.UP)); + storePostage = storePostage.add(shippingTemplatesRegion.getFirstPrice()).add(renewalPrice); + postageFee = shippingTemplatesRegion.getFirstPrice().add(renewalPrice); + } + List orderInfoDetailVos = orderInfoVo.getOrderDetailList().stream().filter(e -> e.getTempId().equals(tempId)).collect(Collectors.toList()); + if (orderInfoDetailVos.size() == 1) { + orderInfoVo.setFreightFee(postageFee); + } else { + Integer tempNum = num; + for (int i = 0; i < orderInfoDetailVos.size(); i++) { + OrderInfoDetailVo orderInfoDetailVo = orderInfoDetailVos.get(i); + if (orderInfoDetailVos.size() == (i + 1)) { + orderInfoVo.setFreightFee(postageFee); + break; + } + // 更新运费计算公式 2025-4-15 + BigDecimal multiply = postageFee.multiply(new BigDecimal(orderInfoDetailVo.getPayNum().toString())).divide(new BigDecimal(tempNum.toString()), 2, RoundingMode.UP); + if (postageFee.compareTo(multiply) < 0) { + multiply = postageFee; + } + orderInfoVo.setFreightFee(multiply); + postageFee = postageFee.subtract(multiply); + tempNum = tempNum - orderInfoDetailVo.getPayNum(); + } + } + break; + case 2: // 重量 + case 3: // 体积 + BigDecimal surplus = shippingTemplate.getType().equals(2) ? value.getBigDecimal("weight") : value.getBigDecimal("volume"); + if (surplus.compareTo(shippingTemplatesRegion.getFirst()) <= 0) { + storePostage = storePostage.add(shippingTemplatesRegion.getFirstPrice()); + postageFee = shippingTemplatesRegion.getFirstPrice(); + } else {// 超过首件的需要计算续件 + BigDecimal renewalNum = surplus.subtract(shippingTemplatesRegion.getFirst()); + // 剩余件数/续件 = 需要计算的续件费用的次数 + BigDecimal renewalPrice = shippingTemplatesRegion.getRenewalPrice().multiply(renewalNum.divide(shippingTemplatesRegion.getRenewal(), 0, RoundingMode.UP)); + storePostage = storePostage.add(shippingTemplatesRegion.getFirstPrice()).add(renewalPrice); + postageFee = shippingTemplatesRegion.getFirstPrice().add(renewalPrice); + } + List orderInfoDetailVo = orderInfoVo.getOrderDetailList().stream().filter(e -> e.getTempId().equals(tempId)).collect(Collectors.toList()); + if (orderInfoDetailVo.size() == 1) { + orderInfoVo.setFreightFee(postageFee); + } else { + BigDecimal tempSurplus = surplus; + for (int i = 0; i < orderInfoDetailVo.size(); i++) { + OrderInfoDetailVo orderInfoDetailVo1 = orderInfoDetailVo.get(i); + if (orderInfoDetailVo.size() == (i + 1)) { + orderInfoVo.setFreightFee(postageFee); + break; + } + BigDecimal wv = shippingTemplate.getType().equals(2) ? orderInfoDetailVo1.getWeight() : orderInfoDetailVo1.getVolume(); + // 更新运费计算公式 2025-4-15 + BigDecimal multiply = postageFee.multiply(wv.multiply(new BigDecimal(orderInfoDetailVo1.getPayNum().toString()))).divide(tempSurplus, 2, RoundingMode.HALF_UP); + if (postageFee.compareTo(multiply) < 0) { + multiply = postageFee; + } + orderInfoVo.setFreightFee(multiply); + postageFee = postageFee.subtract(multiply); + tempSurplus = tempSurplus.subtract(wv.multiply(new BigDecimal(orderInfoDetailVo1.getPayNum().toString()))); + } + } + break; + } } - orderInfoVo.setFreightFee(storePostage); + freightFee = freightFee.add(storePostage); +// orderInfoVo.setFreightFee(storePostage); + orderInfoVo.setFreightFee(freightFee); } private ComputedOrderPriceResponse computedPrice(OrderComputedPriceRequest request, OrderInfoVo orderInfoVo, User user) { @@ -2013,7 +2087,7 @@ public class OrderServiceImpl implements OrderService { } else {// 快递配送，有地址 UserAddress userAddress = userAddressService.getById(request.getAddressId()); if (ObjectUtil.isNull(userAddress)) { - priceResponse.setFreightFee(BigDecimal.ZERO); + throw new CrmebException("用户地址不存在"); } else { getFreightFee(orderInfoVo, userAddress); priceResponse.setFreightFee(orderInfoVo.getFreightFee()); @@ -2040,7 +2114,7 @@ public class OrderServiceImpl implements OrderService { throw new CrmebException("此优惠券已失效！"); } //判断是否在使用时间内 - Date date = DateUtil.nowDateTime(); + Date date = CrmebDateUtil.nowDateTime(); if (storeCouponUser.getStartTime().compareTo(date) > 0) { throw new CrmebException("此优惠券还未到达使用时间范围之内！"); } @@ -2051,12 +2125,25 @@ public class OrderServiceImpl implements OrderService { throw new CrmebException("总金额小于优惠券最小使用金额"); } //检测优惠券信息 - if (storeCouponUser.getUseType() > 1) { - List productIdList = orderInfoVo.getOrderDetailList().stream().map(OrderInfoDetailVo::getProductId).collect(Collectors.toList()); - if (productIdList.size() < 1) { + if (storeCouponUser.getUseType().equals(1)) { + if (orderInfoVo.getProTotalFee().compareTo(storeCouponUser.getMoney()) <= 0) { + priceResponse.setCouponFee(orderInfoVo.getProTotalFee()); + priceResponse.setDeductionPrice(BigDecimal.ZERO); + priceResponse.setSurplusIntegral(user.getIntegral()); + priceResponse.setPayFee(priceResponse.getFreightFee()); + priceResponse.setUsedIntegral(0); + priceResponse.setUseIntegral(false); + priceResponse.setProTotalFee(orderInfoVo.getProTotalFee()); + return priceResponse; + } else { + priceResponse.setCouponFee(storeCouponUser.getMoney()); + } + } else { + List orderDetailList = orderInfoVo.getOrderDetailList(); + List productIdList = orderDetailList.stream().map(OrderInfoDetailVo::getProductId).collect(Collectors.toList()); + if (CollUtil.isEmpty(productIdList)) { throw new CrmebException("没有找到商品"); } - //设置优惠券所提供的集合 List primaryKeyIdList = CrmebUtil.stringToArray(storeCouponUser.getPrimaryKey()); @@ -2068,39 +2155,78 @@ public class OrderServiceImpl implements OrderService { if (CollUtil.isEmpty(primaryKeyIdList)) { throw new CrmebException("此优惠券为商品券，请购买相关商品之后再使用！"); } + List proOrderDetailList = orderDetailList.stream().filter(e -> primaryKeyIdList.contains(e.getProductId())).collect(Collectors.toList()); + BigDecimal productTotalPrice = proOrderDetailList.stream().map(e -> e.getVipPrice().multiply(new BigDecimal(e.getPayNum().toString()))).reduce(BigDecimal.ZERO, BigDecimal::add); + if (productTotalPrice.compareTo(storeCouponUser.getMoney()) <= 0) { + priceResponse.setCouponFee(productTotalPrice); + } else { + priceResponse.setCouponFee(storeCouponUser.getMoney()); + } + if (orderInfoVo.getProTotalFee().compareTo(productTotalPrice) <= 0 && productTotalPrice.compareTo(storeCouponUser.getMoney()) <= 0) { + priceResponse.setDeductionPrice(BigDecimal.ZERO); + priceResponse.setSurplusIntegral(user.getIntegral()); + priceResponse.setPayFee(priceResponse.getFreightFee()); + priceResponse.setUsedIntegral(0); + priceResponse.setUseIntegral(false); + priceResponse.setProTotalFee(orderInfoVo.getProTotalFee()); + return priceResponse; + } } if (storeCouponUser.getUseType() == 3) { //拿出需要使用优惠券的商品分类集合 - List categoryIdList = storeProductService.getSecondaryCategoryByProductId(StringUtils.join(productIdList, ",")); - + List categoryIdList = storeProductService.getProductAllCategoryIdByProductIds(productIdList); + Integer primaryKey = primaryKeyIdList.get(0); primaryKeyIdList.retainAll(categoryIdList); - if (CollUtil.isEmpty(primaryKeyIdList)) { + if (!categoryIdList.contains(primaryKey)) { throw new CrmebException("此优惠券为分类券，请购买相关分类下的商品之后再使用！"); } + List containsIdList = new ArrayList<>(); + List storeProductList = storeProductService.getListInIds(productIdList); + for (StoreProduct product : storeProductList) { + List cateIdList = CrmebUtil.stringToArray(product.getCateId()); + if (cateIdList.contains(primaryKey)) { + containsIdList.add(product.getId()); + continue; + } + List categoryList = categoryService.getByIds(cateIdList); + List parentCIdList = new ArrayList<>(); + for (Category category: categoryList) { + List parentIdList = CrmebUtil.stringToArrayByRegex(category.getPath(), "/"); + parentCIdList.addAll(parentIdList); + } + parentCIdList = parentCIdList.stream().distinct().collect(Collectors.toList()); + if (parentCIdList.contains(primaryKey)) { + containsIdList.add(product.getId()); + } + } + List proOrderDetailList = orderDetailList.stream().filter(e -> containsIdList.contains(e.getProductId())).collect(Collectors.toList()); + BigDecimal productTotalPrice = proOrderDetailList.stream().map(e -> e.getVipPrice().multiply(new BigDecimal(e.getPayNum().toString()))).reduce(BigDecimal.ZERO, BigDecimal::add); + if (productTotalPrice.compareTo(storeCouponUser.getMoney()) <= 0) { + priceResponse.setCouponFee(productTotalPrice); + } else { + priceResponse.setCouponFee(storeCouponUser.getMoney()); + } + if (orderInfoVo.getProTotalFee().compareTo(productTotalPrice) <= 0 && productTotalPrice.compareTo(storeCouponUser.getMoney()) <= 0) { + priceResponse.setDeductionPrice(BigDecimal.ZERO); + priceResponse.setSurplusIntegral(user.getIntegral()); + priceResponse.setPayFee(priceResponse.getFreightFee()); + priceResponse.setUsedIntegral(0); + priceResponse.setUseIntegral(false); + priceResponse.setProTotalFee(orderInfoVo.getProTotalFee()); + return priceResponse; + } } } - if (orderInfoVo.getProTotalFee().compareTo(storeCouponUser.getMoney()) <= 0) { - priceResponse.setCouponFee(orderInfoVo.getProTotalFee()); - priceResponse.setDeductionPrice(BigDecimal.ZERO); - priceResponse.setSurplusIntegral(user.getIntegral()); - priceResponse.setPayFee(priceResponse.getFreightFee()); - priceResponse.setUsedIntegral(0); - priceResponse.setUseIntegral(false); - priceResponse.setProTotalFee(orderInfoVo.getProTotalFee()); - return priceResponse; - } else { - priceResponse.setCouponFee(storeCouponUser.getMoney()); - } } // 积分部分 - BigDecimal payPrice = orderInfoVo.getProTotalFee().add(priceResponse.getFreightFee()).subtract(priceResponse.getCouponFee()); + BigDecimal payPrice = orderInfoVo.getProTotalFee().subtract(priceResponse.getCouponFee()); priceResponse.setUseIntegral(request.getUseIntegral()); priceResponse.setProTotalFee(orderInfoVo.getProTotalFee()); if (!request.getUseIntegral() || user.getIntegral() <= 0) {// 不使用积分 priceResponse.setDeductionPrice(BigDecimal.ZERO); priceResponse.setSurplusIntegral(user.getIntegral()); - priceResponse.setPayFee(payPrice); + priceResponse.setPayFee(payPrice.add(priceResponse.getFreightFee())); priceResponse.setUsedIntegral(0); return priceResponse; } @@ -2123,7 +2249,7 @@ public class OrderServiceImpl implements OrderService { } payPrice = BigDecimal.ZERO; } - priceResponse.setPayFee(payPrice); + priceResponse.setPayFee(payPrice.add(priceResponse.getFreightFee())); priceResponse.setDeductionPrice(deductionPrice); } return priceResponse; diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderTaskServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderTaskServiceImpl.java index b97ea01a..4d847072 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderTaskServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderTaskServiceImpl.java @@ -2,7 +2,10 @@ package com.zbkj.service.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.zbkj.common.constants.Constants; import com.zbkj.common.constants.TaskConstants; @@ -11,7 +14,7 @@ import com.zbkj.common.model.order.StoreOrder; import com.zbkj.common.model.order.StoreOrderStatus; import com.zbkj.common.model.product.StoreProductReply; import com.zbkj.common.model.user.User; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.common.utils.RedisUtil; import com.zbkj.common.vo.StoreOrderInfoOldVo; import com.zbkj.service.service.*; @@ -28,7 +31,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相关版权 * +---------------------------------------------------------------------- @@ -67,6 +70,9 @@ public class OrderTaskServiceImpl implements OrderTaskService { @Autowired private OrderPayService orderPayService; + @Autowired + private SystemConfigService systemConfigService; + /** * 用户取消订单 * @author Mr.Zhang @@ -160,7 +166,11 @@ public class OrderTaskServiceImpl implements OrderTaskService { continue; } try { - StoreOrder storeOrder = getJavaBeanStoreOrder(data); + StoreOrder storeOrder = storeOrderService.getById(Integer.valueOf(data.toString())); + if (ObjectUtil.isNull(storeOrder)) { + logger.error("OrderTaskServiceImpl.orderPaySuccessAfter | 订单不存在，orderId: " + data); + throw new CrmebException("订单不存在，orderId: " + data); + } boolean result = storeOrderTaskService.complete(storeOrder); if (!result) { redisUtil.lPush(redisKey, data); @@ -282,14 +292,14 @@ public class OrderTaskServiceImpl implements OrderTaskService { // 根据订单状态表判断订单是否可以自动完成 for (StoreOrder order : orderList) { StoreOrderStatus orderStatus = storeOrderStatusService.getLastByOrderId(order.getId()); - if (!"user_take_delivery".equals(orderStatus.getChangeType())) { + if (!orderStatus.getChangeType().equals("user_take_delivery")) { logger.error("订单自动完成：订单记录最后一条不是收货状态，orderId = " + order.getId()); continue ; } // 判断是否到自动完成时间（收货时间向后偏移7天） - String comTime = DateUtil.addDay(orderStatus.getCreateTime(), 7, Constants.DATE_FORMAT); - int compareDate = DateUtil.compareDate(comTime, DateUtil.nowDateTime(Constants.DATE_FORMAT), Constants.DATE_FORMAT); - if (compareDate < 0) { + String comTime = CrmebDateUtil.addDay(orderStatus.getCreateTime(), 7, Constants.DATE_FORMAT); + int compareDate = CrmebDateUtil.compareDate(comTime, CrmebDateUtil.nowDateTime(Constants.DATE_FORMAT), Constants.DATE_FORMAT); + if (compareDate > 0) { continue ; } @@ -313,15 +323,7 @@ public class OrderTaskServiceImpl implements OrderTaskService { continue; } String replyType = Constants.STORE_REPLY_TYPE_PRODUCT; -// if (ObjectUtil.isNotNull(orderInfo.getInfo().getSeckillId()) && orderInfo.getInfo().getSeckillId() > 0) { -// replyType = Constants.STORE_REPLY_TYPE_SECKILL; -// } -// if (ObjectUtil.isNotNull(orderInfo.getInfo().getBargainId()) && orderInfo.getInfo().getBargainId() > 0) { -// replyType = Constants.STORE_REPLY_TYPE_BARGAIN; -// } -// if (ObjectUtil.isNotNull(orderInfo.getInfo().getCombinationId()) && orderInfo.getInfo().getCombinationId() > 0) { -// replyType = Constants.STORE_REPLY_TYPE_PINTUAN; -// } + StoreProductReply reply = new StoreProductReply(); reply.setUid(order.getUid()); reply.setOid(order.getId()); @@ -335,11 +337,13 @@ public class OrderTaskServiceImpl implements OrderTaskService { reply.setNickname(user.getNickname()); reply.setAvatar(user.getAvatar()); reply.setSku(orderInfo.getInfo().getSku()); - reply.setCreateTime(DateUtil.nowDateTime()); + reply.setCreateTime(CrmebDateUtil.nowDateTime()); replyList.add(reply); } order.setStatus(Constants.ORDER_STATUS_INT_COMPLETE); Boolean execute = transactionTemplate.execute(e -> { + System.out.println("操作的订单ID：" + order.getId()); + order.setUpdateTime(DateUtil.date()); storeOrderService.updateById(order); storeProductReplyService.saveBatch(replyList); return Boolean.TRUE; @@ -351,4 +355,34 @@ public class OrderTaskServiceImpl implements OrderTaskService { } } } + + /** + * 订单自动收货 + */ + @Override + public void autoTakeDelivery() { + int day = 14; + String autoDay = systemConfigService.getValueByKey("auto_take_delivery_day"); + if (StrUtil.isNotBlank(autoDay) && Integer.parseInt(autoDay) >= 1) { + day = Integer.parseInt(autoDay); + } + DateTime dateTime = cn.hutool.core.date.DateUtil.offsetDay(cn.hutool.core.date.DateUtil.date(), -day); + List storeOrderList = storeOrderService.findAwaitTakeDeliveryOrderList(dateTime.toString()); + + storeOrderList.forEach(order -> { + try { + //已收货，待评价 + order.setStatus(Constants.ORDER_STATUS_INT_BARGAIN); + order.setUpdateTime(DateUtil.date()); + boolean result = storeOrderService.updateById(order); + if (result) { + //后续操作放入redis + redisUtil.lPush(TaskConstants.ORDER_TASK_REDIS_KEY_AFTER_TAKE_BY_USER, order.getId()); + } + } catch (Exception e) { + logger.error("自动收货异常：订单号:{},异常信息={}", order.getOrderId(), e.getMessage()); + } + }); + + } } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OssServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OssServiceImpl.java index fe7c77e8..7e23a296 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OssServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OssServiceImpl.java @@ -19,7 +19,7 @@ import java.io.File; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/QiNiuServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/QiNiuServiceImpl.java index ecbc4f90..a4dcd8be 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/QiNiuServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/QiNiuServiceImpl.java @@ -22,7 +22,7 @@ import java.io.File; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -66,20 +66,14 @@ public class QiNiuServiceImpl implements QiNiuService { } @Override - public void uploadFile(UploadManager uploadManager, CloudVo cloudVo, String upToken, String webPth, String localFile, File file) { + public void uploadFile(UploadManager uploadManager, String upToken, String webPth, String localFile, File file) { try { - logger.info("上传文件开始：" + localFile); - -// File file = new File(localFile); if(!file.exists()){ - logger.info("上传文件" + localFile + "不存在："); + logger.error("上传文件" + localFile + "不存在："); return; } - -// Response put = uploadManager.put(localFile, webPth, upToken); Response put = uploadManager.put(file, webPth, upToken); put.close(); - logger.info("上传文件 -- 结束：" + put.address); } catch (QiniuException ex) { throw new CrmebException(ex.getMessage()); } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/RechargePayServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/RechargePayServiceImpl.java index 9eda3262..47ba7f62 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/RechargePayServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/RechargePayServiceImpl.java @@ -2,7 +2,7 @@ package com.zbkj.service.service.impl; import cn.hutool.core.util.StrUtil; import com.zbkj.common.constants.Constants; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.common.model.finance.UserRecharge; import com.zbkj.common.model.user.User; import com.zbkj.common.model.user.UserBill; @@ -22,7 +22,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相关版权 * +---------------------------------------------------------------------- @@ -52,7 +52,7 @@ public class RechargePayServiceImpl implements RechargePayService { @Override public Boolean paySuccess(UserRecharge userRecharge) { userRecharge.setPaid(true); - userRecharge.setPayTime(DateUtil.nowDateTime()); + userRecharge.setPayTime(CrmebDateUtil.nowDateTime()); User user = userService.getById(userRecharge.getUid()); @@ -70,7 +70,7 @@ public class RechargePayServiceImpl implements RechargePayService { userBill.setBalance(balance); userBill.setMark(StrUtil.format("余额增加了{}元", payPrice)); userBill.setStatus(1); - userBill.setCreateTime(DateUtil.nowDateTime()); + userBill.setCreateTime(CrmebDateUtil.nowDateTime()); Boolean execute = transactionTemplate.execute(e -> { // 订单变动 diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/RetailShopServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/RetailShopServiceImpl.java index 216f6c90..80e4896f 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/RetailShopServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/RetailShopServiceImpl.java @@ -3,17 +3,17 @@ package com.zbkj.service.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zbkj.common.page.CommonPage; -import com.zbkj.common.request.PageParamRequest; -import com.zbkj.common.exception.CrmebException; -import com.zbkj.common.request.RetailShopRequest; -import com.zbkj.common.response.SpreadUserResponse; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.zbkj.common.response.UserExtractResponse; +import com.zbkj.common.exception.CrmebException; import com.zbkj.common.model.user.User; import com.zbkj.common.model.user.UserBrokerageRecord; +import com.zbkj.common.page.CommonPage; +import com.zbkj.common.request.PageParamRequest; +import com.zbkj.common.request.RetailShopRequest; +import com.zbkj.common.response.SpreadUserResponse; +import com.zbkj.common.response.UserExtractResponse; import com.zbkj.service.dao.UserDao; import com.zbkj.service.service.*; import org.springframework.beans.BeanUtils; @@ -30,7 +30,7 @@ import java.util.stream.Collectors; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -154,15 +154,12 @@ public class RetailShopServiceImpl extends ServiceImpl implements int ration = retailShopRequest.getStoreBrokerageTwo() + retailShopRequest.getStoreBrokerageRatio(); if (ration > 100 || ration < 0) throw new CrmebException("返佣比例加起来不能超过100%"); -// List keys = initKeys(); systemConfigService.updateOrSaveValueByName("brokerage_func_status", retailShopRequest.getBrokerageFuncStatus().toString()); -// systemConfigService.updateOrSaveValueByName("store_brokerage_status", retailShopRequest.getStoreBrokerageStatus()); systemConfigService.updateOrSaveValueByName("store_brokerage_ratio", retailShopRequest.getStoreBrokerageRatio().toString()); systemConfigService.updateOrSaveValueByName("store_brokerage_two", retailShopRequest.getStoreBrokerageTwo().toString()); systemConfigService.updateOrSaveValueByName("user_extract_min_price", retailShopRequest.getUserExtractMinPrice().toString()); systemConfigService.updateOrSaveValueByName("user_extract_bank", retailShopRequest.getUserExtractBank()); systemConfigService.updateOrSaveValueByName("extract_time", retailShopRequest.getExtractTime().toString()); -// systemConfigService.updateOrSaveValueByName(keys.get(7), retailShopRequest.getStoreBrokeragePrice().toString()); systemConfigService.updateOrSaveValueByName("brokerage_bindind", retailShopRequest.getBrokerageBindind().toString()); systemConfigService.updateOrSaveValueByName("store_brokerage_quota", retailShopRequest.getStoreBrokerageQuota().toString()); systemConfigService.updateOrSaveValueByName("store_brokerage_is_bubble", retailShopRequest.getStoreBrokerageIsBubble().toString()); diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/ShippingTemplatesFreeServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/ShippingTemplatesFreeServiceImpl.java index 53ea6af6..4cf74e46 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/ShippingTemplatesFreeServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/ShippingTemplatesFreeServiceImpl.java @@ -1,34 +1,38 @@ package com.zbkj.service.service.impl; +import cn.hutool.core.collection.CollUtil; +import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zbkj.common.utils.CrmebUtil; import com.zbkj.common.model.express.ShippingTemplatesFree; import com.zbkj.common.request.ShippingTemplatesFreeRequest; +import com.zbkj.common.response.ShippingTemplatesFreeResponse; +import com.zbkj.common.utils.CrmebUtil; import com.zbkj.service.dao.ShippingTemplatesFreeDao; import com.zbkj.service.service.ShippingTemplatesFreeService; import com.zbkj.service.service.SystemCityService; import org.apache.commons.codec.digest.DigestUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; +import java.util.*; +import java.util.stream.Collectors; /** -* ShippingTemplatesFreeServiceImpl 接口实现 -* +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- -*/ + * ShippingTemplatesFreeServiceImpl 接口实现 + * +---------------------------------------------------------------------- + * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] + * +---------------------------------------------------------------------- + * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved. + * +---------------------------------------------------------------------- + * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 + * +---------------------------------------------------------------------- + * | Author: CRMEB Team + * +---------------------------------------------------------------------- + */ @Service public class ShippingTemplatesFreeServiceImpl extends ServiceImpl implements ShippingTemplatesFreeService { @@ -42,56 +46,63 @@ public class ShippingTemplatesFreeServiceImpl extends ServiceImpl 运费集合 - * @param type Integer 计费方式 - * @param tempId Integer 运费模板id - * @author Mr.Zhang - * @since 2020-05-20 + * @param type Integer 计费方式 + * @param tempId Integer 运费模板id */ - @Async @Override - public void saveAll(List shippingTemplatesFreeRequestList, Integer type, Integer tempId) { - + public Boolean saveAll(List shippingTemplatesFreeRequestList, Integer type, Integer tempId) { ArrayList shippingTemplatesFreesList = new ArrayList<>(); - - //把目前模板下的所有数据标记为无效 - updateStatus(tempId); - for (ShippingTemplatesFreeRequest shippingTemplatesFreeRequest : shippingTemplatesFreeRequestList) { String uniqueKey = DigestUtils.md5Hex(shippingTemplatesFreeRequest.toString()); - if("all".equals(shippingTemplatesFreeRequest.getCityId()) || "0".equals(shippingTemplatesFreeRequest.getCityId())){ - cityIdList = getCityIdList(); - }else{ - cityIdList = CrmebUtil.stringToArray(shippingTemplatesFreeRequest.getCityId()); - } - for (Integer cityId: cityIdList) { + List titleArray = JSONArray.parseArray(shippingTemplatesFreeRequest.getTitle(), String.class); + if (shippingTemplatesFreeRequest.getCityId().equals("all") || shippingTemplatesFreeRequest.getCityId().equals("0")) { ShippingTemplatesFree shippingTemplatesFree = new ShippingTemplatesFree(); - shippingTemplatesFree.setCityId(cityId); - shippingTemplatesFree.setTitle(shippingTemplatesFreeRequest.getTitle()); + shippingTemplatesFree.setCityId(0); + shippingTemplatesFree.setTitle(titleArray.get(0)); shippingTemplatesFree.setUniqid(uniqueKey); shippingTemplatesFree.setTempId(tempId); shippingTemplatesFree.setType(type); + shippingTemplatesFree.setStatus(true); shippingTemplatesFree.setNumber(shippingTemplatesFreeRequest.getNumber()); shippingTemplatesFree.setPrice(shippingTemplatesFreeRequest.getPrice()); - shippingTemplatesFree.setStatus(true); shippingTemplatesFreesList.add(shippingTemplatesFree); + } else { + cityIdList = CrmebUtil.stringToArray(shippingTemplatesFreeRequest.getCityId()); + Map cityMap = new HashMap<>(); + titleArray.forEach(e -> { + JSONArray parseArray = JSONArray.parseArray(e); + Integer cityId = parseArray.getInteger(2); + cityMap.put(cityId, e); + }); + for (Integer cityId : cityIdList) { + ShippingTemplatesFree shippingTemplatesFree = new ShippingTemplatesFree(); + shippingTemplatesFree.setCityId(cityId); + shippingTemplatesFree.setTitle(cityMap.get(cityId)); + shippingTemplatesFree.setUniqid(uniqueKey); + shippingTemplatesFree.setTempId(tempId); + shippingTemplatesFree.setType(type); + shippingTemplatesFree.setNumber(shippingTemplatesFreeRequest.getNumber()); + shippingTemplatesFree.setPrice(shippingTemplatesFreeRequest.getPrice()); + shippingTemplatesFree.setStatus(true); + shippingTemplatesFreesList.add(shippingTemplatesFree); + } } } //批量保存模板数据 - saveBatch(shippingTemplatesFreesList); - - //删除模板下的无效数据 - delete(tempId); + return saveBatch(shippingTemplatesFreesList); } /** * 获取所有城市cityId + * + * @return List * @author Mr.Zhang * @since 2020-04-16 - * @return List */ private List getCityIdList() { - if(this.cityIdList == null || this.cityIdList.size() < 1){ + if (this.cityIdList == null || this.cityIdList.size() < 1) { this.cityIdList = systemCityService.getCityIdList(); } return this.cityIdList; @@ -99,6 +110,7 @@ public class ShippingTemplatesFreeServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(ShippingTemplatesFree::getTempId, tempId); - lambdaQueryWrapper.eq(ShippingTemplatesFree::getStatus, false); - return dao.delete(lambdaQueryWrapper) > 0; + public Boolean deleteByTempId(Integer tempId) { + LambdaUpdateWrapper wrapper = Wrappers.lambdaUpdate(); + wrapper.eq(ShippingTemplatesFree::getTempId, tempId); + return dao.delete(wrapper) > 0; } /** * 根据模板编号、城市ID查询 + * * @param tempId 模板编号 * @param cityId 城市ID * @return 运费模板 @@ -136,19 +149,41 @@ public class ShippingTemplatesFreeServiceImpl extends ServiceImpl */ @Override - public List getListGroup(Integer tempId) { - return dao.getListGroup(tempId); + public List getListGroup(Integer tempId) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.select(ShippingTemplatesFree::getTitle, ShippingTemplatesFree::getNumber, ShippingTemplatesFree::getPrice, + ShippingTemplatesFree::getUniqid); + lqw.eq(ShippingTemplatesFree::getTempId, tempId); + List list = dao.selectList(lqw); + List responseList = CollUtil.newArrayList(); + if (CollUtil.isEmpty(list)) { + return responseList; + } + Map> listMap = list.stream().collect(Collectors.groupingBy(ShippingTemplatesFree::getUniqid, LinkedHashMap::new, Collectors.toList())); + Set>> entrySet = listMap.entrySet(); + for (Map.Entry> entry : entrySet) { + String uniqid = entry.getKey(); + String title = entry.getValue().stream().map(ShippingTemplatesFree::getTitle).collect(Collectors.joining(",")); + ShippingTemplatesFree free = entry.getValue().get(0); + ShippingTemplatesFreeResponse response = new ShippingTemplatesFreeResponse(); + response.setTitle(title); + response.setUniqid(uniqid); + response.setNumber(free.getNumber()); + response.setPrice(free.getPrice()); + responseList.add(response); + } + return responseList; } } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/ShippingTemplatesRegionServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/ShippingTemplatesRegionServiceImpl.java index 96f81ed4..12504280 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/ShippingTemplatesRegionServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/ShippingTemplatesRegionServiceImpl.java @@ -1,36 +1,39 @@ package com.zbkj.service.service.impl; +import cn.hutool.core.collection.CollUtil; +import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zbkj.common.utils.CrmebUtil; import com.zbkj.common.model.express.ShippingTemplatesRegion; import com.zbkj.common.request.ShippingTemplatesRegionRequest; +import com.zbkj.common.response.ShippingTemplatesRegionResponse; +import com.zbkj.common.utils.CrmebUtil; import com.zbkj.service.dao.ShippingTemplatesRegionDao; import com.zbkj.service.service.ShippingTemplatesRegionService; import com.zbkj.service.service.SystemCityService; import org.apache.commons.codec.digest.DigestUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; +import java.util.*; +import java.util.stream.Collectors; /** -* ShippingTemplatesRegionServiceImpl 接口实现 -* +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- -*/ + * ShippingTemplatesRegionServiceImpl 接口实现 + * +---------------------------------------------------------------------- + * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] + * +---------------------------------------------------------------------- + * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved. + * +---------------------------------------------------------------------- + * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 + * +---------------------------------------------------------------------- + * | Author: CRMEB Team + * +---------------------------------------------------------------------- + */ @Service public class ShippingTemplatesRegionServiceImpl extends ServiceImpl implements ShippingTemplatesRegionService { @@ -52,32 +55,21 @@ public class ShippingTemplatesRegionServiceImpl extends ServiceImpl 运费集合 - * @param type Integer 计费方式 - * @param tempId Integer 运费模板id - * @author Mr.Zhang - * @since 2020-05-20 + * @param type Integer 计费方式 + * @param tempId Integer 运费模板id */ - @Async @Override - public void saveAll(List shippingTemplatesRegionRequestList, Integer type, Integer tempId) { + public Boolean saveAll(List shippingTemplatesRegionRequestList, Integer type, Integer tempId) { ArrayList shippingTemplatesRegionList = new ArrayList<>(); - - //把目前模板下的所有数据标记为无效 - updateStatus(tempId); - for (ShippingTemplatesRegionRequest shippingTemplatesRegionRequest : shippingTemplatesRegionRequestList) { String uniqueKey = DigestUtils.md5Hex(shippingTemplatesRegionRequest.toString()); - - if("all".equals(shippingTemplatesRegionRequest.getCityId()) || "0".equals(shippingTemplatesRegionRequest.getCityId())){ - cityIdList = getCityIdList(); - }else{ - cityIdList = CrmebUtil.stringToArray(shippingTemplatesRegionRequest.getCityId()); - } - for (Integer cityId: cityIdList) { + List titleArray = JSONArray.parseArray(shippingTemplatesRegionRequest.getTitle(), String.class); + if (shippingTemplatesRegionRequest.getCityId().equals("all") || shippingTemplatesRegionRequest.getCityId().equals("0")) { ShippingTemplatesRegion shippingTemplatesRegion = new ShippingTemplatesRegion(); - shippingTemplatesRegion.setCityId(cityId); - shippingTemplatesRegion.setTitle(shippingTemplatesRegionRequest.getTitle()); + shippingTemplatesRegion.setCityId(0); + shippingTemplatesRegion.setTitle(titleArray.get(0)); shippingTemplatesRegion.setUniqid(uniqueKey); shippingTemplatesRegion.setRenewal(shippingTemplatesRegionRequest.getRenewal()); shippingTemplatesRegion.setRenewalPrice(shippingTemplatesRegionRequest.getRenewalPrice()); @@ -87,23 +79,50 @@ public class ShippingTemplatesRegionServiceImpl extends ServiceImpl cityIdList = CrmebUtil.stringToArray(shippingTemplatesRegionRequest.getCityId()); + Map cityMap = new HashMap<>(); + titleArray.forEach(e -> { + JSONArray parseArray = JSONArray.parseArray(e); + Integer cityId = parseArray.getInteger(2); + cityMap.put(cityId, e); + }); + for (Integer cityId : cityIdList) { + ShippingTemplatesRegion shippingTemplatesRegion = new ShippingTemplatesRegion(); + shippingTemplatesRegion.setCityId(cityId); + shippingTemplatesRegion.setTitle(cityMap.get(cityId)); + shippingTemplatesRegion.setUniqid(uniqueKey); + shippingTemplatesRegion.setRenewal(shippingTemplatesRegionRequest.getRenewal()); + shippingTemplatesRegion.setRenewalPrice(shippingTemplatesRegionRequest.getRenewalPrice()); + shippingTemplatesRegion.setFirst(shippingTemplatesRegionRequest.getFirst()); + shippingTemplatesRegion.setFirstPrice(shippingTemplatesRegionRequest.getFirstPrice()); + shippingTemplatesRegion.setTempId(tempId); + shippingTemplatesRegion.setType(type); + shippingTemplatesRegion.setStatus(true); + shippingTemplatesRegionList.add(shippingTemplatesRegion); + } } } //批量保存模板数据 - saveBatch(shippingTemplatesRegionList); + return saveBatch(shippingTemplatesRegionList); + } - //删除模板下的无效数据 - delete(tempId); + @Override + public Boolean deleteByTempId(Integer tempId) { + LambdaUpdateWrapper wrapper = Wrappers.lambdaUpdate(); + wrapper.eq(ShippingTemplatesRegion::getTempId, tempId); + return dao.delete(wrapper) > 0; } /** * 获取所有城市cityId + * + * @return List * @author Mr.Zhang * @since 2020-04-16 - * @return List */ private List getCityIdList() { - if(this.cityIdList == null || this.cityIdList.size() < 1){ + if (this.cityIdList == null || this.cityIdList.size() < 1) { this.cityIdList = systemCityService.getCityIdList(); } return this.cityIdList; @@ -111,21 +130,19 @@ public class ShippingTemplatesRegionServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(ShippingTemplatesRegion::getTempId, tempId); - - ShippingTemplatesRegion shippingTemplatesRegion = new ShippingTemplatesRegion(); - shippingTemplatesRegion.setStatus(false); - update(shippingTemplatesRegion, lambdaQueryWrapper); + private Boolean updateStatus(Integer tempId) { + LambdaUpdateWrapper wrapper = Wrappers.lambdaUpdate(); + wrapper.set(ShippingTemplatesRegion::getStatus, false); + wrapper.eq(ShippingTemplatesRegion::getTempId, tempId); + return update(wrapper); } /** * 删除模板下的无效数据 + * * @param tempId Integer 运费模板id * @return Boolean */ @@ -139,6 +156,7 @@ public class ShippingTemplatesRegionServiceImpl extends ServiceImpl findListById(Integer tempId) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(ShippingTemplatesRegion::getTempId, tempId); + lqw.eq(ShippingTemplatesRegion::getStatus, true); + return dao.selectList(lqw); + } + /** * 分组查询 + * * @param tempId Integer 运费模板id * @return List */ @Override - public List getListGroup(Integer tempId) { - return dao.getListGroup(tempId); + public List getListGroup(Integer tempId) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.select(ShippingTemplatesRegion::getTitle, ShippingTemplatesRegion::getFirst, ShippingTemplatesRegion::getFirstPrice, + ShippingTemplatesRegion::getRenewal, ShippingTemplatesRegion::getRenewalPrice, ShippingTemplatesRegion::getUniqid); + lqw.eq(ShippingTemplatesRegion::getTempId, tempId); + List list = dao.selectList(lqw); + List responseList = CollUtil.newArrayList(); + if (CollUtil.isEmpty(list)) { + return responseList; + } + Map> listMap = list.stream().collect(Collectors.groupingBy(ShippingTemplatesRegion::getUniqid, LinkedHashMap::new, Collectors.toList())); + Set>> entrySet = listMap.entrySet(); + for (Map.Entry> entry : entrySet) { + String uniqid = entry.getKey(); + String title = entry.getValue().stream().map(ShippingTemplatesRegion::getTitle).collect(Collectors.joining(",")); + ShippingTemplatesRegion region = entry.getValue().get(0); + ShippingTemplatesRegionResponse response = new ShippingTemplatesRegionResponse(); + response.setTitle(title); + response.setUniqid(uniqid); + response.setFirst(region.getFirst()); + response.setFirstPrice(region.getFirstPrice()); + response.setRenewal(region.getRenewal()); + response.setRenewalPrice(region.getRenewalPrice()); + responseList.add(response); + } + return responseList; } } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/ShippingTemplatesServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/ShippingTemplatesServiceImpl.java index 0ec69594..10655996 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/ShippingTemplatesServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/ShippingTemplatesServiceImpl.java @@ -1,22 +1,27 @@ package com.zbkj.service.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zbkj.common.request.PageParamRequest; -import com.zbkj.common.exception.CrmebException; import com.github.pagehelper.PageHelper; +import com.zbkj.common.exception.CrmebException; import com.zbkj.common.model.express.ShippingTemplates; -import com.zbkj.common.request.ShippingTemplatesFreeRequest; +import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.ShippingTemplatesRegionRequest; import com.zbkj.common.request.ShippingTemplatesRequest; import com.zbkj.common.request.ShippingTemplatesSearchRequest; +import com.zbkj.common.response.ShippingTemplatesFreeResponse; +import com.zbkj.common.response.ShippingTemplatesInfoResponse; +import com.zbkj.common.response.ShippingTemplatesRegionResponse; import com.zbkj.service.dao.ShippingTemplatesDao; import com.zbkj.service.service.ShippingTemplatesFreeService; import com.zbkj.service.service.ShippingTemplatesRegionService; import com.zbkj.service.service.ShippingTemplatesService; +import com.zbkj.service.service.StoreProductService; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.support.TransactionTemplate; @@ -25,17 +30,17 @@ import javax.annotation.Resource; import java.util.List; /** -* ShippingTemplatesServiceImpl 接口实现 -* +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- -*/ + * ShippingTemplatesServiceImpl 接口实现 + * +---------------------------------------------------------------------- + * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] + * +---------------------------------------------------------------------- + * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved. + * +---------------------------------------------------------------------- + * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 + * +---------------------------------------------------------------------- + * | Author: CRMEB Team + * +---------------------------------------------------------------------- + */ @Service public class ShippingTemplatesServiceImpl extends ServiceImpl implements ShippingTemplatesService { @@ -51,19 +56,23 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl - */ + * 列表 + * + * @param request 请求参数 + * @param pageParamRequest 分页类参数 + * @return List + * @author Mr.Zhang + * @since 2020-04-17 + */ @Override public List getList(ShippingTemplatesSearchRequest request, PageParamRequest pageParamRequest) { PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit()); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - if(!StringUtils.isBlank(request.getKeywords())){ + if (!StringUtils.isBlank(request.getKeywords())) { lambdaQueryWrapper.like(ShippingTemplates::getName, request.getKeywords()); } lambdaQueryWrapper.orderByDesc(ShippingTemplates::getSort).orderByDesc(ShippingTemplates::getId); @@ -72,10 +81,9 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl shippingTemplatesRegionRequestList = request.getShippingTemplatesRegionRequestList(); - if (CollUtil.isEmpty(shippingTemplatesRegionRequestList)) { - throw new CrmebException("区域运费最少需要一条默认的全国区域"); + if (request.getAppoint().equals(2) && CollUtil.isEmpty(shippingTemplatesRegionRequestList)) { + throw new CrmebException("不包邮，最少需要一条公共区域运费数据"); } ShippingTemplates shippingTemplates = new ShippingTemplates(); @@ -94,28 +102,39 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl shippingTemplatesFreeRequestList = request.getShippingTemplatesFreeRequestList(); - if(null != shippingTemplatesFreeRequestList && shippingTemplatesFreeRequestList.size() > 0 && request.getAppoint()){ - shippingTemplatesFreeService.saveAll(shippingTemplatesFreeRequestList, request.getType(), shippingTemplates.getId()); - } - - return true; + return transactionTemplate.execute(e -> { + boolean save = save(shippingTemplates); + if (!save) { + e.setRollbackOnly(); + return Boolean.FALSE; + } + if (!shippingTemplates.getAppoint().equals(0) && CollUtil.isNotEmpty(shippingTemplatesRegionRequestList)) { + save = shippingTemplatesRegionService.saveAll(shippingTemplatesRegionRequestList, shippingTemplates.getType(), shippingTemplates.getId()); + if (!save) { + e.setRollbackOnly(); + return Boolean.FALSE; + } + } + if (shippingTemplates.getAppoint().equals(2) && CollUtil.isNotEmpty(request.getShippingTemplatesFreeRequestList())) { + save = shippingTemplatesFreeService.saveAll(request.getShippingTemplatesFreeRequestList(), shippingTemplates.getType(), shippingTemplates.getId()); + if (!save) { + e.setRollbackOnly(); + return Boolean.FALSE; + } + } + return Boolean.TRUE; + }); } /** * 根据模板名称获取模板 + * * @param name 模板名称 * @return ShippingTemplates */ private ShippingTemplates getByName(String name) { LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); - lqw.in(ShippingTemplates::getName, name); + lqw.eq(ShippingTemplates::getName, name); return dao.selectOne(lqw); } @@ -132,47 +151,74 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl shippingTemplatesRegionRequestList = request.getShippingTemplatesRegionRequestList(); + if (request.getAppoint().equals(2) && CollUtil.isEmpty(shippingTemplatesRegionRequestList)) { + throw new CrmebException("不包邮，最少需要一条公共区域运费数据"); + } + if (!shippingTemplates.getName().equals(request.getName())) { + if (isExistName(request.getName())) { + throw new CrmebException("模板名称已存在,请更换模板名称!"); + } + } + shippingTemplates.setName(request.getName()); shippingTemplates.setSort(request.getSort()); shippingTemplates.setType(request.getType()); - shippingTemplates.setAppoint(request.getAppoint()); - - updateById(shippingTemplates); - - //区域运费 - List shippingTemplatesRegionRequestList = request.getShippingTemplatesRegionRequestList(); - - if(shippingTemplatesRegionRequestList.size() < 1){ - throw new CrmebException("请设置区域配送信息！"); - } - shippingTemplatesRegionService.saveAll(shippingTemplatesRegionRequestList, request.getType(), shippingTemplates.getId()); - - List shippingTemplatesFreeRequestList = request.getShippingTemplatesFreeRequestList(); - if(CollUtil.isNotEmpty(shippingTemplatesFreeRequestList) && request.getAppoint()){ - shippingTemplatesFreeService.saveAll(shippingTemplatesFreeRequestList, request.getType(), shippingTemplates.getId()); - } - - return true; + return transactionTemplate.execute(e -> { + if (!shippingTemplates.getAppoint().equals(0)) { + shippingTemplatesRegionService.deleteByTempId(id); + } + if (shippingTemplates.getAppoint().equals(2)) { + shippingTemplatesFreeService.deleteByTempId(id); + } + shippingTemplates.setAppoint(request.getAppoint()); + shippingTemplates.setUpdateTime(DateUtil.date()); + boolean update = updateById(shippingTemplates); + if (!update) { + e.setRollbackOnly(); + return Boolean.FALSE; + } + if (CollUtil.isNotEmpty(shippingTemplatesRegionRequestList)) { + update = shippingTemplatesRegionService.saveAll(shippingTemplatesRegionRequestList, request.getType(), shippingTemplates.getId()); + if (!update) { + e.setRollbackOnly(); + return Boolean.FALSE; + } + } + if (shippingTemplates.getAppoint().equals(2) && CollUtil.isNotEmpty(request.getShippingTemplatesFreeRequestList())) { + update = shippingTemplatesFreeService.saveAll(request.getShippingTemplatesFreeRequestList(), request.getType(), shippingTemplates.getId()); + if (!update) { + e.setRollbackOnly(); + return Boolean.FALSE; + } + } + return Boolean.TRUE; + }); } /** * 删除 + * * @param id Integer * @return boolean */ @Override public Boolean remove(Integer id) { + getByIdException(id); + if (storeProductService.isUseShippingTemplateId(id)) { + throw new CrmebException("有商品使用此运费模板，无法删除"); + } return transactionTemplate.execute(e -> { - shippingTemplatesRegionService.delete(id); - shippingTemplatesFreeService.delete(id); + shippingTemplatesRegionService.deleteByTempId(id); + shippingTemplatesFreeService.deleteByTempId(id); removeById(id); return Boolean.TRUE; }); @@ -180,17 +226,43 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl regionResponseList = shippingTemplatesRegionService.getListGroup(id); + if (CollUtil.isNotEmpty(regionResponseList)) { + regionResponseList.forEach(regionResponse -> { + regionResponse.setTitle("[" + regionResponse.getTitle() + "]"); + }); + response.setRegionList(regionResponseList); + } + if (shippingTemplates.getAppoint().equals(2)) { + List freeResponseList = shippingTemplatesFreeService.getListGroup(id); + freeResponseList.forEach(freeResponse -> { + freeResponse.setTitle("[" + freeResponse.getTitle() + "]"); + }); + response.setFreeList(freeResponseList); + } + return response; } + private ShippingTemplates getByIdException(Integer id) { + ShippingTemplates shippingTemplates = getById(id); + if (ObjectUtil.isNull(shippingTemplates)) { + throw new CrmebException("运费模板不存在"); + } + return shippingTemplates; + } + + } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SmsRecordServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SmsRecordServiceImpl.java index 33644b1e..4c7e5e79 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SmsRecordServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SmsRecordServiceImpl.java @@ -13,7 +13,7 @@ import javax.annotation.Resource; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SmsServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SmsServiceImpl.java index c0457bf5..70f68212 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SmsServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SmsServiceImpl.java @@ -40,7 +40,7 @@ import java.util.stream.Collectors; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -170,8 +170,8 @@ public class SmsServiceImpl implements SmsService { } OnePassLoginVo loginVo = onePassUtil.getLoginVo(); SendSmsVo smsVo = new SendSmsVo(); - smsVo.setUid(loginVo.getAccount()); - smsVo.setToken(loginVo.getSecret()); + smsVo.setUid(loginVo.getAccessKey()); + smsVo.setToken(loginVo.getSecretKey()); smsVo.setMobile(phone); smsVo.setTemplate(msgTempId); smsVo.setParam(JSONObject.toJSONString(mapPram)); @@ -179,7 +179,7 @@ public class SmsServiceImpl implements SmsService { } /** - * 添加待发送消息到redis队列 + * 组装发送对象 * * @param phone 手机号 * @param tempKey 模板key @@ -192,8 +192,8 @@ public class SmsServiceImpl implements SmsService { } OnePassLoginVo loginVo = onePassUtil.getLoginVo(); SendSmsVo smsVo = new SendSmsVo(); - smsVo.setUid(loginVo.getAccount()); - smsVo.setToken(loginVo.getSecret()); + smsVo.setUid(loginVo.getAccessKey()); + smsVo.setToken(loginVo.getSecretKey()); smsVo.setMobile(phone); smsVo.setTemplate(msgTempId); smsVo.setParam(JSONObject.toJSONString(mapPram)); @@ -231,6 +231,7 @@ public class SmsServiceImpl implements SmsService { param.add("temp_type", 0);// 查询所有类型模板 JSONObject post = postFrom(OnePassConstants.ONE_PASS_API_URL + OnePassConstants.ONE_PASS_TEMP_LIST_URI, param, header); JSONObject jsonObject = post.getJSONObject("data"); + logger.warn("短信模板响应JsonObject = {}", jsonObject); JSONArray jsonArray = jsonObject.getJSONArray("data"); MyRecord myRecord = new MyRecord(); if (CollUtil.isEmpty(jsonArray)) { @@ -253,7 +254,7 @@ public class SmsServiceImpl implements SmsService { return record; }).collect(Collectors.toList()); - myRecord.set("count", recordList.size()); + myRecord.set("count", jsonObject.getInteger("count")); myRecord.set("data", recordList); return myRecord; } @@ -344,7 +345,9 @@ public class SmsServiceImpl implements SmsService { if (smsObject.getInteger("num") <= 0) { throw new CrmebException("一号通账号服务余量不足"); } - + if (redisUtil.exists(SmsConstants.SMS_VALIDATE_PHONE_NUM + phone)) { + throw new CrmebException("您的短信发送过于频繁，请稍后再试"); + } return sendSms(phone, SmsConstants.SMS_CONFIG_TYPE_VERIFICATION_CODE, null); } @@ -529,6 +532,7 @@ public class SmsServiceImpl implements SmsService { } // 将验证码存入redis redisUtil.set(userService.getValidateCodeRedisKey(phone), code, Long.valueOf(codeExpireStr), TimeUnit.MINUTES); + redisUtil.set(SmsConstants.SMS_VALIDATE_PHONE_NUM + phone, 1, 60L); return aBoolean; } // 以下部分实时性不高暂时还是使用队列发送 diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SmsTemplateServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SmsTemplateServiceImpl.java index 157ee56c..b6605044 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SmsTemplateServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SmsTemplateServiceImpl.java @@ -15,7 +15,7 @@ import javax.annotation.Resource; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreBargainServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreBargainServiceImpl.java index d778e508..ec529cd9 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreBargainServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreBargainServiceImpl.java @@ -19,7 +19,7 @@ import com.zbkj.common.exception.CrmebException; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.common.utils.RedisUtil; import com.zbkj.common.model.bargain.StoreBargain; import com.zbkj.common.model.bargain.StoreBargainUser; @@ -50,7 +50,7 @@ import java.util.stream.Collectors; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -132,9 +132,9 @@ public class StoreBargainServiceImpl extends ServiceImpl bargainUserList = storeBargainUserService.getListByBargainId(storeBargain.getId()); if (CollUtil.isEmpty(bargainUserList)) { storeBargainResponse.setCountPeopleAll(0L); @@ -228,8 +228,8 @@ public class StoreBargainServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper<>(); - if ("add".equals(type)) { + if (type.equals("add")) { updateWrapper.setSql(StrUtil.format("stock = stock + {}", num)); updateWrapper.setSql(StrUtil.format("sales = sales - {}", num)); updateWrapper.setSql(StrUtil.format("quota = quota + {}", num)); } - if ("sub".equals(type)) { + if (type.equals("sub")) { updateWrapper.setSql(StrUtil.format("stock = stock - {}", num)); updateWrapper.setSql(StrUtil.format("sales = sales + {}", num)); updateWrapper.setSql(StrUtil.format("quota = quota - {}", num)); @@ -772,7 +772,7 @@ public class StoreBargainServiceImpl extends ServiceImpl lqw = Wrappers.lambdaQuery(); - lqw.select(StoreBargain::getId, StoreBargain::getProductId, StoreBargain::getTitle, StoreBargain::getMinPrice, StoreBargain::getPrice, StoreBargain::getImage); + lqw.select(StoreBargain::getId, StoreBargain::getProductId, StoreBargain::getTitle, StoreBargain::getMinPrice, StoreBargain::getPrice, StoreBargain::getImage, StoreBargain::getSales); lqw.eq(StoreBargain::getStatus, true); lqw.eq(StoreBargain::getIsDel, false); lqw.gt(StoreBargain::getStock, 0); @@ -887,7 +887,7 @@ public class StoreBargainServiceImpl extends ServiceImpl list = helpList.stream().map(help -> { StoreBargainUserHelpResponse helpResponse = new StoreBargainUserHelpResponse(); BeanUtils.copyProperties(help, helpResponse); - helpResponse.setAddTime(DateUtil.timestamp2DateStr(help.getAddTime(), Constants.DATE_FORMAT)); + helpResponse.setAddTime(CrmebDateUtil.timestamp2DateStr(help.getAddTime(), Constants.DATE_FORMAT)); User user = userService.getById(help.getUid()); helpResponse.setAvatar(user.getAvatar()); helpResponse.setNickname(user.getNickname()); diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreBargainUserServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreBargainUserServiceImpl.java index 5a6dc85d..6764d037 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreBargainUserServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreBargainUserServiceImpl.java @@ -18,8 +18,7 @@ import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.zbkj.common.utils.CrmebUtil; -import com.zbkj.common.utils.DateUtil; -import com.zbkj.common.vo.dateLimitUtilVo; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.common.model.bargain.StoreBargain; import com.zbkj.common.model.bargain.StoreBargainUser; import com.zbkj.common.model.bargain.StoreBargainUserHelp; @@ -27,6 +26,7 @@ import com.zbkj.common.request.StoreBargainUserSearchRequest; import com.zbkj.common.response.StoreBargainUserResponse; import com.zbkj.common.model.order.StoreOrder; import com.zbkj.common.model.user.User; +import com.zbkj.common.vo.DateLimitUtilVo; import com.zbkj.service.dao.StoreBargainUserDao; import com.zbkj.service.service.*; import org.springframework.beans.BeanUtils; @@ -44,7 +44,7 @@ import java.util.stream.Collectors; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -84,8 +84,8 @@ public class StoreBargainUserServiceImpl extends ServiceImpl bargainUserList = dao.selectList(lqw); @@ -95,7 +95,7 @@ public class StoreBargainUserServiceImpl extends ServiceImpl list = bargainUserList.stream().map(bargainUser -> { StoreBargainUserResponse bargainUserResponse = new StoreBargainUserResponse(); BeanUtils.copyProperties(bargainUser, bargainUserResponse); - bargainUserResponse.setAddTime(DateUtil.timestamp2DateStr(bargainUser.getAddTime(), Constants.DATE_FORMAT)); + bargainUserResponse.setAddTime(CrmebDateUtil.timestamp2DateStr(bargainUser.getAddTime(), Constants.DATE_FORMAT)); bargainUserResponse.setNowPrice(bargainUser.getBargainPrice().subtract(bargainUser.getPrice())); // 查询用户信息 User user = userService.getById(bargainUser.getUid()); @@ -105,7 +105,7 @@ public class StoreBargainUserServiceImpl extends ServiceImpl getHeaderList() { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(StoreBargainUser::getStatus, 3); - lqw.eq(StoreBargainUser::getIsDel, false); - lqw.groupBy(StoreBargainUser::getUid); - lqw.orderByDesc(StoreBargainUser::getId); - lqw.last(" limit 10"); - return dao.selectList(lqw); +// LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); +// lqw.eq(StoreBargainUser::getStatus, 3); +// lqw.eq(StoreBargainUser::getIsDel, false); +// lqw.groupBy(StoreBargainUser::getUid); +// lqw.orderByDesc(StoreBargainUser::getId); +// lqw.last(" limit 10"); +// return dao.selectList(lqw); + return dao.selectHeaderList(); } /** diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreCartServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreCartServiceImpl.java index ec6094c3..9a09797f 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreCartServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreCartServiceImpl.java @@ -46,7 +46,7 @@ import java.util.stream.Collectors; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -154,7 +154,7 @@ public class StoreCartServiceImpl extends ServiceImpl i Integer userId = userService.getUserIdException(); Map map = new HashMap<>(); int num; - if ("total".equals(request.getType())) { + if (request.getType().equals("total")) { num = getUserCountByStatus(userId, request.getNumType()); } else { num = getUserSumByStatus(userId, request.getNumType()); @@ -191,8 +191,14 @@ public class StoreCartServiceImpl extends ServiceImpl i if (existCarts.size() > 0) { // 购物车添加数量 StoreCart forUpdateStoreCart = existCarts.get(0); forUpdateStoreCart.setCartNum(forUpdateStoreCart.getCartNum() + storeCartRequest.getCartNum()); + forUpdateStoreCart.setUpdateTime(DateUtil.date()); boolean updateResult = updateById(forUpdateStoreCart); if (!updateResult) throw new CrmebException("添加购物车失败"); + + // 商品加购量统计(每日/商城) + redisUtil.incrAndCreate(RedisConstatns.PRO_ADD_CART_KEY + todayStr); + // 商品加购量统计(每日/个体) + redisUtil.incrAndCreate(StrUtil.format(RedisConstatns.PRO_PRO_ADD_CART_KEY, todayStr, storeCartRequest.getProductId())); return forUpdateStoreCart.getId()+""; } else {// 新增购物车数据 StoreCart storeCart = new StoreCart(); @@ -200,6 +206,10 @@ public class StoreCartServiceImpl extends ServiceImpl i storeCart.setUid(currentUser.getUid()); storeCart.setType("product"); if (dao.insert(storeCart) <= 0) throw new CrmebException("添加购物车失败"); + // 商品加购量统计(每日/商城) + redisUtil.incrAndCreate(RedisConstatns.PRO_ADD_CART_KEY + todayStr); + // 商品加购量统计(每日/个体) + redisUtil.incrAndCreate(StrUtil.format(RedisConstatns.PRO_PRO_ADD_CART_KEY, todayStr, storeCartRequest.getProductId())); return storeCart.getId()+""; } } @@ -236,7 +246,7 @@ public class StoreCartServiceImpl extends ServiceImpl i storeCartPram.setProductId(productId); List existStoreCartProducts = getByEntity(storeCartPram); if (null == existStoreCartProducts) return true; - existStoreCartProducts.forEach(e-> e.setStatus(false)); + existStoreCartProducts.forEach(e-> e.setStatus(false).setUpdateTime(DateUtil.date())); return updateBatchById(existStoreCartProducts); } @@ -255,6 +265,7 @@ public class StoreCartServiceImpl extends ServiceImpl i throw new CrmebException("数量不合法"); storeCart.setCartNum(resetRequest.getNum()); storeCart.setProductAttrUnique(resetRequest.getUnique() + ""); + storeCart.setUpdateTime(DateUtil.date()); boolean updateResult = dao.updateById(storeCart) > 0; if (!updateResult) throw new CrmebException("重选添加购物车失败"); productStatusEnableFlag(resetRequest.getId(), true); @@ -268,6 +279,7 @@ public class StoreCartServiceImpl extends ServiceImpl i */ @Override public Boolean productStatusNoEnable(List skuIdList) { + if(ObjectUtil.isEmpty(skuIdList)) return true; LambdaUpdateWrapper lqw = new LambdaUpdateWrapper<>(); lqw.set(StoreCart::getStatus, true); lqw.in(StoreCart::getProductAttrUnique, skuIdList); @@ -339,6 +351,7 @@ public class StoreCartServiceImpl extends ServiceImpl i if (ObjectUtil.isNull(storeCart)) throw new CrmebException("当前购物车不存在"); if (storeCart.getCartNum().equals(number)) return true; storeCart.setCartNum(number); + storeCart.setUpdateTime(DateUtil.date()); return updateById(storeCart); } @@ -390,6 +403,7 @@ public class StoreCartServiceImpl extends ServiceImpl i if(ObjectUtil.isNull(existStoreCartProducts)) return false; existStoreCartProducts = existStoreCartProducts.stream().map(e->{ e.setStatus(flag); + e.setUpdateTime(DateUtil.date()); return e; }).collect(Collectors.toList()); return updateBatchById(existStoreCartProducts); diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreCombinationServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreCombinationServiceImpl.java index cf386251..f4b0b9bc 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreCombinationServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreCombinationServiceImpl.java @@ -8,34 +8,33 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.zbkj.common.constants.Constants; +import com.zbkj.common.constants.ProductConstants; +import com.zbkj.common.exception.CrmebException; +import com.zbkj.common.model.combination.StoreCombination; +import com.zbkj.common.model.combination.StorePink; import com.zbkj.common.model.order.StoreOrder; import com.zbkj.common.model.product.StoreProduct; import com.zbkj.common.model.product.StoreProductAttr; import com.zbkj.common.model.product.StoreProductAttrValue; import com.zbkj.common.model.product.StoreProductDescription; +import com.zbkj.common.model.record.UserVisitRecord; +import com.zbkj.common.model.user.User; import com.zbkj.common.page.CommonPage; -import com.zbkj.common.constants.Constants; -import com.zbkj.common.constants.ProductConstants; -import com.zbkj.common.exception.CrmebException; -import com.github.pagehelper.Page; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import com.zbkj.common.request.*; import com.zbkj.common.response.*; import com.zbkj.common.utils.CrmebUtil; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.common.utils.RedisUtil; -import com.zbkj.common.model.combination.StoreCombination; -import com.zbkj.common.model.combination.StorePink; -import com.zbkj.common.model.record.UserVisitRecord; -import com.zbkj.common.model.user.User; import com.zbkj.service.dao.StoreCombinationDao; import com.zbkj.service.service.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Service; import org.springframework.transaction.support.TransactionTemplate; @@ -48,7 +47,7 @@ import java.util.stream.Collectors; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -91,12 +90,8 @@ public class StoreCombinationServiceImpl extends ServiceImpl attrValueAddRequestList = request.getAttrValue(); // 计算价格 @@ -401,9 +396,11 @@ public class StoreCombinationServiceImpl extends ServiceImpl 1) { - specType = true; + boolean specType = true; + if (attrs.size() == 1) { + if (attrs.get(0).getAttrValues().equals("默认")) { + specType = false; + } } storeProductResponse.setSpecType(specType); @@ -486,8 +483,8 @@ public class StoreCombinationServiceImpl extends ServiceImpl getH5List(PageParamRequest pageParamRequest) { PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit()); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.select(StoreCombination::getId ,StoreCombination::getProductId ,StoreCombination::getImage ,StoreCombination::getTitle - ,StoreCombination::getPeople ,StoreCombination::getOtPrice ,StoreCombination::getPrice ,StoreCombination::getStock); + lqw.select(StoreCombination::getId, StoreCombination::getProductId, StoreCombination::getImage, StoreCombination::getTitle + , StoreCombination::getPeople, StoreCombination::getOtPrice, StoreCombination::getPrice, StoreCombination::getStock); lqw.eq(StoreCombination::getIsDel, false); lqw.eq(StoreCombination::getIsShow, true); long millis = System.currentTimeMillis(); @@ -526,7 +523,7 @@ public class StoreCombinationServiceImpl extends ServiceImpl() @@ -694,7 +691,7 @@ public class StoreCombinationServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper<>(); - if ("add".equals(type)) { + if (type.equals("add")) { updateWrapper.setSql(StrUtil.format("stock = stock + {}", num)); updateWrapper.setSql(StrUtil.format("sales = sales - {}", num)); updateWrapper.setSql(StrUtil.format("quota = quota + {}", num)); } - if ("sub".equals(type)) { + if (type.equals("sub")) { updateWrapper.setSql(StrUtil.format("stock = stock - {}", num)); updateWrapper.setSql(StrUtil.format("sales = sales + {}", num)); updateWrapper.setSql(StrUtil.format("quota = quota - {}", num)); @@ -991,6 +988,7 @@ public class StoreCombinationServiceImpl extends ServiceImpl -1) { throw new CrmebException("请选择正确的领取时间范围！"); } @@ -165,10 +169,10 @@ public class StoreCouponServiceImpl extends ServiceImpl findRegisterList() { - String dateStr = DateUtil.nowDate(Constants.DATE_FORMAT); + String dateStr = CrmebDateUtil.nowDate(Constants.DATE_FORMAT); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.eq(StoreCoupon::getType, 2); lqw.eq(StoreCoupon::getStatus, true); @@ -273,7 +277,7 @@ public class StoreCouponServiceImpl extends ServiceImpl 0) { return false; } @@ -316,7 +320,7 @@ public class StoreCouponServiceImpl extends ServiceImpl o.eq(StoreCoupon::getIsLimited, false).or().ge(StoreCoupon::getLastTotal, 0)); - lqw.and(o -> o.isNull(StoreCoupon::getReceiveEndTime).or().gt(StoreCoupon::getReceiveEndTime, DateUtil.nowDate(Constants.DATE_FORMAT))); + lqw.and(o -> o.isNull(StoreCoupon::getReceiveEndTime).or().gt(StoreCoupon::getReceiveEndTime, CrmebDateUtil.nowDate(Constants.DATE_FORMAT))); lqw.orderByDesc(StoreCoupon::getSort, StoreCoupon::getId); return dao.selectList(lqw); } @@ -333,22 +337,25 @@ public class StoreCouponServiceImpl extends ServiceImpl 0; } /** * 移动端优惠券列表 - * @param type 类型，1-通用，2-商品，3-品类 - * @param productId 产品id，搜索产品指定优惠券 + * + * @param type 类型，1-通用，2-商品，3-品类 + * @param productId 产品id，搜索产品指定优惠券 * @param pageParamRequest 分页参数 - * @return List + * @return PageInfo */ @Override - public List getH5List(Integer type, Integer productId, PageParamRequest pageParamRequest) { + public PageInfo getH5List(Integer type, Integer productId, PageParamRequest pageParamRequest) { // 获取优惠券列表 - List list = getListByReceive(type, productId, pageParamRequest); - if (ObjectUtil.isNull(list)) { - return null; + PageInfo pageInfo = getListByReceive(type, productId, pageParamRequest); + List list = pageInfo.getList(); + if (CollUtil.isEmpty(list)) { + return CommonPage.copyPageInfo(pageInfo, new ArrayList<>()); } //获取用户当前已领取未使用的优惠券 HashMap couponUserMap = null; @@ -372,12 +379,12 @@ public class StoreCouponServiceImpl extends ServiceImpl + * + * @return PageInfo */ - private List getListByReceive(Integer type, Integer productId, PageParamRequest pageParamRequest) { - PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit()); - Date date = DateUtil.nowDateTime(); + private PageInfo getListByReceive(Integer type, Integer productId, PageParamRequest pageParamRequest) { + Date date = CrmebDateUtil.nowDateTime(); //带 StoreCoupon 类的多条件查询 LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.eq(StoreCoupon::getIsDel, false); @@ -435,7 +443,9 @@ public class StoreCouponServiceImpl extends ServiceImpl page = PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit()); + List list = dao.selectList(lqw); + return CommonPage.copyPageInfo(page, list); } private void getPrimaryKeySql(LambdaQueryWrapper lambdaQueryWrapper, String productIdStr) { @@ -443,7 +453,7 @@ public class StoreCouponServiceImpl extends ServiceImpl categoryIdList = storeProductService.getSecondaryCategoryByProductId(productIdStr); + List categoryIdList = storeProductService.getProductAllCategoryIdByProductIds(CrmebUtil.stringToArray(productIdStr)); lambdaQueryWrapper.and(i -> i.and( //通用券 商品券 品类券 t -> t.eq(StoreCoupon::getUseType, 1) diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreCouponUserServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreCouponUserServiceImpl.java index c1593865..4078ed2f 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreCouponUserServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreCouponUserServiceImpl.java @@ -1,33 +1,34 @@ package com.zbkj.service.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zbkj.common.page.CommonPage; -import com.zbkj.common.request.UserCouponReceiveRequest; -import com.zbkj.common.vo.MyRecord; -import com.zbkj.common.request.PageParamRequest; -import com.zbkj.common.constants.Constants; -import com.zbkj.common.constants.CouponConstants; -import com.zbkj.common.exception.CrmebException; -import com.zbkj.common.vo.OrderInfoDetailVo; -import com.zbkj.common.vo.OrderInfoVo; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.zbkj.common.utils.CrmebUtil; -import com.zbkj.common.utils.DateUtil; -import com.zbkj.common.utils.RedisUtil; +import com.zbkj.common.constants.Constants; +import com.zbkj.common.constants.CouponConstants; +import com.zbkj.common.exception.CrmebException; import com.zbkj.common.model.coupon.StoreCoupon; import com.zbkj.common.model.coupon.StoreCouponUser; +import com.zbkj.common.model.user.User; +import com.zbkj.common.page.CommonPage; +import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.StoreCouponUserRequest; import com.zbkj.common.request.StoreCouponUserSearchRequest; +import com.zbkj.common.request.UserCouponReceiveRequest; import com.zbkj.common.response.StoreCouponUserOrder; import com.zbkj.common.response.StoreCouponUserResponse; -import com.zbkj.common.model.user.User; +import com.zbkj.common.utils.CrmebUtil; +import com.zbkj.common.utils.CrmebDateUtil; +import com.zbkj.common.utils.RedisUtil; +import com.zbkj.common.vo.MyRecord; +import com.zbkj.common.vo.OrderInfoDetailVo; +import com.zbkj.common.vo.OrderInfoVo; import com.zbkj.service.dao.StoreCouponUserDao; import com.zbkj.service.service.StoreCouponService; import com.zbkj.service.service.StoreCouponUserService; @@ -41,10 +42,7 @@ import org.springframework.transaction.support.TransactionTemplate; import javax.annotation.Resource; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; /** @@ -52,7 +50,7 @@ import java.util.stream.Collectors; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -81,11 +79,12 @@ public class StoreCouponUserServiceImpl extends ServiceImpl - */ + * 列表 + * + * @param request 请求参数 + * @param pageParamRequest 分页类参数 + * @return List + */ @Override public PageInfo getList(StoreCouponUserSearchRequest request, PageParamRequest pageParamRequest) { Page storeCouponUserPage = PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit()); @@ -96,11 +95,11 @@ public class StoreCouponUserServiceImpl extends ServiceImpl 0) { + if (request.getUid() != null && request.getUid() > 0) { lambdaQueryWrapper.eq(StoreCouponUser::getUid, request.getUid()); } - if (request.getStatus() !=null) { + if (request.getStatus() != null) { lambdaQueryWrapper.eq(StoreCouponUser::getStatus, request.getStatus()); } @@ -131,6 +130,7 @@ public class StoreCouponUserServiceImpl extends ServiceImpl storeCouponUserList = new ArrayList<>(); @@ -189,6 +189,7 @@ public class StoreCouponUserServiceImpl extends ServiceImpl { saveBatch(storeCouponUserList); + storeCoupon.setUpdateTime(DateUtil.date()); storeCouponService.updateById(storeCoupon); return Boolean.TRUE; }); @@ -198,8 +199,9 @@ public class StoreCouponUserServiceImpl extends ServiceImpl 用户id集合 + * @param uidList List 用户id集合 */ private void filterReceiveUserInUid(Integer couponId, List uidList) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -214,13 +216,14 @@ public class StoreCouponUserServiceImpl extends ServiceImpl getMapByUserId(Integer userId) { + public HashMap getMapByUserId(Integer userId) { List list = findListByUid(userId); if (list.size() < 1) { @@ -241,7 +244,8 @@ public class StoreCouponUserServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); - Date date = DateUtil.nowDateTime(); - lambdaQueryWrapper.eq(StoreCouponUser::getStatus, 0) - .le(StoreCouponUser::getMinPrice, maxPrice) - .lt(StoreCouponUser::getStartTime, date) - .gt(StoreCouponUser::getEndTime, date); - lambdaQueryWrapper.eq(StoreCouponUser::getUid, userService.getUserIdException()); - getPrimaryKeySql(lambdaQueryWrapper, StringUtils.join(productIds, ",")); - - - ArrayList storeCouponUserOrderArrayList = new ArrayList<>(); - List storeCouponUserList = dao.selectList(lambdaQueryWrapper); - if (storeCouponUserList.size() < 1) { - return storeCouponUserOrderArrayList; + Date date = CrmebDateUtil.nowDateTime(); + Map map = CollUtil.newHashMap(); + map.put("date", date); + map.put("maxPrice", maxPrice); + map.put("uid", userService.getUserIdException()); + map.put("productIds", productIds); + List categoryIdList = storeProductService.getProductAllCategoryIdByProductIds(productIds); + map.put("categoryIdList", categoryIdList); + List storeCouponUserList = dao.getListByPreOrderNo(map); + if (CollUtil.isEmpty(storeCouponUserList)) { + return CollUtil.newArrayList(); } //前端组件统一 转化数据 + List storeCouponUserOrderArrayList = new ArrayList<>(); for (StoreCouponUser storeCouponUser : storeCouponUserList) { StoreCouponUserOrder storeCouponUserOrder = new StoreCouponUserOrder(); BeanUtils.copyProperties(storeCouponUser, storeCouponUserOrder); @@ -287,8 +289,9 @@ public class StoreCouponUserServiceImpl extends ServiceImpl */ @@ -299,11 +302,11 @@ public class StoreCouponUserServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); lqw.eq(StoreCouponUser::getUid, userId); - if ("usable".equals(type)) { + if (type.equals("usable")) { lqw.eq(StoreCouponUser::getStatus, CouponConstants.STORE_COUPON_USER_STATUS_USABLE); lqw.orderByDesc(StoreCouponUser::getId); } - if ("unusable".equals(type)) { + if (type.equals("unusable")) { lqw.gt(StoreCouponUser::getStatus, CouponConstants.STORE_COUPON_USER_STATUS_USABLE); lqw.last(StrUtil.format(" order by case `status` when {} then {} when {} then {} when {} then {} end", 0, 1, 1, 2, 2, 3)); } @@ -329,12 +332,13 @@ public class StoreCouponUserServiceImpl extends ServiceImpl updateList = CollUtil.newArrayList(); - String nowDateStr = DateUtil.nowDate(Constants.DATE_FORMAT); + String nowDateStr = CrmebDateUtil.nowDate(Constants.DATE_FORMAT); couponList.forEach(coupon -> { if (ObjectUtil.isNotNull(coupon.getEndTime())) { - String endDateStr = DateUtil.dateToStr(coupon.getEndTime(), Constants.DATE_FORMAT); - if (DateUtil.compareDate(nowDateStr, endDateStr, Constants.DATE_FORMAT) >= 0) { + String endDateStr = CrmebDateUtil.dateToStr(coupon.getEndTime(), Constants.DATE_FORMAT); + if (CrmebDateUtil.compareDate(nowDateStr, endDateStr, Constants.DATE_FORMAT) >= 0) { coupon.setStatus(2); + coupon.setUpdateTime(DateUtil.date()); updateList.add(coupon); } } @@ -371,9 +375,9 @@ public class StoreCouponUserServiceImpl extends ServiceImpl */ @@ -542,9 +550,9 @@ public class StoreCouponUserServiceImpl extends ServiceImpl responseList = CollUtil.newArrayList(); - for (StoreCouponUser storeCouponUser :couponUserList) { + for (StoreCouponUser storeCouponUser : couponUserList) { StoreCouponUserResponse storeCouponUserResponse = new StoreCouponUserResponse(); BeanUtils.copyProperties(storeCouponUser, storeCouponUserResponse); String validStr = "usable";// 可用 @@ -555,8 +563,10 @@ public class StoreCouponUserServiceImpl extends ServiceImpl 0) { validStr = "notStart";// 未开始 } @@ -567,27 +577,11 @@ public class StoreCouponUserServiceImpl extends ServiceImpl lambdaQueryWrapper, String productIdStr) { - if (StringUtils.isBlank(productIdStr)) { - return; - } - - List categoryIdList = storeProductService.getSecondaryCategoryByProductId(productIdStr); - String categoryIdStr = categoryIdList.stream().map(Object::toString).collect(Collectors.joining(",")); - lambdaQueryWrapper.and(i -> i.and( - //通用券 商品券 品类券 - t -> t.eq(StoreCouponUser::getUseType, 1) - .or(p -> p.eq(StoreCouponUser::getUseType , 2).apply(StrUtil.format(" primary_key in ({})", productIdStr))) - .or(c -> c.eq(StoreCouponUser::getUseType , 3).apply(StrUtil.format(" primary_key in ({})", categoryIdStr))) - - )); - } } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreOrderInfoServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreOrderInfoServiceImpl.java index 83724c82..e2ac1425 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreOrderInfoServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreOrderInfoServiceImpl.java @@ -1,7 +1,10 @@ package com.zbkj.service.service.impl; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zbkj.common.vo.OrderInfoDetailVo; @@ -14,6 +17,7 @@ import com.zbkj.service.service.StoreProductReplyService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; import javax.annotation.Resource; import java.math.BigDecimal; @@ -26,7 +30,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相关版权 * +---------------------------------------------------------------------- @@ -191,5 +195,28 @@ public class StoreOrderInfoServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(StoreOrderInfo::getOrderId, orderId); + lambdaQueryWrapper.eq(StoreOrderInfo::getProductId, productId); + lambdaQueryWrapper.eq(StoreOrderInfo::getUnique, unique); + StoreOrderInfo storeOrderInfo = dao.selectOne(lambdaQueryWrapper); + if (ObjectUtil.isNotNull(storeOrderInfo)) { + storeOrderInfo.setIsReply(Boolean.TRUE); + storeOrderInfo.setUpdateTime(DateUtil.date()); + dao.updateById(storeOrderInfo); + } + } + } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreOrderRefundServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreOrderRefundServiceImpl.java index 38b9c5b2..b4d8fdb4 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreOrderRefundServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreOrderRefundServiceImpl.java @@ -22,7 +22,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相关版权 * +---------------------------------------------------------------------- @@ -41,9 +41,7 @@ public class StoreOrderRefundServiceImpl extends ServiceImpl implements StoreOrderService { + private final Logger logger = LoggerFactory.getLogger(StoreOrderServiceImpl.class); + @Resource private StoreOrderDao dao; @@ -130,6 +138,12 @@ public class StoreOrderServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.select("id", "order_id", "uid", "real_name", "pay_price", "pay_type", "create_time", "status", "refund_status" , "refund_reason_wap_img", "refund_reason_wap_explain", "refund_reason_wap", "refund_reason", "refund_reason_time" - , "is_del", "combination_id", "pink_id", "seckill_id", "bargain_id", "verify_code", "remark", "paid", "is_system_del", "shipping_type", "type", "is_alter_price"); + , "is_del", "combination_id", "pink_id", "seckill_id", "bargain_id", "verify_code", "remark", "paid", "is_system_del" + , "shipping_type", "type", "is_alter_price", "pro_total_price", "is_alter_price", "coupon_price"); if (StrUtil.isNotBlank(request.getOrderNo())) { queryWrapper.eq("order_id", request.getOrderNo()); } @@ -178,6 +193,27 @@ public class StoreOrderServiceImpl extends ServiceImpl getUserOrderList_2_3(String keywords, + Integer uid, Integer status, PageParamRequest pageParamRequest) { + Page page = PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit()); + Map searchMap = new HashMap<>(); + String searchKey = URLUtil.decode(keywords); + searchMap.put("keywords", searchKey); + searchMap.put("status", status); + searchMap.put("uid", uid); + List orderList = dao.findFrontList(searchMap); + + return CommonPage.copyPageInfo(page, orderList); + } + /** * 创建订单 * @param storeOrder 订单参数 @@ -212,7 +248,7 @@ public class StoreOrderServiceImpl extends ServiceImpl> orderInfoList = StoreOrderInfoService.getMapInId(orderIdList); -// -// //根据用户获取信息 -// List userIdList = orderList.stream().map(StoreOrder::getUid).distinct().collect(Collectors.toList()); -// //订单用户信息 -// HashMap userList = userService.getMapListInUid(userIdList); for (StoreOrder storeOrder : orderList) { StoreOrderDetailResponse storeOrderItemResponse = new StoreOrderDetailResponse(); @@ -473,7 +504,7 @@ public class StoreOrderServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.select("sum(pay_price) as pay_price", "left(create_time, "+lefTime+") as orderId", "count(id) as id"); if (StringUtils.isNotBlank(date)) { - dateLimitUtilVo dateLimit = DateUtil.getDateLimit(date); + DateLimitUtilVo dateLimit = CrmebDateUtil.getDateLimit(date); queryWrapper.between("create_time", dateLimit.getStartTime(), dateLimit.getEndTime()); } queryWrapper.groupBy("orderId").orderByAsc("orderId"); @@ -536,11 +567,11 @@ public class StoreOrderServiceImpl extends ServiceImpl { updateById(storeOrder); if (storeOrder.getPayType().equals(Constants.PAY_TYPE_YUE)) { @@ -561,17 +592,24 @@ public class StoreOrderServiceImpl extends ServiceImpl 0) { SystemStore systemStorePram = new SystemStore(); systemStorePram.setId(storeOrder.getStoreId()); storeOrderInfoResponse.setSystemStore(systemStoreService.getByCondition(systemStorePram)); } + // 添加订单类型信息 + storeOrderInfoResponse.setOrderTypeText(getOrderTypeTextStr(storeOrder)); //用户信息 User user = userService.getById(storeOrder.getUid()); @@ -607,9 +648,43 @@ public class StoreOrderServiceImpl extends ServiceImpl 0) { + orderType = StrUtil.format(orderTypeFormat, "秒杀"); + } + // 砍价 + if (ObjectUtil.isNotNull(storeOrder.getBargainId()) && storeOrder.getBargainId() > 0) { + orderType = StrUtil.format(orderTypeFormat, "砍价"); + } + // 拼团 + if (ObjectUtil.isNotNull(storeOrder.getCombinationId()) && storeOrder.getCombinationId() > 0) { + orderType = StrUtil.format(orderTypeFormat, "拼团"); + } + if (storeOrder.getType().equals(1)) {// 视频订单 + orderType = StrUtil.format(orderTypeFormat, "视频号"); + } + return orderType; + } + /** 发送货物 * @param request StoreOrderSendRequest 发货参数 * @author Mr.Zhang @@ -617,26 +692,31 @@ public class StoreOrderServiceImpl extends ServiceImpl 0) throw new CrmebException("订单已发货请勿重复操作!"); + if (ObjectUtil.isNotNull(storeOrder.getCombinationId()) && storeOrder.getCombinationId() > 0) { + StorePink storePink = storePinkService.getById(storeOrder.getPinkId()); + if (storePink.getStatus() != 2) throw new CrmebException("当前订单正在拼团中不能发货！"); + } request.setId(storeOrder.getId()); - switch (request.getType()) { - case "1":// 发货 - express(request, storeOrder); + switch (request.getDeliveryType()) { + case "express":// 发货 + mianDanResult = express(request, storeOrder); break; - case "2":// 送货 + case "send":// 送货 delivery(request, storeOrder); break; - case "3":// 虚拟 + case "fictitious":// 虚拟 virtual(request, storeOrder); break; default: throw new CrmebException("类型错误"); } - return true; + return mianDanResult; } /** @@ -649,6 +729,7 @@ public class StoreOrderServiceImpl extends ServiceImpl { updateById(storeOrder); storeOrderStatusService.createLog(storeOrder.getId(), Constants.ORDER_LOG_REFUND_REFUSE, Constants.ORDER_LOG_MESSAGE_REFUND_REFUSE.replace("{reason}", reason)); @@ -760,21 +842,21 @@ public class StoreOrderServiceImpl extends ServiceImpl orderPerList = getOrderPayedByDateLimit(perDateStart,dateStart); @@ -815,8 +897,8 @@ public class StoreOrderServiceImpl extends ServiceImpl getUserCurrentDaySecKillOrders(Integer uid, Integer seckillId) { - String dayStart = DateUtil.nowDateTime(Constants.DATE_FORMAT_START); - String dayEnd = DateUtil.nowDateTime(Constants.DATE_FORMAT_END); + String dayStart = CrmebDateUtil.nowDateTime(Constants.DATE_FORMAT_START); + String dayEnd = CrmebDateUtil.nowDateTime(Constants.DATE_FORMAT_END); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(StoreOrder::getUid, uid); lqw.eq(StoreOrder::getSeckillId, seckillId); @@ -878,7 +960,7 @@ public class StoreOrderServiceImpl extends ServiceImpl lqw = new LambdaUpdateWrapper<>(); lqw.set(StoreOrder::getPaid, true); - lqw.set(StoreOrder::getPayTime, DateUtil.nowDateTime()); + lqw.set(StoreOrder::getPayTime, CrmebDateUtil.nowDateTime()); lqw.eq(StoreOrder::getOrderId, orderNo); lqw.eq(StoreOrder::getPaid,false); return update(lqw); @@ -970,7 +1052,7 @@ public class StoreOrderServiceImpl extends ServiceImpl { // 修改订单价格 @@ -978,12 +1060,12 @@ public class StoreOrderServiceImpl extends ServiceImpl orderList = dao.selectList(lqw); @@ -1092,31 +1174,31 @@ public class StoreOrderServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); - wrapper.select("id"); + //wrapper.select("id"); + wrapper.select(" ANY_VALUE(id) AS id "); wrapper.apply("date_format(create_time, '%Y-%m-%d') = {0}", date); wrapper.groupBy("uid"); List orderList = dao.selectList(wrapper); @@ -1301,7 +1385,8 @@ public class StoreOrderServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); - wrapper.select("id"); + //wrapper.select("id"); + wrapper.select(" ANY_VALUE(id) AS id "); wrapper.apply("date_format(create_time, '%Y-%m-%d') between {0} and {1}", startDate, endDate); wrapper.groupBy("uid"); List orderList = dao.selectList(wrapper); @@ -1319,7 +1404,8 @@ public class StoreOrderServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); - wrapper.select("id"); + //wrapper.select("id"); + wrapper.select(" ANY_VALUE(id) AS id "); wrapper.eq("paid", 1); wrapper.apply("date_format(create_time, '%Y-%m-%d') = {0}", date); wrapper.groupBy("uid"); @@ -1339,7 +1425,8 @@ public class StoreOrderServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); - wrapper.select("id"); + //wrapper.select("id"); + wrapper.select(" ANY_VALUE(id) AS id "); wrapper.eq("paid", 1); wrapper.apply("date_format(create_time, '%Y-%m-%d') between {0} and {1}", startDate, endDate); wrapper.groupBy("uid"); @@ -1358,7 +1445,8 @@ public class StoreOrderServiceImpl extends ServiceImpl uidList) { QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.select("id"); + //wrapper.select("id"); + wrapper.select(" ANY_VALUE(id) AS id "); wrapper.eq("paid", 1); wrapper.in("uid", uidList); wrapper.groupBy("uid"); @@ -1423,7 +1511,146 @@ public class StoreOrderServiceImpl extends ServiceImpl findAwaitTakeDeliveryOrderList(String sendTime) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StoreOrder::getStatus, Constants.ORDER_STATUS_INT_SPIKE); + lqw.ne(StoreOrder::getRefundStatus, 3); + lqw.le(StoreOrder::getUpdateTime, sendTime); + lqw.eq(StoreOrder::getIsDel, false); + return dao.selectList(lqw); + } + + /** + * 更改订单运单号 + */ + @Override + public Boolean updateTrackingNumber(StoreOrderSendRequest request) { + StoreOrder storeOrder = getInfoException(request.getOrderNo()); + if (storeOrder.getIsDel()) throw new CrmebException("订单已删除,不能修改运单号!"); + if (storeOrder.getStatus() != 1) throw new CrmebException("待收货订单才能修改运单号"); + + switch (storeOrder.getDeliveryType()) { + case "express":// 发货 + express(request, storeOrder); + break; + case "send":// 送货 + delivery(request, storeOrder); + break; + case "fictitious":// 虚拟 + virtual(request, storeOrder); + break; + default: + throw new CrmebException("类型错误"); + } + + storeOrder.setUpdateTime(DateUtil.date()); + return transactionTemplate.execute(e -> { + updateById(storeOrder); + storeOrderStatusService.createLog(storeOrder.getId(), Constants.ORDER_LOG_EXPRESS, StrUtil.format("变更运单号,快递公司:{},运单号:{}", storeOrder.getDeliveryName(), storeOrder.getDeliveryId())); + return Boolean.TRUE; + }); + } + + + + /** + * 一号通商家寄件 + * @param request 订单发货请求对象 + * @param storeOrder 主订单请求对象 + */ + @Override + public void expressForOnePassShipment(StoreOrderSendRequest request, StoreOrder storeOrder) { + // 校验快递发货参数 +// validateExpressSend(request); + OnePassShipmentCreateOrderRequest shipment = request.getShipment(); + shipment.setManName(storeOrder.getRealName()); + shipment.setPhone(storeOrder.getUserPhone()); + shipment.setAddress(storeOrder.getUserAddress()); + + if(ObjectUtil.isNotNull(shipment.getKuaidicom()) && + (shipment.getKuaidicom().equalsIgnoreCase("jd") || shipment.getKuaidicom().equalsIgnoreCase("yuantong"))){ + List listByOrderNo = storeOrderInfoService.getListByOrderNo(storeOrder.getOrderId()); + shipment.setCargo(listByOrderNo.get(0).getProductName().substring(0,10)); + } + JSONObject jsonObject = onePassService.shipmentCreateOrder(shipment); + // 任务订单号（需要在系统回调中使用 + String orderId = jsonObject.getString("order_id"); + // 任务ID（需要在系统回调中使用） + String taskId = jsonObject.getString("task_id"); + // 物流单号 + String kuaidinum = jsonObject.getString("kuaidinum"); + + logger.info("一号通-商家寄件结果:{}", jsonObject); + storeOrder.setShipmentTaskId(taskId); + storeOrder.setShipmentOrderId(orderId); + storeOrder.setShipmentPic(kuaidinum); + storeOrder.setDeliveryCode(request.getShipment().getKuaidicom()); + storeOrder.setDeliveryName(request.getShipment().getSendRealName()); + // 更新商家发货结果到数据库，再根据任务订单id在回调中更新最终的发货状态 + storeOrder.setUpdateTime(DateUtil.date()); + updateById(storeOrder); + } + + /** + * 商家寄件 取件 回调方法 + * @param jsonObject 回调数据 + */ + @Override + public void expressForOnePassShipmentTakeCallBack(JSONObject jsonObject){ + String orderId = jsonObject.getString("id"); + StoreOrder currentStoreOrder = getByOderId(orderId); + currentStoreOrder.setStatus(1); + currentStoreOrder.setDeliveryType(Constants.ORDER_LOG_SHIPMENT); + + String message = Constants.ORDER_LOG_MESSAGE_EXPRESS.replace("{deliveryName}", currentStoreOrder.getShipmentNum()).replace("{deliveryCode}", currentStoreOrder.getShipmentNum()); + + Boolean execute = transactionTemplate.execute(i -> { + currentStoreOrder.setUpdateTime(DateUtil.date()); + updateById(currentStoreOrder); + //订单记录增加 + storeOrderStatusService.createLog(currentStoreOrder.getId(), Constants.ORDER_LOG_SHIPMENT, message); + return Boolean.TRUE; + }); + + if (!execute) throw new CrmebException("一号通-商家寄件 发货失败！"); + + sendGoodsNotify(currentStoreOrder); + } + + /** + * 一号通商家寄件 取消寄件回调 + * + * @param jsonObject 回调结果 + */ + @Override + public void expressForOnePassShipmentCancelCallBack(JSONObject jsonObject) { + String orderId = jsonObject.getString("id"); + StoreOrder currentStoreOrder = getByOderId(orderId); + currentStoreOrder.setStatus(0); + currentStoreOrder.setDeliveryType(""); + currentStoreOrder.setShipmentPic(""); + currentStoreOrder.setShipmentOrderId(""); + currentStoreOrder.setShipmentNum(""); + currentStoreOrder.setShipmentTaskId(""); + + Boolean execute = transactionTemplate.execute(i -> { + currentStoreOrder.setUpdateTime(DateUtil.date()); + updateById(currentStoreOrder); + //订单记录增加 + storeOrderStatusService.createLog(currentStoreOrder.getId(), Constants.ORDER_LOG_SHIPMENT, "一号通 商家寄件 取消寄件"); + return Boolean.TRUE; + }); + + if (!execute) throw new CrmebException("一号通-商家寄件 取消失败！"); + } + + ///////////////////////////////////////////////////////////////////////////////////////////////////// 以下为自定义方法 /** * 根据时间参数获取有效订单 @@ -1450,38 +1677,45 @@ public class StoreOrderServiceImpl extends ServiceImpl { updateById(storeOrder); //订单记录增加 - storeOrderStatusService.createLog(request.getId(), Constants.ORDER_LOG_EXPRESS, message); + storeOrderStatusService.createLog(storeOrder.getId(), Constants.ORDER_LOG_EXPRESS, message); return Boolean.TRUE; }); if (!execute) throw new CrmebException("快递发货失败！"); sendGoodsNotify(storeOrder); - } + return mianDianResult; + } /** * 发货通知 @@ -1533,7 +1767,7 @@ public class StoreOrderServiceImpl extends ServiceImpl orderIdList = new ArrayList<>(); @@ -1665,11 +1903,12 @@ public class StoreOrderServiceImpl extends ServiceImpl { // 更新订单 updateById(storeOrder); // 订单记录增加 - storeOrderStatusService.createLog(request.getId(), Constants.ORDER_LOG_DELIVERY, message); + storeOrderStatusService.createLog(storeOrder.getId(), Constants.ORDER_LOG_DELIVERY, message); return Boolean.TRUE; }); if (!execute) throw new CrmebException("订单更新送货失败"); @@ -1707,7 +1946,7 @@ public class StoreOrderServiceImpl extends ServiceImpl { updateById(storeOrder); //订单记录增加 - storeOrderStatusService.createLog(request.getId(), Constants.ORDER_LOG_DELIVERY_VI, "虚拟物品发货"); + storeOrderStatusService.createLog(storeOrder.getId(), Constants.ORDER_LOG_DELIVERY_VI, "虚拟物品发货"); return Boolean.TRUE; }); if (!execute) throw new CrmebException("虚拟物品发货失败"); @@ -1766,7 +2007,7 @@ public class StoreOrderServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); if (StrUtil.isNotBlank(dateLimit)) { - dateLimitUtilVo dateLimitUtilVo = DateUtil.getDateLimit(dateLimit); + DateLimitUtilVo dateLimitUtilVo = CrmebDateUtil.getDateLimit(dateLimit); queryWrapper.between("create_time", dateLimitUtilVo.getStartTime(), dateLimitUtilVo.getEndTime()); } getStatusWhereNew(queryWrapper, status); @@ -1777,19 +2018,23 @@ public class StoreOrderServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); if (StrUtil.isNotBlank(dateLimit)) { - dateLimitUtilVo dateLimitUtilVo = DateUtil.getDateLimit(dateLimit); + DateLimitUtilVo dateLimitUtilVo = CrmebDateUtil.getDateLimit(dateLimit); queryWrapper.between("create_time", dateLimitUtilVo.getStartTime(), dateLimitUtilVo.getEndTime()); } getStatusWhereNew(queryWrapper, status); if (ObjectUtil.isNotNull(type)) { queryWrapper.eq("type", type); } + if (StringUtils.isNotBlank(orderNo)) { + queryWrapper.eq("order_id", orderNo); + } return dao.selectCount(queryWrapper); } @@ -1808,7 +2053,7 @@ public class StoreOrderServiceImpl extends ServiceImpl queryWrapper, StoreOrderSearchRequest request) { if (StringUtils.isNotBlank(request.getDateLimit())) { - dateLimitUtilVo dateLimitUtilVo = DateUtil.getDateLimit(request.getDateLimit()); + DateLimitUtilVo dateLimitUtilVo = CrmebDateUtil.getDateLimit(request.getDateLimit()); queryWrapper.between("create_time", dateLimitUtilVo.getStartTime(), dateLimitUtilVo.getEndTime()); } } @@ -1961,8 +2206,8 @@ public class StoreOrderServiceImpl extends ServiceImpl 0 ) { - StoreCouponUser couponUser = couponUserService.getById(storeOrder.getCouponId()); - couponUser.setStatus(CouponConstants.STORE_COUPON_USER_STATUS_USABLE); - couponUserService.updateById(couponUser); - } - return rollbackStock(storeOrder); + Boolean execute = transactionTemplate.execute(e -> { + //写订单日志 + storeOrderStatusService.createLog(storeOrder.getId(), "cancel_order", "取消订单"); + // 退优惠券 + if (storeOrder.getCouponId() > 0) { + StoreCouponUser couponUser = couponUserService.getById(storeOrder.getCouponId()); + couponUser.setStatus(CouponConstants.STORE_COUPON_USER_STATUS_USABLE); + couponUser.setUpdateTime(DateUtil.date()); + couponUserService.updateById(couponUser); + } + Boolean rollbackStock = rollbackStock(storeOrder); + if (!rollbackStock) { + throw new CrmebException("回滚库存失败"); + } + return Boolean.TRUE; + }); + return execute; }catch (Exception e){ return false; } @@ -193,51 +210,60 @@ public class StoreOrderTaskServiceImpl implements StoreOrderTaskService { if(null != storeOrder.getSeckillId() && storeOrder.getSeckillId() > 0){ // 秒杀只会有一个商品 StoreOrderInfo orderInfo = orderInfoList.get(0); - StoreSeckill storeSeckill = storeSeckillService.getByIdException(storeOrder.getSeckillId()); + StoreSeckill storeSeckill = storeSeckillService.getById(storeOrder.getSeckillId()); storeSeckillService.operationStock(storeOrder.getSeckillId(), orderInfo.getPayNum(), "add"); - attrValueService.operationStock(orderInfo.getAttrValueId(), orderInfo.getPayNum(), "add", Constants.PRODUCT_TYPE_SECKILL); - storeProductService.operationStock(storeSeckill.getProductId(), orderInfo.getPayNum(), "add"); + StoreProductAttrValue seckillAttrValue = attrValueService.getByIdAndProductIdAndType(orderInfo.getAttrValueId(), storeSeckill.getId(), Constants.PRODUCT_TYPE_SECKILL); + attrValueService.operationStock(seckillAttrValue.getId(), orderInfo.getPayNum(), "add", Constants.PRODUCT_TYPE_SECKILL, seckillAttrValue.getVersion()); + StoreProduct storeProduct = storeProductService.getById(storeSeckill.getProductId()); + storeProductService.operationStock(storeProduct.getId(), orderInfo.getPayNum(), "add", storeProduct.getVersion()); List attrValueList = attrValueService.getListByProductIdAndType(storeSeckill.getProductId(), Constants.PRODUCT_TYPE_NORMAL); attrValueList.forEach(e -> { if (e.getSuk().equals(orderInfo.getSku())) { - attrValueService.operationStock(e.getId(), orderInfo.getPayNum(), "add", Constants.PRODUCT_TYPE_NORMAL); + attrValueService.operationStock(e.getId(), orderInfo.getPayNum(), "add", Constants.PRODUCT_TYPE_NORMAL, e.getVersion()); } }); } else if (ObjectUtil.isNotNull(storeOrder.getBargainId()) && storeOrder.getBargainId() > 0) { // 砍价商品回滚销量库存 StoreOrderInfo orderInfo = orderInfoList.get(0); - StoreBargain storeBargain = storeBargainService.getByIdException(storeOrder.getBargainId()); + StoreBargain storeBargain = storeBargainService.getById(storeOrder.getBargainId()); storeBargainService.operationStock(storeBargain.getId(), orderInfo.getPayNum(), "add"); - attrValueService.operationStock(orderInfo.getAttrValueId(), orderInfo.getPayNum(), "add", Constants.PRODUCT_TYPE_BARGAIN); - storeProductService.operationStock(storeBargain.getProductId(), orderInfo.getPayNum(), "add"); + StoreProductAttrValue bargainAttrValue = attrValueService.getByIdAndProductIdAndType(orderInfo.getAttrValueId(), storeBargain.getId(), Constants.PRODUCT_TYPE_BARGAIN); + attrValueService.operationStock(bargainAttrValue.getId(), orderInfo.getPayNum(), "add", Constants.PRODUCT_TYPE_BARGAIN, bargainAttrValue.getVersion()); + StoreProduct storeProduct = storeProductService.getById(storeBargain.getProductId()); + storeProductService.operationStock(storeProduct.getId(), orderInfo.getPayNum(), "add", storeProduct.getVersion()); List attrValueList = attrValueService.getListByProductIdAndType(storeBargain.getProductId(), Constants.PRODUCT_TYPE_NORMAL); attrValueList.forEach(e -> { if (e.getSuk().equals(orderInfo.getSku())) { - attrValueService.operationStock(e.getId(), orderInfo.getPayNum(), "add", Constants.PRODUCT_TYPE_NORMAL); + attrValueService.operationStock(e.getId(), orderInfo.getPayNum(), "add", Constants.PRODUCT_TYPE_NORMAL, e.getVersion()); } }); } else if (ObjectUtil.isNotNull(storeOrder.getCombinationId()) && storeOrder.getCombinationId() > 0) { // 拼团商品回滚销量库存 StoreOrderInfo orderInfo = orderInfoList.get(0); - StoreCombination storeCombination = storeCombinationService.getByIdException(storeOrder.getCombinationId()); + StoreCombination storeCombination = storeCombinationService.getById(storeOrder.getCombinationId()); storeCombinationService.operationStock(storeCombination.getId(), orderInfo.getPayNum(), "add"); - attrValueService.operationStock(orderInfo.getAttrValueId(), orderInfo.getPayNum(), "add", Constants.PRODUCT_TYPE_PINGTUAN); - storeProductService.operationStock(storeCombination.getProductId(), orderInfo.getPayNum(), "add"); + StoreProductAttrValue combinationAttrValue = attrValueService.getByIdAndProductIdAndType(orderInfo.getAttrValueId(), storeCombination.getId(), Constants.PRODUCT_TYPE_PINGTUAN); + attrValueService.operationStock(combinationAttrValue.getId(), orderInfo.getPayNum(), "add", Constants.PRODUCT_TYPE_PINGTUAN, combinationAttrValue.getVersion()); + StoreProduct storeProduct = storeProductService.getById(storeCombination.getProductId()); + storeProductService.operationStock(storeProduct.getId(), orderInfo.getPayNum(), "add", storeProduct.getVersion()); List attrValueList = attrValueService.getListByProductIdAndType(storeCombination.getProductId(), Constants.PRODUCT_TYPE_NORMAL); attrValueList.forEach(e -> { if (e.getSuk().equals(orderInfo.getSku())) { - attrValueService.operationStock(e.getId(), orderInfo.getPayNum(), "add", Constants.PRODUCT_TYPE_NORMAL); + attrValueService.operationStock(e.getId(), orderInfo.getPayNum(), "add", Constants.PRODUCT_TYPE_NORMAL, e.getVersion()); } }); - } else { // 正常商品回滚销量库存 + } + else { // 正常商品回滚销量库存 for (StoreOrderInfo orderInfoVo : orderInfoList) { - storeProductService.operationStock(orderInfoVo.getProductId(), orderInfoVo.getPayNum(), "add"); - attrValueService.operationStock(orderInfoVo.getAttrValueId(), orderInfoVo.getPayNum(), "add", Constants.PRODUCT_TYPE_NORMAL); + StoreProduct storeProduct = storeProductService.getById(orderInfoVo.getProductId()); + storeProductService.operationStock(storeProduct.getId(), orderInfoVo.getPayNum(), "add", storeProduct.getVersion()); + StoreProductAttrValue productAttrValue = attrValueService.getById(orderInfoVo.getAttrValueId()); + attrValueService.operationStock(productAttrValue.getId(), orderInfoVo.getPayNum(), "add", Constants.PRODUCT_TYPE_NORMAL, productAttrValue.getVersion()); } } - }catch (Exception e){ -// throw new CrmebException(e.getMessage()); + } catch (Exception e) { logger.error("回滚库存失败，error = " + e.getMessage()); - return true; + return false; } + return true; } @@ -295,7 +321,9 @@ public class StoreOrderTaskServiceImpl implements StoreOrderTaskService { } }); List addIntegralList = integralRecordList.stream().filter(e -> ObjectUtil.isNull(e.getId())).collect(Collectors.toList()); - List updateIntegralList = integralRecordList.stream().filter(e -> ObjectUtil.isNotNull(e.getId())).collect(Collectors.toList()); + List updateIntegralList = integralRecordList.stream() + .filter(e -> ObjectUtil.isNotNull(e.getId())) + .collect(Collectors.toList()); StoreOrder tempOrder = new StoreOrder(); tempOrder.setId(storeOrder.getId()); @@ -309,6 +337,7 @@ public class StoreOrderTaskServiceImpl implements StoreOrderTaskService { //创建、冻结期佣金置为失效状态 if (r.getStatus() < BrokerageRecordConstants.BROKERAGE_RECORD_STATUS_COMPLETE) { r.setStatus(BrokerageRecordConstants.BROKERAGE_RECORD_STATUS_INVALIDATION); + r.setUpdateTime(DateUtil.date()); brokerageRecordList.add(r); } }); @@ -319,6 +348,7 @@ public class StoreOrderTaskServiceImpl implements StoreOrderTaskService { storeOrderStatusService.saveRefund(storeOrder.getId(), storeOrder.getRefundPrice(), "成功"); // 更新用户数据 + user.setUpdateTime(DateUtil.date()); userService.updateById(user); // 积分部分 @@ -339,8 +369,12 @@ public class StoreOrderTaskServiceImpl implements StoreOrderTaskService { userLevelService.downLevel(user); // 回滚库存 - rollbackStock(storeOrder); + Boolean rollbackStock = rollbackStock(storeOrder); + if (!rollbackStock) { + throw new CrmebException("回滚库存失败"); + } + tempOrder.setUpdateTime(DateUtil.date()); storeOrderService.updateById(tempOrder); // 拼团状态处理 @@ -355,6 +389,7 @@ public class StoreOrderTaskServiceImpl implements StoreOrderTaskService { if (storeOrder.getCouponId() > 0 ) { StoreCouponUser couponUser = couponUserService.getById(storeOrder.getCouponId()); couponUser.setStatus(CouponConstants.STORE_COUPON_USER_STATUS_USABLE); + couponUser.setUpdateTime(DateUtil.date()); couponUserService.updateById(couponUser); } return Boolean.TRUE; @@ -396,7 +431,10 @@ public class StoreOrderTaskServiceImpl implements StoreOrderTaskService { return Boolean.FALSE; } storeOrder.setIsDel(true).setIsSystemDel(true); - Boolean execute = transactionTemplate.execute(e -> { + Boolean execute = false; + + execute = transactionTemplate.execute(e -> { + storeOrder.setUpdateTime(DateUtil.date()); storeOrderService.updateById(storeOrder); //写订单日志 storeOrderStatusService.createLog(storeOrder.getId(), "cancel", "到期未支付系统自动取消"); @@ -404,14 +442,17 @@ public class StoreOrderTaskServiceImpl implements StoreOrderTaskService { if (storeOrder.getCouponId() > 0 ) { StoreCouponUser couponUser = couponUserService.getById(storeOrder.getCouponId()); couponUser.setStatus(CouponConstants.STORE_COUPON_USER_STATUS_USABLE); + couponUser.setUpdateTime(DateUtil.date()); couponUserService.updateById(couponUser); } + // 回滚库存 + Boolean rollbackStock = rollbackStock(storeOrder); + if (!rollbackStock) { + throw new CrmebException("回滚库存失败"); + } return Boolean.TRUE; }); - if (execute) { - // 回滚库存 - rollbackStock(storeOrder); - } + return execute; } @@ -446,16 +487,15 @@ public class StoreOrderTaskServiceImpl implements StoreOrderTaskService { thawTime = dateTime.getTime(); } record.setThawTime(thawTime); + record.setUpdateTime(DateUtil.date()); } // 获取积分记录 List integralRecordList = userIntegralRecordService.findListByOrderIdAndUid(storeOrder.getOrderId(), storeOrder.getUid()); + logger.info("收货处理积分条数：" + integralRecordList.size()); List userIntegralRecordList = integralRecordList.stream().filter(e -> e.getType().equals(IntegralRecordConstants.INTEGRAL_RECORD_TYPE_ADD)).collect(Collectors.toList()); for (UserIntegralRecord record : userIntegralRecordList) { - if (!record.getStatus().equals(IntegralRecordConstants.INTEGRAL_RECORD_STATUS_CREATE)) { - throw new CrmebException(StrUtil.format("订单收货task处理，订单积分记录不是创建状态，id={}", orderId)); - } // 佣金进入冻结期 record.setStatus(IntegralRecordConstants.INTEGRAL_RECORD_STATUS_FROZEN); // 计算解冻时间 @@ -465,6 +505,7 @@ public class StoreOrderTaskServiceImpl implements StoreOrderTaskService { thawTime = dateTime.getTime(); } record.setThawTime(thawTime); + record.setUpdateTime(DateUtil.date()); } Boolean execute = transactionTemplate.execute(e -> { @@ -529,7 +570,7 @@ public class StoreOrderTaskServiceImpl implements StoreOrderTaskService { temMap.put(Constants.WE_CHAT_TEMP_KEY_FIRST, "您购买的商品已确认收货！"); temMap.put("keyword1", storeOrder.getOrderId()); temMap.put("keyword2", "已收货"); - temMap.put("keyword3", DateUtil.nowDateTimeStr()); + temMap.put("keyword3", CrmebDateUtil.nowDateTimeStr()); temMap.put("keyword4", "详情请进入订单查看"); temMap.put(Constants.WE_CHAT_TEMP_KEY_END, "感谢你的使用。"); templateMessageService.pushTemplateMessage(notification.getWechatId(), temMap, userToken.getToken()); @@ -554,7 +595,7 @@ public class StoreOrderTaskServiceImpl implements StoreOrderTaskService { // temMap.put("thing1", storeNameAndCarNumString); // temMap.put("thing5", "您购买的商品已确认收货！"); temMap.put("character_string6", storeOrder.getOrderId()); - temMap.put("date5", DateUtil.nowDateTimeStr()); + temMap.put("date5", CrmebDateUtil.nowDateTimeStr()); temMap.put("thing2", storeNameAndCarNumString); templateMessageService.pushMiniTemplateMessage(notification.getRoutineId(), temMap, userToken.getToken()); } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreOrderVerificationImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreOrderVerificationImpl.java index 1f6018b8..ebdb7992 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreOrderVerificationImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreOrderVerificationImpl.java @@ -1,26 +1,27 @@ package com.zbkj.service.service.impl; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.zbkj.common.constants.Constants; import com.zbkj.common.constants.TaskConstants; import com.zbkj.common.exception.CrmebException; +import com.zbkj.common.model.combination.StorePink; import com.zbkj.common.model.order.StoreOrder; import com.zbkj.common.model.system.SystemAdmin; import com.zbkj.common.request.StoreOrderStaticsticsRequest; import com.zbkj.common.response.StoreOrderVerificationConfirmResponse; import com.zbkj.common.response.StoreStaffDetail; import com.zbkj.common.response.StoreStaffTopDetail; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.common.utils.RedisUtil; import com.zbkj.common.utils.SecurityUtil; +import com.zbkj.common.vo.DateLimitUtilVo; import com.zbkj.common.vo.LoginUserVo; -import com.zbkj.common.vo.dateLimitUtilVo; import com.zbkj.service.dao.StoreOrderDao; import com.zbkj.service.delete.OrderUtils; -import com.zbkj.service.service.StoreOrderInfoService; -import com.zbkj.service.service.StoreOrderService; -import com.zbkj.service.service.StoreOrderVerification; +import com.zbkj.service.service.*; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -35,7 +36,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相关版权 * +---------------------------------------------------------------------- @@ -60,6 +61,8 @@ public class StoreOrderVerificationImpl implements StoreOrderVerification { @Autowired private RedisUtil redisUtil; + @Autowired + private StorePinkService storePinkService; /** * 获取订单核销数据 */ @@ -102,12 +105,12 @@ public class StoreOrderVerificationImpl implements StoreOrderVerification { storeStaffTopDetail.setRefundCount(dao.selectCount(lqwRefundCount)); // 获取今日，昨日，本月，订单金额 - String dayStart = DateUtil.nowDateTime(Constants.DATE_FORMAT_START); - String dayEnd = DateUtil.nowDateTime(Constants.DATE_FORMAT_END); - String yesterdayStart = DateUtil.addDay(dayStart,-1,Constants.DATE_FORMAT_START); - String yesterdayEnd = DateUtil.addDay(dayEnd,-1,Constants.DATE_FORMAT_END); - String monthStart = DateUtil.nowDateTime(Constants.DATE_FORMAT_MONTH_START); - String monthEnd = DateUtil.getMonthEndDay(); + String dayStart = CrmebDateUtil.nowDateTime(Constants.DATE_FORMAT_START); + String dayEnd = CrmebDateUtil.nowDateTime(Constants.DATE_FORMAT_END); + String yesterdayStart = CrmebDateUtil.addDay(dayStart,-1,Constants.DATE_FORMAT_START); + String yesterdayEnd = CrmebDateUtil.addDay(dayEnd,-1,Constants.DATE_FORMAT_END); + String monthStart = CrmebDateUtil.nowDateTime(Constants.DATE_FORMAT_MONTH_START); + String monthEnd = CrmebDateUtil.getMonthEndDay(); // 今日订单数量 LambdaQueryWrapper lqwTodayCount = Wrappers.lambdaQuery(); @@ -155,7 +158,7 @@ public class StoreOrderVerificationImpl implements StoreOrderVerification { @Override public List getOrderVerificationDetail(StoreOrderStaticsticsRequest request) { request.setPage((request.getPage() - 1) * request.getLimit()); - dateLimitUtilVo dateLimit = DateUtil.getDateLimit(request.getDateLimit()); + DateLimitUtilVo dateLimit = CrmebDateUtil.getDateLimit(request.getDateLimit()); request.setStartTime(dateLimit.getStartTime()); request.setEndTime(dateLimit.getEndTime()); return dao.getOrderVerificationDetail(request); @@ -177,8 +180,13 @@ public class StoreOrderVerificationImpl implements StoreOrderVerification { // 添加核销人员后执行核销操作 StoreOrder storeOrder = new StoreOrder(); BeanUtils.copyProperties(existOrder,storeOrder); + if (ObjectUtil.isNotNull(storeOrder.getCombinationId()) && storeOrder.getCombinationId() > 0) { + StorePink storePink = storePinkService.getById(storeOrder.getPinkId()); + if (storePink.getStatus() != 2) throw new CrmebException("当前订单正在拼团中不能核销！"); + } storeOrder.setStatus(Constants.ORDER_STATUS_INT_BARGAIN); storeOrder.setClerkId(currentAdmin.getId()); + storeOrder.setUpdateTime(DateUtil.date()); boolean saveStatus = dao.updateById(storeOrder) > 0; // 小程序订阅消息发送 diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StorePinkServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StorePinkServiceImpl.java index e0dc537f..3e4a6741 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StorePinkServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StorePinkServiceImpl.java @@ -10,6 +10,7 @@ import com.zbkj.common.constants.NotifyConstants; import com.zbkj.common.model.system.SystemNotification; import com.zbkj.common.page.CommonPage; import com.zbkj.common.request.OrderRefundApplyRequest; +import com.zbkj.common.vo.DateLimitUtilVo; import com.zbkj.common.vo.MyRecord; import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.constants.Constants; @@ -18,8 +19,7 @@ import com.zbkj.common.exception.CrmebException; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.zbkj.common.utils.DateUtil; -import com.zbkj.common.vo.dateLimitUtilVo; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.common.model.combination.StoreCombination; import com.zbkj.common.model.combination.StorePink; import com.zbkj.common.request.StorePinkSearchRequest; @@ -45,7 +45,7 @@ import java.util.stream.Collectors; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -96,8 +96,8 @@ public class StorePinkServiceImpl extends ServiceImpl i lqw.eq(StorePink::getStatus, request.getStatus()); } if (StrUtil.isNotBlank(request.getDateLimit())) { - dateLimitUtilVo dateLimit = DateUtil.getDateLimit(request.getDateLimit()); - lqw.between(StorePink::getAddTime, DateUtil.dateStr2Timestamp(dateLimit.getStartTime(), Constants.DATE_TIME_TYPE_BEGIN), DateUtil.dateStr2Timestamp(dateLimit.getEndTime(), Constants.DATE_TIME_TYPE_END)); + DateLimitUtilVo dateLimit = CrmebDateUtil.getDateLimit(request.getDateLimit()); + lqw.between(StorePink::getAddTime, CrmebDateUtil.dateStr2Timestamp(dateLimit.getStartTime(), Constants.DATE_TIME_TYPE_BEGIN), CrmebDateUtil.dateStr2Timestamp(dateLimit.getEndTime(), Constants.DATE_TIME_TYPE_END)); } lqw.eq(StorePink::getKId, 0); lqw.orderByDesc(StorePink::getId); @@ -110,8 +110,8 @@ public class StorePinkServiceImpl extends ServiceImpl i BeanUtils.copyProperties(pink, storePinkResponse); Integer countPeople = getCountByKidAndCid(pink.getCid(), pink.getId()); storePinkResponse.setCountPeople(countPeople); - storePinkResponse.setAddTime(DateUtil.timestamp2DateStr(pink.getAddTime(), Constants.DATE_FORMAT)); - storePinkResponse.setStopTime(DateUtil.timestamp2DateStr(pink.getStopTime(), Constants.DATE_FORMAT)); + storePinkResponse.setAddTime(CrmebDateUtil.timestamp2DateStr(pink.getAddTime(), Constants.DATE_FORMAT)); + storePinkResponse.setStopTime(CrmebDateUtil.timestamp2DateStr(pink.getStopTime(), Constants.DATE_FORMAT)); StoreCombination combination = storeCombinationService.getById(pink.getCid()); storePinkResponse.setTitle(combination.getTitle()); return storePinkResponse; @@ -365,13 +365,14 @@ public class StorePinkServiceImpl extends ServiceImpl i */ @Override public List findSizePink(Integer size) { - LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); - lqw.eq(StorePink::getIsRefund, false); - lqw.in(StorePink::getStatus, 1, 2); - lqw.groupBy(StorePink::getUid); - lqw.orderByDesc(StorePink::getId); - lqw.last(" limit " + size); - return dao.selectList(lqw); +// LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); +// lqw.eq(StorePink::getIsRefund, false); +// lqw.in(StorePink::getStatus, 1, 2); +// lqw.groupBy(StorePink::getUid); +// lqw.orderByDesc(StorePink::getId); +// lqw.last(" limit " + size); +// return dao.selectList(lqw); + return dao.selectSizePink(size); } /** diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductAttrResultServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductAttrResultServiceImpl.java index 556e2928..e2bd5a6d 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductAttrResultServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductAttrResultServiceImpl.java @@ -16,7 +16,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductAttrServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductAttrServiceImpl.java index a8e2a4fe..8835369f 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductAttrServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductAttrServiceImpl.java @@ -18,7 +18,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductAttrValueServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductAttrValueServiceImpl.java index 7fc9a20d..5401d8ad 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductAttrValueServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductAttrValueServiceImpl.java @@ -22,7 +22,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相关版权 * +---------------------------------------------------------------------- @@ -121,19 +121,23 @@ public class StoreProductAttrValueServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper<>(); - if ("add".equals(operationType)) { + if (operationType.equals("quick_add")) { + updateWrapper.setSql(StrUtil.format("stock = stock + {}", num)); + } + if (operationType.equals("add")) { updateWrapper.setSql(StrUtil.format("stock = stock + {}", num)); updateWrapper.setSql(StrUtil.format("sales = sales - {}", num)); if (type > 0) { updateWrapper.setSql(StrUtil.format("quota = quota + {}", num)); } } - if ("sub".equals(operationType)) { + if (operationType.equals("sub")) { updateWrapper.setSql(StrUtil.format("stock = stock - {}", num)); updateWrapper.setSql(StrUtil.format("sales = sales + {}", num)); if (type > 0) { @@ -145,8 +149,35 @@ public class StoreProductAttrValueServiceImpl extends ServiceImpl= 0)", num)); } } + updateWrapper.setSql("version = version + 1"); updateWrapper.eq("id", id); updateWrapper.eq("type", type); + updateWrapper.eq("version", version); + boolean update = update(updateWrapper); + if (!update) { + throw new CrmebException("更新商品attrValue失败，attrValueId = " + id); + } + return update; + } + + @Override + public Boolean operationStock(Integer id, Integer num, String operationType, Integer version) { + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + if (operationType.equals("quick_add")) { + updateWrapper.setSql(StrUtil.format("stock = stock + {}", num)); + } + if (operationType.equals("add")) { + updateWrapper.setSql(StrUtil.format("stock = stock + {}", num)); + updateWrapper.setSql(StrUtil.format("sales = sales - {}", num)); + } + if (operationType.equals("sub")) { + updateWrapper.setSql(StrUtil.format("stock = stock - {}", num)); + updateWrapper.setSql(StrUtil.format("sales = sales + {}", num)); + + } + updateWrapper.setSql("version = version + 1"); + updateWrapper.eq("id", id); + updateWrapper.eq("version", version); boolean update = update(updateWrapper); if (!update) { throw new CrmebException("更新商品attrValue失败，attrValueId = " + id); @@ -183,5 +214,20 @@ public class StoreProductAttrValueServiceImpl extends ServiceImpl getByProductIdAndAttrIdList(Integer productId, List attrIdList) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StoreProductAttrValue::getProductId, productId); + lqw.in(StoreProductAttrValue::getId, attrIdList); + lqw.eq(StoreProductAttrValue::getIsDel, false); + return dao.selectList(lqw); + } } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductCouponServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductCouponServiceImpl.java index c88b0655..cba1228f 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductCouponServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductCouponServiceImpl.java @@ -15,7 +15,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductDescriptionServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductDescriptionServiceImpl.java index a76319df..d8598783 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductDescriptionServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductDescriptionServiceImpl.java @@ -15,7 +15,7 @@ import javax.annotation.Resource; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductLogServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductLogServiceImpl.java index 7fc44254..590a3822 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductLogServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductLogServiceImpl.java @@ -13,7 +13,7 @@ import javax.annotation.Resource; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductRelationServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductRelationServiceImpl.java index 1a60059e..830d6882 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductRelationServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductRelationServiceImpl.java @@ -31,7 +31,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相关版权 * +---------------------------------------------------------------------- @@ -235,5 +235,6 @@ public class StoreProductRelationServiceImpl extends ServiceImpl getList(StoreProductReplySearchRequest request, PageParamRequest pageParamRequest) { - Page pageStoreReply = PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit()); //带 StoreProductReply 类的多条件查询 LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(StoreProductReply::getIsDel, false); @@ -112,10 +113,11 @@ public class StoreProductReplyServiceImpl extends ServiceImpl pageStoreReply = PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit()); List dataList = dao.selectList(lambdaQueryWrapper); List dataResList = new ArrayList<>(); for (StoreProductReply productReply : dataList) { @@ -176,6 +178,8 @@ public class StoreProductReplyServiceImpl extends ServiceImpl { save(storeProductReply); + //修改订单详情信息 + storeOrderInfoService.updateReply(storeOrder.getId(),storeProductReply.getProductId(),storeProductReply.getUnique()); //修改订单信息 completeOrder(storeProductReply, count, storeOrder); return Boolean.TRUE; @@ -401,33 +405,60 @@ public class StoreProductReplyServiceImpl extends ServiceImpl lup = new LambdaUpdateWrapper<>(); lup.eq(StoreProductReply::getId, request.getIds()); lup.set(StoreProductReply::getMerchantReplyContent, request.getMerchantReplyContent()); - lup.set(StoreProductReply::getMerchantReplyTime, DateUtil.getNowTime()); + lup.set(StoreProductReply::getMerchantReplyTime, CrmebDateUtil.getNowTime()); lup.set(StoreProductReply::getIsReply, true); return update(lup); } - // 获取统计数据（好评、中评、差评） - private Integer getCountByScore(Integer productId, String type) { + + /** + * 获取统计数据（好评、中评、差评） + */ + @Override + public Integer getCountByScore(Integer productId, String type) { LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.eq(StoreProductReply::getProductId, productId); lqw.eq(StoreProductReply::getIsDel, false); switch (type) { - case "all": + case ProductConstants.PRODUCT_REPLY_TYPE_ALL: break; - case "good": - lqw.apply( " (product_score + service_score) >= 8"); + case ProductConstants.PRODUCT_REPLY_TYPE_GOOD: + lqw.apply(" (product_score + service_score) >= 8"); break; - case "medium": - lqw.apply( " (product_score + service_score) < 8 and (product_score + service_score) > 4"); + case ProductConstants.PRODUCT_REPLY_TYPE_MEDIUM: + lqw.apply(" (product_score + service_score) < 8 and (product_score + service_score) > 4"); break; - case "poor": - lqw.apply( " (product_score + service_score) <= 4"); + case ProductConstants.PRODUCT_REPLY_TYPE_POOR: + lqw.apply(" (product_score + service_score) <= 4"); break; } return dao.selectCount(lqw); } + +// // 获取统计数据（好评、中评、差评） +// private Integer getCountByScore(Integer productId, String type) { +// LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); +// lqw.eq(StoreProductReply::getProductId, productId); +// lqw.eq(StoreProductReply::getIsDel, false); +// +// switch (type) { +// case "all": +// break; +// case "good": +// lqw.apply( " (product_score + service_score) >= 8"); +// break; +// case "medium": +// lqw.apply( " (product_score + service_score) < 8 and (product_score + service_score) > 4"); +// break; +// case "poor": +// lqw.apply( " (product_score + service_score) <= 4"); +// break; +// } +// return dao.selectCount(lqw); +// } + /** * 如果所有的都已评价，那么订单完成 * @author Mr.Zhang @@ -440,6 +471,7 @@ public class StoreProductReplyServiceImpl extends ServiceImpl i @@ -169,8 +178,30 @@ public class StoreProductServiceImpl extends ServiceImpl cateIds = Arrays.stream(request.getCateId().split(",")).map(Integer::valueOf).distinct().collect(Collectors.toList()); + lambdaQueryWrapper.in(StoreProduct::getCateId, cateIds); + } + // 新增销量排行和价格排行 + if (StrUtil.isNotBlank(request.getSalesOrder())) { + if (request.getSalesOrder().equals(Constants.SORT_DESC)) { + lambdaQueryWrapper.last(" order by (sales + ficti) desc, sort desc, id desc"); + } else { + lambdaQueryWrapper.last(" order by (sales + ficti) asc, sort asc, id asc"); + } + } else { + if (StrUtil.isNotBlank(request.getPriceOrder())) { + if (request.getPriceOrder().equals(Constants.SORT_DESC)) { + lambdaQueryWrapper.orderByDesc(StoreProduct::getPrice); + } else { + lambdaQueryWrapper.orderByAsc(StoreProduct::getPrice); + } + } + + lambdaQueryWrapper.orderByDesc(StoreProduct::getSort); + lambdaQueryWrapper.orderByDesc(StoreProduct::getId); + } +// lambdaQueryWrapper.orderByDesc(StoreProduct::getSort).orderByDesc(StoreProduct::getId); Page storeProductPage = PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit()); List storeProducts = dao.selectList(lambdaQueryWrapper); @@ -251,7 +282,7 @@ public class StoreProductServiceImpl extends ServiceImpl couponList = new ArrayList<>(); for (Integer couponId : request.getCouponIds()) { - StoreProductCoupon spc = new StoreProductCoupon(storeProduct.getId(), couponId, DateUtil.getNowTime()); + StoreProductCoupon spc = new StoreProductCoupon(storeProduct.getId(), couponId, CrmebDateUtil.getNowTime()); couponList.add(spc); } storeProductCouponService.saveBatch(couponList); @@ -358,6 +389,9 @@ public class StoreProductServiceImpl extends ServiceImpl linkedHashMap = JSONObject.parseObject(attrValue, LinkedHashMap.class, Feature.OrderedField); Iterator> iterator = linkedHashMap.entrySet().iterator(); List strings = CollUtil.newArrayList(); @@ -528,7 +562,7 @@ public class StoreProductServiceImpl extends ServiceImpl couponList = new ArrayList<>(); for (Integer couponId : storeProductRequest.getCouponIds()) { - StoreProductCoupon spc = new StoreProductCoupon(storeProduct.getId(), couponId, DateUtil.getNowTime()); + StoreProductCoupon spc = new StoreProductCoupon(storeProduct.getId(), couponId, CrmebDateUtil.getNowTime()); couponList.add(spc); } storeProductCouponService.saveBatch(couponList); @@ -637,6 +671,18 @@ public class StoreProductServiceImpl extends ServiceImpl findByIds(List proIdsList, String label) { + return findByIdsAndLabel(proIdsList, label); + } + + /** * 商品详情（管理端） * @param id 商品id @@ -688,7 +734,7 @@ public class StoreProductServiceImpl extends ServiceImpl getProductActivityList(String activityStr) { List activityList = CollUtil.newArrayList(); - if ("0, 1, 2, 3".equals(activityStr)) { + if (activityStr.equals("0, 1, 2, 3")) { activityList.add(Constants.PRODUCT_TYPE_NORMAL_STR); activityList.add(Constants.PRODUCT_TYPE_SECKILL_STR); activityList.add(Constants.PRODUCT_TYPE_BARGAIN_STR); @@ -719,7 +765,7 @@ public class StoreProductServiceImpl extends ServiceImpl getTabsHeader() { + public List getTabsHeader(StoreProductHeaderRequest request) { List headers = new ArrayList<>(); StoreProductTabsHeader header1 = new StoreProductTabsHeader(0,"出售中商品",1); StoreProductTabsHeader header2 = new StoreProductTabsHeader(0,"仓库中商品",2); @@ -767,6 +813,18 @@ public class StoreProductServiceImpl extends ServiceImpl i + .or().eq(StoreProduct::getId, request.getKeywords()) + .or().like(StoreProduct::getStoreName, request.getKeywords()) + .or().like(StoreProduct::getKeyword, request.getKeywords())); + } + //分类搜索 + if(StringUtils.isNotBlank(request.getCateId())){ + List cateIds = Arrays.stream(request.getCateId().split(",")).map(Integer::valueOf).distinct().collect(Collectors.toList()); + lambdaQueryWrapper.in(StoreProduct::getCateId, cateIds); + } List storeProducts = dao.selectList(lambdaQueryWrapper); h.setCount(storeProducts.size()); } @@ -804,56 +862,6 @@ public class StoreProductServiceImpl extends ServiceImpl - */ - @Override - public List getSecondaryCategoryByProductId(String productIdStr) { - List idList = new ArrayList<>(); - - if (StringUtils.isBlank(productIdStr)) { - return idList; - } - List productIdList = CrmebUtil.stringToArray(productIdStr); - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.in(StoreProduct::getId, productIdList); - List productList = dao.selectList(lambdaQueryWrapper); - if (productIdList.size() < 1) { - return idList; - } - - //把所有的分类id写入集合 - for (StoreProduct storeProduct : productList) { - List categoryIdList = CrmebUtil.stringToArray(storeProduct.getCateId()); - idList.addAll(categoryIdList); - } - - //去重 - List cateIdList = idList.stream().distinct().collect(Collectors.toList()); - if (cateIdList.size() < 1) { - return idList; - } - - //取出所有的二级分类 - List categoryList = categoryService.getByIds(cateIdList); - if (categoryList.size() < 1) { - return idList; - } - - for (Category category: categoryList) { - List parentIdList = CrmebUtil.stringToArrayByRegex(category.getPath(), "/"); - if (parentIdList.size() > 2) { - Integer secondaryCategoryId = parentIdList.get(2); - if (secondaryCategoryId > 0) { - idList.add(secondaryCategoryId); - } - } - } - return idList; - } - /** * 根据其他平台url导入产品信息 * @param url 待导入平台url @@ -948,13 +956,11 @@ public class StoreProductServiceImpl extends ServiceImpl lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); + lambdaUpdateWrapper.set(StoreProduct::getIsRecycle, 0); lambdaUpdateWrapper.eq(StoreProduct::getId, productId); - lambdaUpdateWrapper.set(StoreProduct::getIsRecycle, false); return update(lambdaUpdateWrapper); } - ///////////////////////////////////////////自定义方法 - /** * 扣减库存任务操作 * @param storeProductStockRequest 扣减库存参数 @@ -975,7 +981,7 @@ public class StoreProductServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper<>(); - if ("add".equals(type)) { + if (type.equals("quick_add")) { + updateWrapper.setSql(StrUtil.format("stock = stock + {}", num)); + } + if (type.equals("add")) { updateWrapper.setSql(StrUtil.format("stock = stock + {}", num)); updateWrapper.setSql(StrUtil.format("sales = sales - {}", num)); } - if ("sub".equals(type)) { + if (type.equals("sub")) { updateWrapper.setSql(StrUtil.format("stock = stock - {}", num)); updateWrapper.setSql(StrUtil.format("sales = sales + {}", num)); // 扣减时加乐观锁保证库存不为负 updateWrapper.last(StrUtil.format(" and (stock - {} >= 0)", num)); } + updateWrapper.setSql("version = version + 1"); updateWrapper.eq("id", id); +// updateWrapper.eq("version", version); boolean update = update(updateWrapper); if (!update) { throw new CrmebException("更新普通商品库存失败,商品id = " + id); @@ -1121,7 +1132,7 @@ public class StoreProductServiceImpl extends ServiceImpl lambdaQueryWrapper = Wrappers.lambdaQuery(); lambdaQueryWrapper.select(StoreProduct::getId, StoreProduct::getImage, StoreProduct::getStoreName, - StoreProduct::getPrice, StoreProduct::getOtPrice, StoreProduct::getActivity); + StoreProduct::getPrice, StoreProduct::getOtPrice, StoreProduct::getActivity, StoreProduct::getCateId); switch (type) { case Constants.INDEX_RECOMMEND_BANNER: //精品推荐 lambdaQueryWrapper.eq(StoreProduct::getIsBest, true); @@ -1163,29 +1174,30 @@ public class StoreProductServiceImpl extends ServiceImpl 0) { + if (ObjectUtil.isNotNull(request.getCid()) && !request.getCid().isEmpty()) { + List cidList = Stream.of(request.getCid().split(",")).map(Integer::valueOf).collect(Collectors.toList()); //查找当前类下的所有子类 - List childVoListByPid = categoryService.getChildVoListByPid(request.getCid()); - List categoryIdList = childVoListByPid.stream().map(Category::getId).collect(Collectors.toList()); - categoryIdList.add(request.getCid()); + List childVoListByPids = categoryService.getByPIds(cidList); + List categoryIdList = childVoListByPids.stream().map(Category::getId).collect(Collectors.toList()); + categoryIdList.addAll(cidList); lqw.apply(CrmebUtil.getFindInSetSql("cate_id", (ArrayList) categoryIdList)); } if (StrUtil.isNotBlank(request.getKeyword())) { - if (CrmebUtil.isString2Num(request.getKeyword())) { - Integer productId = Integer.valueOf(request.getKeyword()); - lqw.like(StoreProduct::getId, productId); - } else { - lqw.like(StoreProduct::getStoreName, request.getKeyword()); - } +// if (CrmebUtil.isString2Num(request.getKeyword())) { +// Integer productId = Integer.valueOf(request.getKeyword()); +// lqw.like(StoreProduct::getId, productId); +// } else { + lqw.and(i -> i.like(StoreProduct::getStoreName, request.getKeyword()) + .or().like(StoreProduct::getKeyword, request.getKeyword())); +// } } // 排序部分 @@ -1208,7 +1220,11 @@ public class StoreProductServiceImpl extends ServiceImpl storeProducts = dao.selectList(lqw); + storeProducts.forEach(storeProduct -> { + storeProduct.setSales(storeProduct.getSales() + storeProduct.getFicti()); + }); + return storeProducts; } /** @@ -1221,7 +1237,8 @@ public class StoreProductServiceImpl extends ServiceImpl lqw = Wrappers.lambdaQuery(); lqw.select(StoreProduct::getId, StoreProduct::getImage, StoreProduct::getStoreName, StoreProduct::getSliderImage, StoreProduct::getOtPrice, StoreProduct::getStock, StoreProduct::getSales, StoreProduct::getPrice, StoreProduct::getActivity, - StoreProduct::getFicti, StoreProduct::getIsSub, StoreProduct::getStoreInfo, StoreProduct::getBrowse, StoreProduct::getUnitName); + StoreProduct::getFicti, StoreProduct::getIsSub, StoreProduct::getBrowse, StoreProduct::getUnitName, + StoreProduct::getBarCode, StoreProduct::getCateId); lqw.eq(StoreProduct::getId, id); lqw.eq(StoreProduct::getIsRecycle, false); lqw.eq(StoreProduct::getIsDel, false); @@ -1351,10 +1368,157 @@ public class StoreProductServiceImpl extends ServiceImpl storeProducts = dao.selectList(queryWrapper); + // 查询活动边框配置信息, 并赋值给商品response 重复添加的商品数据会根据数据添加持续覆盖后的为准 + storeProducts = activityStyleService.makeActivityBorderStyle(storeProducts); + return storeProducts; } + /** + * 是否有商品使用运费模板 + * @return Boolean + */ + @Override + public Boolean isUseShippingTemplateId(Integer templateId) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StoreProduct::getTempId, templateId); + lqw.eq(StoreProduct::getIsDel, false); + return dao.selectCount(lqw) > 0; + } + + /** + * 获取商品所用的分类（包含父级分类） + * @param productIdList 商品ID列表 + * @return 商品分类及所有父级分类ID + */ + @Override + public List getProductAllCategoryIdByProductIds(List productIdList) { + List idList = new ArrayList<>(); + + if (CollUtil.isEmpty(productIdList)) { + return idList; + } + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.select(StoreProduct::getId, StoreProduct::getCateId); + lqw.in(StoreProduct::getId, productIdList); + List productList = dao.selectList(lqw); + if (CollUtil.isEmpty(productList)) { + return idList; + } + //把所有的分类id写入集合 + for (StoreProduct storeProduct : productList) { + List categoryIdList = CrmebUtil.stringToArray(storeProduct.getCateId()); + idList.addAll(categoryIdList); + } + + //去重 + List cateIdList = idList.stream().distinct().collect(Collectors.toList()); + + List categoryList = categoryService.getByIds(cateIdList); + if (CollUtil.isEmpty(categoryList)) { + return idList; + } + + for (Category category: categoryList) { + List parentIdList = CrmebUtil.stringToArrayByRegex(category.getPath(), "/"); + if (CollUtil.isNotEmpty(parentIdList)) { + for (Integer parentId : parentIdList) { + if (parentId > 0) { + idList.add(parentId); + } + } + } + } + + return idList.stream().distinct().collect(Collectors.toList()); + } + + /** + * 快捷添加库存 + * + * @param request 添加库存参数 + * @return Boolean + */ + @Override + public Boolean quickAddStock(ProductAddStockRequest request) { + StoreProduct storeProduct = dao.selectById(request.getId()); + if (storeProduct == null) { + throw new CrmebException(ProductResultCode.PRODUCT_NOT_EXIST); + } + List valueStockList = request.getAttrValueList(); + List attrIdList = valueStockList.stream().map(ProductAttrValueAddStockRequest::getId).distinct().collect(Collectors.toList()); + if (attrIdList.size() != valueStockList.size()) { + throw new CrmebException(CommonResultCode.VALIDATE_FAILED, "有重复的商品规格属性ID"); + } + List valueList = storeProductAttrValueService.getByProductIdAndAttrIdList(request.getId(), attrIdList); + if (CollUtil.isEmpty(valueList) || valueList.size() != attrIdList.size()) { + throw new CrmebException(CommonResultCode.VALIDATE_FAILED, "商品规格属性ID数组数据异常，请刷新后再试"); + } + for (ProductAttrValueAddStockRequest value : valueStockList) { + for (StoreProductAttrValue attrValue : valueList) { + if (attrValue.getId().equals(value.getId())) { + value.setVersion(attrValue.getVersion()); + break; + } + } + } + int totalStock = valueStockList.stream().mapToInt(ProductAttrValueAddStockRequest::getAddStock).sum(); + return transactionTemplate.execute(e -> { + operationStock(storeProduct.getId(), totalStock, "quick_add",storeProduct.getVersion()); + valueStockList.forEach(valueStock -> { + storeProductAttrValueService.operationStock(valueStock.getId(), valueStock.getAddStock(), + "quick_add",valueStock.getVersion()); + }); + return Boolean.TRUE; + }); + + } + + + + ///////////////////////////////////////////自定义方法 + + /** + * 通过ID获取商品列表 + * + * @param proIdsList 商品ID列表 + * @param label admin-管理端，front-移动端 + */ + private List findByIdsAndLabel(List proIdsList, String label) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.in(StoreProduct::getId, proIdsList); + if (label.equals("front")) { + getForSaleWhere(lqw); + } + +//拼接Sql + StringBuilder builder = new StringBuilder(); + builder.append("order by field(id,"); + int length = proIdsList.size(); + for(int i= 0; i lqw) { + lqw.eq(StoreProduct::getIsDel, false); + lqw.eq(StoreProduct::getIsRecycle, false); + lqw.eq(StoreProduct::getIsShow, true); + } } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreSeckillMangerServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreSeckillMangerServiceImpl.java index 67796966..e2b8de45 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreSeckillMangerServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreSeckillMangerServiceImpl.java @@ -1,6 +1,7 @@ package com.zbkj.service.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -11,7 +12,7 @@ import com.zbkj.common.request.StoreSeckillMangerRequest; import com.zbkj.common.request.StoreSeckillMangerSearchRequest; import com.zbkj.common.response.StoreSeckillManagerResponse; import com.github.pagehelper.PageHelper; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.common.model.seckill.StoreSeckillManger; import com.zbkj.service.dao.StoreSeckillMangerDao; import com.zbkj.service.service.StoreSeckillMangerService; @@ -31,7 +32,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相关版权 * +---------------------------------------------------------------------- @@ -60,7 +61,9 @@ public class StoreSeckillMangerServiceImpl extends ServiceImpl lambdaQueryWrapper = Wrappers.lambdaQuery(); if(null != request.getName()) lambdaQueryWrapper.like(StoreSeckillManger::getName, request.getName()); - if(null != request.getStatus()) lambdaQueryWrapper.eq(StoreSeckillManger::getStatus, request.getStatus()); + if(null != request.getStatus() && !"".equals(request.getStatus())) { + lambdaQueryWrapper.eq(StoreSeckillManger::getStatus, request.getStatus()); + } lambdaQueryWrapper.orderByAsc(StoreSeckillManger::getSort); @@ -90,6 +93,7 @@ public class StoreSeckillMangerServiceImpl extends ServiceImpl checkTimeRangeUnique(StoreSeckillManger storeSeckillManger) { LambdaQueryWrapper lqTimeUnique = Wrappers.lambdaQuery(); + // 开始时间大于等于 开始时间小于等于 lqTimeUnique.ge(StoreSeckillManger::getStartTime, storeSeckillManger.getStartTime()); lqTimeUnique.lt(StoreSeckillManger::getStartTime, storeSeckillManger.getEndTime()); lqTimeUnique.or(); @@ -119,6 +123,7 @@ public class StoreSeckillMangerServiceImpl extends ServiceImpl 0; } @@ -144,7 +149,7 @@ public class StoreSeckillMangerServiceImpl extends ServiceImpl getCurrentSeckillManager() { - int currentHour = DateUtil.getCurrentHour(); + int currentHour = CrmebDateUtil.getCurrentHour(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.le(StoreSeckillManger::getStartTime,currentHour).gt(StoreSeckillManger::getEndTime,currentHour); return dao.selectList(lqw); @@ -158,8 +163,9 @@ public class StoreSeckillMangerServiceImpl extends ServiceImpl 0; } @@ -185,11 +191,13 @@ public class StoreSeckillMangerServiceImpl extends ServiceImpl storeSeckillMangers = dao.selectList(startAndEndExcuseQuery); + // 判断是否被扩大 + LambdaQueryWrapper startAndEndExcuseQueryIn = Wrappers.lambdaQuery(); + startAndEndExcuseQueryIn.le(StoreSeckillManger::getStartTime,storeSeckillManger.getStartTime()) + .ge(StoreSeckillManger::getEndTime,storeSeckillManger.getEndTime()); + List storeSeckillMangersIn = dao.selectList(startAndEndExcuseQueryIn); // 时间区间改大 不存在的情况 - if(CollUtil.isEmpty(storeSeckillMangers) && storeSeckillMangers.size() == 0){ - return updateByCondition(storeSeckillManger); - // 时间区间改小 id一样且仅仅存在一条 - }else if(storeSeckillMangers.size() == 1 && storeSeckillMangers.get(0).getId().equals(id)){ + if(storeSeckillMangers.size() <= 1 && storeSeckillMangersIn.size() <= 1){ //storeSeckillMangers.get(0).getId().equals(id) return updateByCondition(storeSeckillManger); }else{ throw new CrmebException("当前时间段的秒杀配置已存在"); @@ -243,9 +251,9 @@ public class StoreSeckillMangerServiceImpl extends ServiceImpl getH5List() { LambdaQueryWrapper lambdaQueryWrapper = Wrappers.lambdaQuery(); lambdaQueryWrapper.eq(StoreSeckillManger::getIsDel, false); - lambdaQueryWrapper.eq(StoreSeckillManger::getStatus, 1); + lambdaQueryWrapper.eq(StoreSeckillManger::getStatus, "'1'"); // 获取当前小时 - int currentHour = DateUtil.getCurrentHour(); + int currentHour = CrmebDateUtil.getCurrentHour(); lambdaQueryWrapper.gt(StoreSeckillManger::getEndTime, currentHour); lambdaQueryWrapper.orderByAsc(StoreSeckillManger::getStartTime); List storeSeckillMangers = dao.selectList(lambdaQueryWrapper); diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreSeckillServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreSeckillServiceImpl.java index dc92e534..9d4154bd 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreSeckillServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreSeckillServiceImpl.java @@ -23,7 +23,7 @@ import com.zbkj.common.page.CommonPage; import com.zbkj.common.request.*; import com.zbkj.common.response.*; import com.zbkj.common.utils.CrmebUtil; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.common.utils.RedisUtil; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; @@ -47,7 +47,7 @@ import java.util.stream.Collectors; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -116,14 +116,17 @@ public class StoreSeckillServiceImpl extends ServiceImpl wrapper + .like(StoreSeckill::getTitle,request.getKeywords()) + .or() + .like(StoreSeckill::getId,request.getKeywords()) + ); + } lambdaQueryWrapper.orderByDesc(StoreSeckill::getSort).orderByDesc(StoreSeckill::getId); List storeProducts = dao.selectList(lambdaQueryWrapper); List storeProductResponses = new ArrayList<>(); @@ -244,8 +247,8 @@ public class StoreSeckillServiceImpl extends ServiceImpl attrValueAddRequestList = request.getAttrValue(); @@ -336,8 +339,8 @@ public class StoreSeckillServiceImpl extends ServiceImpl() @@ -504,7 +507,7 @@ public class StoreSeckillServiceImpl extends ServiceImpl getForH5Index() { List response = new ArrayList<>(); - int currentHour = DateUtil.getCurrentHour(); + int currentHour = CrmebDateUtil.getCurrentHour(); // 获取所有的秒杀配置 List skillManagerList = storeSeckillMangerService.getH5List(); // 根据当前时间过滤 仅处理正在进行和马上开始的秒杀 @@ -662,7 +665,7 @@ public class StoreSeckillServiceImpl extends ServiceImpl 0) { - int secKillEndSecondTimestamp = DateUtil.getSecondTimestamp(DateUtil.nowDateTime("yyyy-MM-dd " + e.getEndTime() + ":00:00")); + int secKillEndSecondTimestamp = CrmebDateUtil.getSecondTimestamp(CrmebDateUtil.nowDateTime("yyyy-MM-dd " + e.getEndTime() + ":00:00")); SecKillResponse r = new SecKillResponse(e.getId(),e.getSilderImgs(),e.getStatusName(), e.getTime(),e.getKillStatus(),secKillEndSecondTimestamp+""); if (e.getStartTime() <= currentHour && currentHour < e.getEndTime()) { @@ -686,7 +689,7 @@ public class StoreSeckillServiceImpl extends ServiceImpl getKillListByTimeId(String timeId, PageParamRequest pageParamRequest) { PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit()); - String currentDate = DateUtil.nowDate(Constants.DATE_FORMAT_DATE); + String currentDate = CrmebDateUtil.nowDate(Constants.DATE_FORMAT_DATE); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(StoreSeckill::getStatus,1); lqw.eq(StoreSeckill::getIsDel,false); @@ -829,12 +832,12 @@ public class StoreSeckillServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper<>(); - if ("add".equals(type)) { + if (type.equals("add")) { updateWrapper.setSql(StrUtil.format("stock = stock + {}", num)); updateWrapper.setSql(StrUtil.format("sales = sales - {}", num)); updateWrapper.setSql(StrUtil.format("quota = quota + {}", num)); } - if ("sub".equals(type)) { + if (type.equals("sub")) { updateWrapper.setSql(StrUtil.format("stock = stock - {}", num)); updateWrapper.setSql(StrUtil.format("sales = sales + {}", num)); updateWrapper.setSql(StrUtil.format("quota = quota - {}", num)); @@ -864,9 +867,12 @@ public class StoreSeckillServiceImpl extends ServiceImpl lqw = Wrappers.lambdaQuery(); lqw.select(StoreSeckill::getId, StoreSeckill::getProductId, StoreSeckill::getImage, StoreSeckill::getTitle, StoreSeckill::getPrice, StoreSeckill::getOtPrice); lqw.eq(StoreSeckill::getStatus,1); @@ -892,7 +898,7 @@ public class StoreSeckillServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(SystemAttachment::getPid, pid); if(StringUtils.isNotEmpty(attType)){ - lambdaQueryWrapper.in(SystemAttachment::getAttType, StringUtils.split(attType,",")); + lambdaQueryWrapper.in(SystemAttachment::getAttType, CrmebUtil.stringToArrayStr(attType)); } lambdaQueryWrapper.orderByDesc(SystemAttachment::getAttId); return dao.selectList(lambdaQueryWrapper); @@ -82,7 +87,13 @@ public class SystemAttachmentServiceImpl extends ServiceImpl idList) { + LambdaUpdateWrapper wrapper = Wrappers.lambdaUpdate(); + wrapper.in(SystemAttachment::getAttId, idList); + return remove(wrapper); + } } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SystemCityAsyncServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SystemCityAsyncServiceImpl.java index 7fb87ce6..0929b316 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SystemCityAsyncServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SystemCityAsyncServiceImpl.java @@ -25,7 +25,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -90,7 +90,7 @@ public class SystemCityAsyncServiceImpl extends ServiceImpl systemCityList = dao.selectList(lambdaQueryWrapper); if (systemCityList != null && systemCityList.size() > 0) { - redisUtil.hmSet(Constants.CITY_LIST, pid.toString(), systemCityList); + redisUtil.hset(Constants.CITY_LIST, pid.toString(), systemCityList); } } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SystemCityServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SystemCityServiceImpl.java index a64c3da1..861ed1e9 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SystemCityServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SystemCityServiceImpl.java @@ -1,6 +1,7 @@ package com.zbkj.service.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -28,7 +29,7 @@ import java.util.stream.Collectors; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -54,7 +55,7 @@ public class SystemCityServiceImpl extends ServiceImpl getCityIdList() { Object data = redisUtil.get(Constants.CITY_LIST_LEVEL_1); List collect; - if (data == null || "".equals(data)) { + if (data == null || data.equals("")) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.select(SystemCity::getCityId); lambdaQueryWrapper.eq(SystemCity::getLevel, 1); @@ -179,5 +182,31 @@ public class SystemCityServiceImpl extends ServiceImpl lqw = Wrappers.lambdaQuery(); + lqw.eq(SystemCity::getName, areaName); + lqw.eq(SystemCity::getIsShow,1); + lqw.eq(SystemCity::getLevel, 2); + lqw.eq(SystemCity::getParentId, pid); + return getOne(lqw); + } + + /** + * 通过区域id获取 + * @param areaId 区域Id + * @return SystemCity + */ + @Override + public SystemCity getByAreaId(Integer areaId) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(SystemCity::getCityId, areaId); + lqw.eq(SystemCity::getIsShow, 1); + return getOne(lqw); + } } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SystemConfigServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SystemConfigServiceImpl.java index 7a63b96a..6552e919 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SystemConfigServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SystemConfigServiceImpl.java @@ -1,6 +1,7 @@ package com.zbkj.service.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -8,34 +9,35 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zbkj.common.config.CrmebConfig; import com.zbkj.common.constants.Constants; +import com.zbkj.common.constants.SysConfigConstants; import com.zbkj.common.exception.CrmebException; -import com.zbkj.common.request.SystemConfigAdminRequest; +import com.zbkj.common.model.system.SystemConfig; +import com.zbkj.common.request.SaveConfigRequest; import com.zbkj.common.request.SystemFormCheckRequest; import com.zbkj.common.request.SystemFormItemCheckRequest; +import com.zbkj.common.response.AdminSiteLogoResponse; import com.zbkj.common.utils.RedisUtil; import com.zbkj.common.vo.ExpressSheetVo; -import com.zbkj.common.model.system.SystemConfig; import com.zbkj.service.dao.SystemConfigDao; import com.zbkj.service.service.SystemAttachmentService; import com.zbkj.service.service.SystemConfigService; import com.zbkj.service.service.SystemFormTempService; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import org.springframework.transaction.support.TransactionTemplate; +import javax.annotation.PostConstruct; import javax.annotation.Resource; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.stream.Collectors; /** * SystemConfigServiceImpl 接口实现 * +---------------------------------------------------------------------- * | 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,12 +60,14 @@ public class SystemConfigServiceImpl extends ServiceImpl - */ - @Override - public List getValuesByKes(List keys) { - List result = new ArrayList<>(); - for (String key : keys) { - result.add(getValueByKey(key)); - } - return result; - } - /** * 根据 name 获取 value 找不到抛异常 + * * @param name menu name * @return String */ @Override public String getValueByKeyException(String name) { String value = get(name); - if (null == value) { - throw new CrmebException("没有找到"+ name +"数据"); + if (StrUtil.isBlank(value)) { + throw new CrmebException("没有找到或配置：" + name + "数据"); } - return value; } /** * 整体保存表单数据 + * * @param systemFormCheckRequest SystemFormCheckRequest 数据保存 * @return boolean */ @@ -113,7 +103,6 @@ public class SystemConfigServiceImpl extends ServiceImpl systemConfigList = new ArrayList<>(); - //批量添加 for (SystemFormItemCheckRequest systemFormItemCheckRequest : systemFormCheckRequest.getFields()) { SystemConfig systemConfig = new SystemConfig(); @@ -129,94 +118,85 @@ public class SystemConfigServiceImpl extends ServiceImpl forAsyncPram = systemConfigList.stream().map(e -> { - e.setStatus(true); - return e; - }).collect(Collectors.toList()); - async(forAsyncPram); - - return true; - } - - - - /** - * updateStatusByGroupId - * @param formId Integer formId - */ - private void updateStatusByFormId(Integer formId) { - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(SystemConfig::getFormId, formId).eq(SystemConfig::getStatus, false); - - SystemConfig systemConfig = new SystemConfig(); - systemConfig.setStatus(true); - update(systemConfig, lambdaQueryWrapper); - - } - - /** - * deleteStatusByGroupId - * @param formId Integer formId - * @author Mr.Zhang - * @since 2020-04-16 - */ - private void deleteStatusByFormId(Integer formId) { - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + LambdaQueryWrapper oldLqw = Wrappers.lambdaQuery(); + oldLqw.eq(SystemConfig::getFormId, systemFormCheckRequest.getId()); //删除已经隐藏的数据 - lambdaQueryWrapper.eq(SystemConfig::getFormId, formId).eq(SystemConfig::getStatus, true); - List systemConfigList = dao.selectList(lambdaQueryWrapper); - dao.delete(lambdaQueryWrapper); - async(systemConfigList); + List systemConfigOldList = dao.selectList(oldLqw); + + Boolean execute = transactionTemplate.execute(e -> { + //删除之前的数据 + if (CollUtil.isNotEmpty(systemConfigOldList)) { + dao.delete(oldLqw); + } + boolean batch = saveBatch(systemConfigList, 100); + if (!batch) { + e.setRollbackOnly(); + return Boolean.FALSE; + } + return Boolean.TRUE; + }); + if (execute && crmebConfig.isAsyncConfig() && CollUtil.isNotEmpty(systemConfigOldList)) { + asyncDelete(systemConfigOldList); + } + return execute; } + private void asyncDelete(List systemConfigList) { + systemConfigList.forEach(config -> { + if (redisUtil.hHasKey(Constants.CONFIG_LIST, config.getName())) { + redisUtil.hmDelete(Constants.CONFIG_LIST, config.getName()); + } + }); + } /** * 保存或更新配置数据 - * @param name 菜单名称 + * + * @param name 菜单名称 * @param value 菜单值 * @return boolean */ @Override public Boolean updateOrSaveValueByName(String name, String value) { - value = systemAttachmentService.clearPrefix(value); - - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + if (StrUtil.isNotBlank(value)) { + value = systemAttachmentService.clearPrefix(value); + } + LambdaQueryWrapper lambdaQueryWrapper = Wrappers.lambdaQuery(); lambdaQueryWrapper.eq(SystemConfig::getName, name); List systemConfigs = dao.selectList(lambdaQueryWrapper); - if (systemConfigs.size() >= 2) { - throw new CrmebException("配置名称存在多个请检查配置 eb_system_config 重复数据："+name+"条数："+systemConfigs.size()); - } else if (systemConfigs.size() == 1) { - systemConfigs.get(0).setValue(value); - updateById(systemConfigs.get(0)); - asyncRedis(name); - return true; - } else { - save(new SystemConfig().setName(name).setValue(value)); - asyncRedis(name); - return true; + if (systemConfigs.size() > 1) { + throw new CrmebException("配置名称存在多个请检查配置 eb_system_config 重复数据：" + name + "条数：" + systemConfigs.size()); } + boolean result; + SystemConfig systemConfig; + if (CollUtil.isEmpty(systemConfigs)) { + systemConfig = new SystemConfig().setName(name).setValue(value); + result = save(systemConfig); + } else { + systemConfig = systemConfigs.get(0); + systemConfig.setValue(value); + systemConfig.setUpdateTime(DateUtil.date()); + result = updateById(systemConfig); + } + if (result && crmebConfig.isAsyncConfig()) { + async(systemConfig); + } + return result; } /** * 根据formId查询数据 + * * @param formId Integer id * @return HashMap */ @Override public HashMap info(Integer formId) { - LambdaQueryWrapper lambdaQueryWrapper1 = new LambdaQueryWrapper<>(); - lambdaQueryWrapper1.eq(SystemConfig::getFormId, formId); - List systemConfigList = dao.selectList(lambdaQueryWrapper1); - if (ObjectUtil.isNull(systemConfigList)) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(SystemConfig::getFormId, formId); + List systemConfigList = dao.selectList(lqw); + if (CollUtil.isEmpty(systemConfigList)) { return CollUtil.newHashMap(); } HashMap map = new HashMap<>(); @@ -227,161 +207,219 @@ public class SystemConfigServiceImpl extends ServiceImpl getListByKey(String key) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(SystemConfig::getName, key); - return dao.selectList(lqw); - } - /** * 获取面单默认配置信息 + * * @return ExpressSheetVo */ @Override public ExpressSheetVo getDeliveryInfo() { - String exportId = get("config_export_id"); - String exportTempId = get("config_export_temp_id"); - String exportCom = get("config_export_com"); - String exportToName = get("config_export_to_name"); - String exportToTel = get("config_export_to_tel"); - String exportToAddress = get("config_export_to_address"); - String exportSiid = get("config_export_siid"); - String exportOpen = get("config_export_open"); + String exportId = get(SysConfigConstants.ELECTRONIC_FACE_SHEET_EXPORT_ID); + String exportTempId = get(SysConfigConstants.ELECTRONIC_FACE_SHEET_EXPORT_TEMP_ID); + String exportCom = get(SysConfigConstants.ELECTRONIC_FACE_SHEET_EXPORT_COM); + String exportToName = get(SysConfigConstants.ELECTRONIC_FACE_SHEET_TO_NAME); + String exportToTel = get(SysConfigConstants.ELECTRONIC_FACE_SHEET_TO_TEL); + String exportToAddress = get(SysConfigConstants.ELECTRONIC_FACE_SHEET_ADDRESS); + String exportSiid = get(SysConfigConstants.ELECTRONIC_FACE_SHEET_PRINTER_NUM); + String exportOpen = get(SysConfigConstants.ELECTRONIC_FACE_SHEET_OPEN); return new ExpressSheetVo(Integer.valueOf(exportId), exportCom, exportTempId, exportToName, exportToTel, exportToAddress, exportSiid, Integer.valueOf(exportOpen)); } /** - * 更新配置信息 - * @param requestList 请求数组 - * @return Boolean + * 获取文件存储类型 */ @Override - public Boolean updateByList(List requestList) { - List configList = requestList.stream().map(e -> { - SystemConfig systemConfig = new SystemConfig(); - BeanUtils.copyProperties(e, systemConfig); - return systemConfig; - }).collect(Collectors.toList()); - return updateBatchById(configList); + public SystemConfig getFileUploadType() { + return getConfigByNameException(SysConfigConstants.CONFIG_UPLOAD_TYPE); } /** - * 获取颜色配置 - * @return SystemConfig + * 获取管理端logo + * + * @return AdminSiteLogoResponse */ @Override - public SystemConfig getColorConfig() { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(SystemConfig::getName, "change_color_config"); - lqw.eq(SystemConfig::getStatus, 0); - return dao.selectOne(lqw); + public AdminSiteLogoResponse getSiteLogo() { + String siteLogoSquare = get(SysConfigConstants.CONFIG_KEY_ADMIN_LOGO_SQUARE); + String siteLogoLeftTop = get(SysConfigConstants.CONFIG_KEY_ADMIN_LOGIN_LOGO_LEFT_TOP); + AdminSiteLogoResponse response = new AdminSiteLogoResponse(); + response.setSiteLogoSquare(siteLogoSquare); + response.setSiteLogoLeftTop(siteLogoLeftTop); + return response; } - /** - * 把数据同步到redis - * @param name name - * @author Mr.Zhang - * @since 2020-04-16 + * 获取腾讯地图key */ - private void asyncRedis(String name) { - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(SystemConfig::getName, name); - List systemConfigList = dao.selectList(lambdaQueryWrapper); - if (systemConfigList.size() == 0) { - //说明数据已经被删除了 - deleteRedis(name); - return; - } - - async(systemConfigList); + @Override + public SystemConfig getTxMapKey() { + return getConfigByNameException(SysConfigConstants.CONFIG_SITE_TENG_XUN_MAP_KEY); } /** - * 把数据同步到redis - * @param systemConfigList List 需要同步的数据 + * 获取移动端首页列表样式 */ - private void async(List systemConfigList) { - if (!crmebConfig.isAsyncConfig()) { - //如果配置没有开启 - return; - } - for (SystemConfig systemConfig : systemConfigList) { - redisUtil.hmSet(redisKey, systemConfig.getName(), systemConfig.getValue()); - } + @Override + public SystemConfig getHomePageSaleListStyle() { + return getConfigByNameException(Constants.CONFIG_IS_PRODUCT_LIST_STYLE); } /** - * 把数据同步到redis - * @param name String - * @author Mr.Zhang - * @since 2020-04-16 + * 保存移动端首页列表样式 */ - private void deleteRedis(String name) { - if (!crmebConfig.isAsyncConfig()) { - //如果配置没有开启 - return; - } - redisUtil.hmDelete(redisKey, name); + @Override + public Boolean saveHomePageSaleListStyle(SaveConfigRequest request) { + return updateOrSaveValueByName(Constants.CONFIG_IS_PRODUCT_LIST_STYLE, request.getValue()); } /** - * 把数据同步到redis - * @param name String + * 清除config缓存 + */ + @Override + public Boolean clearCache() { + redisUtil.delete(Constants.CONFIG_LIST); + return Boolean.TRUE; + } + + /** + * 获取授权地址 + */ + @Override + public SystemConfig getAuthHost() { + return getConfigByNameException(SysConfigConstants.CONFIG_COPYRIGHT_AUTH_HOST); + } + + /** + * 获取主题色 + */ + @Override + public SystemConfig getChangeColor() { + return getConfigByNameException(SysConfigConstants.CONFIG_CHANGE_COLOR); + } + + /** + * 保存主题色 + */ + @Override + public Boolean saveChangeColor(SaveConfigRequest request) { + return updateOrSaveValueByName(SysConfigConstants.CONFIG_CHANGE_COLOR, request.getValue()); + } + + private SystemConfig getConfigByName(String name) { + String value = get(name); + if (StrUtil.isBlank(value)) { + value = ""; + } + SystemConfig systemConfig = new SystemConfig(); + systemConfig.setName(name); + systemConfig.setValue(value); + return systemConfig; + } + + private SystemConfig getConfigByNameException(String name) { + String value = getValueByKeyException(name); + SystemConfig systemConfig = new SystemConfig(); + systemConfig.setName(name); + systemConfig.setValue(value); + return systemConfig; + } + + private void asyncBlank(String key) { + redisUtil.hset(Constants.CONFIG_LIST, key, ""); + } + + private void async(SystemConfig systemConfig) { + redisUtil.hset(Constants.CONFIG_LIST, systemConfig.getName(), systemConfig.getValue()); + } + + + /** + * 获取config数据 + * + * @param name key * @return String */ private String get(String name) { if (!crmebConfig.isAsyncConfig()) { - //如果配置没有开启 - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(SystemConfig::getStatus, false).eq(SystemConfig::getName, name); - SystemConfig systemConfig = dao.selectOne(lambdaQueryWrapper); + SystemConfig systemConfig = getByName(name); if (ObjectUtil.isNull(systemConfig) || StrUtil.isBlank(systemConfig.getValue())) { return ""; } return systemConfig.getValue(); } - setRedisByVoList(); - Object data = redisUtil.hmGet(redisKey, name); - if (ObjectUtil.isNull(data) || StrUtil.isBlank(data.toString())) { - //没有找到数据 + Long size = redisUtil.getHashSize(Constants.CONFIG_LIST); + if (size <= 0) { + SystemConfig systemConfig = getByName(name); + if (ObjectUtil.isNull(systemConfig) || StrUtil.isBlank(systemConfig.getValue())) { + asyncBlank(name); + return ""; + } + async(systemConfig); + return systemConfig.getValue(); + } + Object data = redisUtil.hget(Constants.CONFIG_LIST, name); + if (ObjectUtil.isNotNull(data)) { + return data.toString(); + } + SystemConfig systemConfig = getByName(name); + if (ObjectUtil.isNull(systemConfig) || StrUtil.isBlank(systemConfig.getValue())) { + asyncBlank(name); return ""; } - //去数据库查找，然后写入redis - return data.toString(); + async(systemConfig); + return systemConfig.getValue(); + } + + private SystemConfig getByName(String name) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.select(SystemConfig::getId, SystemConfig::getName, SystemConfig::getValue); + lqw.eq(SystemConfig::getStatus, false); + lqw.eq(SystemConfig::getName, name); + lqw.orderByDesc(SystemConfig::getId); + lqw.last(" limit 1"); + return dao.selectOne(lqw); } /** - * 把数据同步到redis, 此方法适用于redis为空的时候进行一次批量输入 + * 初始化时加载config_list缓存 */ - private void setRedisByVoList() { - //检测redis是否为空 - Long size = redisUtil.getHashSize(redisKey); - if (size > 0 || !crmebConfig.isAsyncConfig()) { + @PostConstruct + public void loadingConfigCache() { + if (!crmebConfig.isAsyncConfig()) { return; } + if (redisUtil.exists(Constants.CONFIG_LIST)) { + Long hashSize = redisUtil.getHashSize(Constants.CONFIG_LIST); + if (hashSize > 0) { + return; + } + } + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.select(SystemConfig::getName, SystemConfig::getValue); + lqw.eq(SystemConfig::getStatus, false); + List systemConfigList = dao.selectList(lqw); + systemConfigList.forEach(config -> redisUtil.hset(Constants.CONFIG_LIST, config.getName(), config.getValue())); - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(SystemConfig::getStatus, false); - List systemConfigList = dao.selectList(lambdaQueryWrapper); - async(systemConfigList); + } + + + /** + * 获取移动端域名 + * @return 移动端域名 + */ + @Override + public String getFrontDomain() { + return getValueByKey(SysConfigConstants.CONFIG_KEY_SITE_URL); + } + + /** + * 获取素材域名 + * + * @return 素材域名 + */ + @Override + public String getMediaDomain() { + return systemAttachmentService.getCdnUrl(); } } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SystemFormTempServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SystemFormTempServiceImpl.java index ee42a120..f4bd9768 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SystemFormTempServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SystemFormTempServiceImpl.java @@ -1,5 +1,6 @@ package com.zbkj.service.service.impl; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -26,7 +27,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相关版权 * +---------------------------------------------------------------------- @@ -88,7 +89,7 @@ public class SystemFormTempServiceImpl extends ServiceImpl childList = findAllChildListByPid(id); if (CollUtil.isEmpty(childList)) { + systemMenu.setUpdateTime(DateUtil.date()); boolean update = updateById(systemMenu); if (update) { redisUtil.delete(CACHE_LIST_KEY); } return update; } - childList.forEach(e -> e.setIsDelte(true)); + childList.forEach(e -> e.setIsDelte(true).setUpdateTime(DateUtil.date())); childList.add(systemMenu); boolean updateBatch = updateBatchById(childList); if (updateBatch) { @@ -159,14 +162,15 @@ public class SystemMenuServiceImpl extends ServiceImpl { if (!templateMessage.getTempId().equals(request.getTempId())) { templateMessage.setTempId(request.getTempId()); + templateMessage.setUpdateTime(DateUtil.date()); templateMessageService.updateById(templateMessage); } if (!notification.getIsWechat().equals(request.getStatus())) { @@ -217,7 +219,7 @@ public class SystemNotificationServiceImpl extends ServiceImpl { if (!templateMessage.getTempId().equals(request.getTempId())) { templateMessage.setTempId(request.getTempId()); + templateMessage.setUpdateTime(DateUtil.date()); templateMessageService.updateById(templateMessage); } if (!notification.getIsRoutine().equals(request.getStatus())) { @@ -237,7 +240,7 @@ public class SystemNotificationServiceImpl extends ServiceImpl { + systemRole.setUpdateTime(DateUtil.date()); updateById(systemRole); systemRoleMenuService.deleteByRid(systemRole.getId()); systemRoleMenuService.saveBatch(roleMenuList, 100); diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SystemStoreServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SystemStoreServiceImpl.java index 864ca4fb..39eda36e 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SystemStoreServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SystemStoreServiceImpl.java @@ -1,18 +1,18 @@ package com.zbkj.service.service.impl; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zbkj.common.request.PageParamRequest; -import com.zbkj.common.constants.Constants; +import com.github.pagehelper.PageHelper; import com.zbkj.common.exception.CrmebException; +import com.zbkj.common.model.system.SystemStore; +import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.StoreNearRequest; import com.zbkj.common.request.SystemStoreRequest; import com.zbkj.common.response.StoreNearResponse; -import com.zbkj.common.vo.SystemStoreNearVo; -import com.github.pagehelper.PageHelper; import com.zbkj.common.utils.CrmebUtil; -import com.zbkj.common.model.system.SystemStore; +import com.zbkj.common.vo.SystemStoreNearVo; import com.zbkj.service.dao.SystemStoreDao; import com.zbkj.service.service.SystemAttachmentService; import com.zbkj.service.service.SystemConfigService; @@ -32,7 +32,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相关版权 * +---------------------------------------------------------------------- @@ -104,6 +104,7 @@ public class SystemStoreServiceImpl extends ServiceImpl */ @Override - public HashMap getCount() { + public HashMap getCount(String keywords) { HashMap map = new HashMap<>(); - map.put("show", getCountByStatus(1));// 显示中 - map.put("hide", getCountByStatus(0));// 隐藏 - map.put("recycle", getCountByStatus(2));// 回收站 + map.put("show", getCountByStatus(1, keywords));// 显示中 + map.put("hide", getCountByStatus(0, keywords));// 隐藏 + map.put("recycle", getCountByStatus(2, keywords));// 回收站 return map; } @@ -138,13 +141,17 @@ public class SystemStoreServiceImpl extends ServiceImpl */ - private Integer getCountByStatus(Integer status) { + private Integer getCountByStatus(Integer status, String keywords) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); if (status == 2) { lambdaQueryWrapper.eq(SystemStore::getIsDel, true); } else { lambdaQueryWrapper.eq(SystemStore::getIsShow, status).eq(SystemStore::getIsDel, false); } + if (!StringUtils.isBlank(keywords)) { + lambdaQueryWrapper.and(i -> i.or().like(SystemStore::getName, keywords) + .or().like(SystemStore::getPhone, keywords)); + } lambdaQueryWrapper.orderByDesc(SystemStore::getUpdateTime).orderByDesc(SystemStore::getId); return dao.selectCount(lambdaQueryWrapper); } @@ -181,13 +188,16 @@ public class SystemStoreServiceImpl extends ServiceImpl storeNearVoArrayList = new ArrayList<>(); if (StringUtils.isNotBlank(request.getLatitude()) && StringUtils.isNotBlank(request.getLongitude())) { + if (!request.getLatitude().matches("^(90(\\.0+)?|([1-8]?\\d)(\\.\\d+)?)$") + || !request.getLongitude().matches("^(180(\\.0+)?|(1[0-7]?\\d|[1-9]?\\d)(\\.\\d+)?)$")) { + throw new CrmebException("经纬度坐标输入有误"); + } storeNearVoArrayList = dao.getNearList(request); } else { List list = getList(null, 1, pageParamRequest); @@ -229,6 +239,7 @@ public class SystemStoreServiceImpl extends ServiceImpl list = CrmebUtil.stringToArrayStr(systemStore.getLatitude()); - systemStore.setLatitude(list.get(0)); - systemStore.setLongitude(list.get(1)); + systemStore.setLongitude(list.get(0)); + systemStore.setLatitude(list.get(1)); } } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SystemStoreStaffServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SystemStoreStaffServiceImpl.java index 36f9ad45..6a9ae98b 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SystemStoreStaffServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SystemStoreStaffServiceImpl.java @@ -1,8 +1,10 @@ package com.zbkj.service.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zbkj.common.page.CommonPage; @@ -36,7 +38,7 @@ import java.util.stream.Collectors; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -54,7 +56,7 @@ public class SystemStoreStaffServiceImpl extends ServiceImpl { + systemUserLevel.setUpdateTime(DateUtil.date()); dao.updateById(systemUserLevel); // 删除对应的用户等级数据 userLevelService.deleteByLevelId(id); @@ -200,6 +202,7 @@ public class SystemUserLevelServiceImpl extends ServiceImpl { + level.setUpdateTime(DateUtil.date()); dao.updateById(level); // 删除对应的用户等级数据 userLevelService.deleteByLevelId(id); @@ -224,9 +227,11 @@ public class SystemUserLevelServiceImpl extends ServiceImpl 0 ? Boolean.TRUE : Boolean.FALSE; } return transactionTemplate.execute(e -> { + level.setUpdateTime(DateUtil.date()); dao.updateById(level); // 删除对应的用户等级数据 userLevelService.deleteByLevelId(request.getId()); diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/TemplateMessageServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/TemplateMessageServiceImpl.java index 57490394..9fc2feba 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/TemplateMessageServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/TemplateMessageServiceImpl.java @@ -1,6 +1,7 @@ package com.zbkj.service.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; @@ -35,7 +36,7 @@ import java.util.stream.Stream; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -181,6 +182,7 @@ public class TemplateMessageServiceImpl extends ServiceImpl { String templateId = wechatNewService.apiAddPublicTemplate(e.getTempKey()); e.setTempId(templateId); + e.setUpdateTime(DateUtil.date()); }); return updateBatchById(templateMessageList); } @@ -231,6 +234,7 @@ public class TemplateMessageServiceImpl extends ServiceImpl kidList = getRoutineKidList(e.getContent(), templateKeyVoList); String priTmplId = wechatNewService.apiAddRoutineTemplate(e.getTempKey(), kidList); e.setTempId(priTmplId); + e.setUpdateTime(DateUtil.date()); }); return updateBatchById(templateMessageList); } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UploadServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UploadServiceImpl.java index c28f528a..a5a1b9f4 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UploadServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UploadServiceImpl.java @@ -1,8 +1,13 @@ package com.zbkj.service.service.impl; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.zbkj.common.constants.Constants; +import com.zbkj.common.constants.SysConfigConstants; +import com.zbkj.common.constants.UploadConstants; import com.zbkj.common.exception.CrmebException; +import com.zbkj.common.result.CommonResultCode; import com.zbkj.common.vo.CloudVo; import com.zbkj.common.vo.FileResultVo; import com.zbkj.common.vo.UploadCommonVo; @@ -15,7 +20,7 @@ import com.qiniu.storage.Region; import com.qiniu.storage.UploadManager; import com.qiniu.util.Auth; import com.zbkj.common.utils.CrmebUtil; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.common.utils.UploadUtil; import com.zbkj.common.model.system.SystemAttachment; import com.zbkj.common.config.CrmebConfig; @@ -38,7 +43,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相关版权 * +---------------------------------------------------------------------- @@ -68,6 +73,9 @@ public class UploadServiceImpl implements UploadService { @Autowired CrmebConfig crmebConfig; + @Autowired + private JdCloudService jdCloudService; + /** * 图片上传 * @param multipartFile 文件 @@ -76,201 +84,15 @@ public class UploadServiceImpl implements UploadService { * @return FileResultVo */ @Override - public FileResultVo imageUpload(MultipartFile multipartFile, String model, Integer pid) throws IOException { - if (null == multipartFile || multipartFile.isEmpty()) { - throw new CrmebException("上传的文件对象不存在..."); + public FileResultVo imageUpload(MultipartFile multipartFile, String model, Integer pid) { + FileResultVo fileResultVo = new FileResultVo(); + try { + fileResultVo = commonUpload(multipartFile, model, pid, UploadConstants.UPLOAD_FILE_KEYWORD); + } catch (IOException e) { + logger.error("图片上传IO异常，{}", e.getMessage()); + throw new CrmebException("图片上传 IO异常"); } - -// String rootPath = (systemConfigService.getValueByKey(Constants.UPLOAD_ROOT_PATH_CONFIG_KEY) + "/").replace(" ", "").replace("//", "/"); - String rootPath = crmebConfig.getImagePath().replace(" ", "").replace("//", "/"); - UploadUtil.setModelPath(model); - String modelPath = "public/" + model + "/"; - String extStr = systemConfigService.getValueByKey(Constants.UPLOAD_IMAGE_EXT_STR_CONFIG_KEY); - int size = Integer.parseInt(systemConfigService.getValueByKey(Constants.UPLOAD_IMAGE_MAX_SIZE_CONFIG_KEY)); - String type = Constants.UPLOAD_TYPE_IMAGE + "/"; - - UploadCommonVo uploadCommonVo = new UploadCommonVo(); - uploadCommonVo.setRootPath(rootPath); - uploadCommonVo.setModelPath(modelPath); - uploadCommonVo.setExtStr(extStr); - uploadCommonVo.setSize(size); - uploadCommonVo.setType(type); - - // 文件名 - String fileName = multipartFile.getOriginalFilename(); - System.out.println("fileName = " + fileName); - // 文件后缀名 - String extName = FilenameUtils.getExtension(fileName); - if (StringUtils.isEmpty(extName)) { - throw new RuntimeException("文件类型未定义不能上传..."); - } - - if (fileName.length() > 99) { - fileName = StrUtil.subPre(fileName, 90).concat(".").concat(extName); - } - - // 文件大小验证 - // 文件分隔符转化为当前系统的格式 - float fileSize = (float)multipartFile.getSize() / 1024 / 1024; - String fs = String.format("%.2f", fileSize); - if( fileSize > uploadCommonVo.getSize()){ - throw new CrmebException("最大允许上传" + uploadCommonVo.getSize() + " MB的文件, 当前文件大小为 " + fs + " MB"); - } - - // 判断文件的后缀名是否符合规则 - if (StringUtils.isNotEmpty(uploadCommonVo.getExtStr())) { - // 切割文件扩展名 - List extensionList = CrmebUtil.stringToArrayStr(uploadCommonVo.getExtStr()); - if (extensionList.size() > 0) { - //判断 - if (!extensionList.contains(extName)) { - throw new CrmebException("上传文件的类型只能是：" + uploadCommonVo.getExtStr()); - } - } else { - throw new CrmebException("上传文件的类型只能是：" + uploadCommonVo.getExtStr()); - } - } - - // 变更文件名 - String newFileName = UploadUtil.fileName(extName); - // 创建目标文件的名称，规则： 子目录/年/月/日.后缀名 - // 文件分隔符转化为当前系统的格式 - // 文件分隔符转化为当前系统的格式 - String webPath = uploadCommonVo.getType() + uploadCommonVo.getModelPath() + DateUtil.nowDate(Constants.DATE_FORMAT_DATE).replace("-", "/") + "/"; - String destPath = FilenameUtils.separatorsToSystem(uploadCommonVo.getRootPath() + webPath) + newFileName; - // 创建文件 - File file = UploadUtil.createFile(destPath); - - // 拼装返回的数据 - FileResultVo resultFile = new FileResultVo(); - resultFile.setFileSize(multipartFile.getSize()); - resultFile.setFileName(fileName); - resultFile.setExtName(extName); -// resultFile.setServerPath(destPath); - resultFile.setUrl(webPath + newFileName); - resultFile.setType(multipartFile.getContentType()); - - //图片上传类型 1本地 2七牛云 3OSS 4COS, 默认本地 - String uploadType = systemConfigService.getValueByKeyException("uploadType"); - Integer uploadTypeInt = Integer.parseInt(uploadType); - String pre; - CloudVo cloudVo = new CloudVo(); - - resultFile.setType(resultFile.getType().replace("image/", "")); - SystemAttachment systemAttachment = new SystemAttachment(); - systemAttachment.setName(resultFile.getFileName()); -// systemAttachment.setAttDir(resultFile.getUrl()); - systemAttachment.setSattDir(resultFile.getUrl()); - systemAttachment.setAttSize(resultFile.getFileSize().toString()); - systemAttachment.setAttType(resultFile.getType()); - systemAttachment.setImageType(1); //图片上传类型 1本地 2七牛云 3OSS 4COS, 默认本地 -// systemAttachment.setAttDir(resultFile.getServerPath()); // 服务器上存储的绝对地址， 上传到云的时候使用 - systemAttachment.setPid(pid); - - if (uploadTypeInt.equals(1)) { - // 保存文件 - multipartFile.transferTo(file); - systemAttachmentService.save(systemAttachment); - return resultFile; - } - // 判断是否保存本地 - String fileIsSave = systemConfigService.getValueByKeyException("file_is_save"); - multipartFile.transferTo(file); - switch (uploadTypeInt) { - case 1: - // 保存文件 -// multipartFile.transferTo(file); - break; - case 2: - systemAttachment.setImageType(2); - pre = "qn"; - cloudVo.setDomain(systemConfigService.getValueByKeyException(pre+"UploadUrl")); - cloudVo.setAccessKey(systemConfigService.getValueByKeyException(pre+"AccessKey")); - cloudVo.setSecretKey(systemConfigService.getValueByKeyException(pre+"SecretKey")); - cloudVo.setBucketName(systemConfigService.getValueByKeyException(pre+"StorageName")); - cloudVo.setRegion(systemConfigService.getValueByKeyException(pre+"StorageRegion")); - - try{ - // 构造一个带指定Zone对象的配置类, 默认华东 - Configuration cfg = new Configuration(Region.huadong()); - if("huabei".equals(cloudVo.getRegion())){ - cfg = new Configuration(Region.huabei()); - } - if("huanan".equals(cloudVo.getRegion())){ - cfg = new Configuration(Region.huanan()); - } - if("beimei".equals(cloudVo.getRegion())){ - cfg = new Configuration(Region.beimei()); - } - if("dongnanya".equals(cloudVo.getRegion())){ - cfg = new Configuration(Region.xinjiapo()); - } - - // 其他参数参考类注释 - UploadManager uploadManager = new UploadManager(cfg); - // 生成上传凭证，然后准备上传 - Auth auth = Auth.create(cloudVo.getAccessKey(), cloudVo.getSecretKey()); - String upToken = auth.uploadToken(cloudVo.getBucketName()); - - String webPathQn = crmebConfig.getImagePath(); - logger.info("AsyncServiceImpl.qCloud.id " + systemAttachment.getAttId()); -// qiNiuService.uploadFile(uploadManager, cloudVo, upToken, -// systemAttachment.getSattDir(), webPathQn + "/" + systemAttachment.getSattDir(), systemAttachment.getAttId()); //异步处理 - qiNiuService.uploadFile(uploadManager, cloudVo, upToken, - systemAttachment.getSattDir(), webPathQn + "/" + systemAttachment.getSattDir(), file); //异步处理 - }catch (Exception e){ - logger.error("AsyncServiceImpl.qCloud.fail " + e.getMessage()); - } - break; - case 3: - systemAttachment.setImageType(3); - pre = "al"; - cloudVo.setDomain(systemConfigService.getValueByKeyException(pre+"UploadUrl")); - cloudVo.setAccessKey(systemConfigService.getValueByKeyException(pre+"AccessKey")); - cloudVo.setSecretKey(systemConfigService.getValueByKeyException(pre+"SecretKey")); - cloudVo.setBucketName(systemConfigService.getValueByKeyException(pre+"StorageName")); - cloudVo.setRegion(systemConfigService.getValueByKeyException(pre+"StorageRegion")); - try{ - String webPathAl = crmebConfig.getImagePath(); - logger.info("AsyncServiceImpl.oss.id " + systemAttachment.getAttId()); - ossService.upload(cloudVo, systemAttachment.getSattDir(), webPathAl + "/" + systemAttachment.getSattDir(), - file); - }catch (Exception e){ - logger.error("AsyncServiceImpl.oss fail " + e.getMessage()); - } - break; - case 4: - systemAttachment.setImageType(4); - pre = "tx"; - cloudVo.setDomain(systemConfigService.getValueByKeyException(pre+"UploadUrl")); - cloudVo.setAccessKey(systemConfigService.getValueByKeyException(pre+"AccessKey")); - cloudVo.setSecretKey(systemConfigService.getValueByKeyException(pre+"SecretKey")); - cloudVo.setBucketName(systemConfigService.getValueByKeyException(pre+"StorageName")); - cloudVo.setRegion(systemConfigService.getValueByKeyException(pre+"StorageRegion")); - // 1 初始化用户身份信息(secretId, secretKey) - COSCredentials cred = new BasicCOSCredentials(cloudVo.getAccessKey(), cloudVo.getSecretKey()); - // 2 设置bucket的区域, COS地域的简称请参照 https://cloud.tencent.com/document/product/436/6224 - ClientConfig clientConfig = new ClientConfig(new com.qcloud.cos.region.Region(cloudVo.getRegion())); - // 3 生成 cos 客户端。 - COSClient cosClient = new COSClient(cred, clientConfig); - - try{ - String webPathTx = crmebConfig.getImagePath(); - logger.info("AsyncServiceImpl.cos.id " + systemAttachment.getAttId()); - cosService.uploadFile(cloudVo, systemAttachment.getSattDir(), webPathTx + "/" + systemAttachment.getSattDir(), systemAttachment.getAttId(), cosClient); - }catch (Exception e){ - logger.error("AsyncServiceImpl.cos.fail " + e.getMessage()); - }finally { - cosClient.shutdown(); - } - break; - } - systemAttachmentService.save(systemAttachment); - if (!"1".equals(fileIsSave)) { - // 删除本地文件 - file.delete(); - } - return resultFile; + return fileResultVo; } /** @@ -283,68 +105,94 @@ public class UploadServiceImpl implements UploadService { */ @Override public FileResultVo fileUpload(MultipartFile multipartFile, String model, Integer pid) throws IOException { - String rootPath = (crmebConfig.getImagePath() + "/").replace(" ", "").replace("//", "/"); - UploadUtil.setModelPath(model); - String modelPath = "public/" + model + "/"; - String extStr = systemConfigService.getValueByKey(Constants.UPLOAD_FILE_EXT_STR_CONFIG_KEY); - int size = Integer.parseInt(systemConfigService.getValueByKey(Constants.UPLOAD_FILE_MAX_SIZE_CONFIG_KEY)); - String type = Constants.UPLOAD_TYPE_FILE + "/"; - - UploadCommonVo uploadCommonVo = new UploadCommonVo(); - uploadCommonVo.setRootPath(rootPath); - uploadCommonVo.setModelPath(modelPath); - uploadCommonVo.setExtStr(extStr); - uploadCommonVo.setSize(size); - uploadCommonVo.setType(type); - - if (null == multipartFile || multipartFile.isEmpty()) { - throw new CrmebException("上传的文件对象不存在..."); + FileResultVo fileResultVo = new FileResultVo(); + try { + fileResultVo = commonUpload(multipartFile, model, pid, UploadConstants.UPLOAD_FILE_KEYWORD); + } catch (IOException e) { + logger.error("文件上传IO异常，{}", e.getMessage()); + throw new CrmebException("文件上传 IO异常"); } - // 文件名 - String fileName = multipartFile.getOriginalFilename(); - System.out.println("fileName = " + fileName); + return fileResultVo; + } + + /** + * 上传校验 + * + * @param fileName 文件名称 + * @param fileSize 文件大小 + * @return 后缀名 + */ + private String uploadValidate(String fileName, float fileSize, String fileType, String contentType) { // 文件后缀名 - String extName = FilenameUtils.getExtension(fileName); - if (StringUtils.isEmpty(extName)) { - throw new RuntimeException("文件类型未定义不能上传..."); + String extName = FilenameUtils.getExtension(fileName).toLowerCase(); + if (StrUtil.isEmpty(extName)) { + if (StrUtil.isNotBlank(contentType)) { + extName = contentType.split("/")[1]; + } else { + throw new CrmebException(CommonResultCode.VALIDATE_FAILED, "文件类型未定义，无法上传..."); + } } + String extStr = systemConfigService.getValueByKey(fileType.equals(UploadConstants.UPLOAD_AFTER_FILE_KEYWORD) ? SysConfigConstants.UPLOAD_FILE_EXT_STR_CONFIG_KEY : SysConfigConstants.UPLOAD_IMAGE_EXT_STR_CONFIG_KEY); + // 判断文件的后缀名是否符合规则 + if (StrUtil.isNotBlank(extStr)) { + // 切割文件扩展名 + List extensionList = CrmebUtil.stringToArrayStr(extStr); + if (CollUtil.isNotEmpty(extensionList)) { + //判断 + if (!extensionList.contains(extName)) { + throw new CrmebException(CommonResultCode.VALIDATE_FAILED, "上载文件类型只能为：" + extStr); + } + } else { + throw new CrmebException(CommonResultCode.VALIDATE_FAILED, "上载文件类型只能为：" + extStr); + } + } + // 文件大小验证 + int size = Integer.parseInt(systemConfigService.getValueByKey(fileType.equals(UploadConstants.UPLOAD_AFTER_FILE_KEYWORD) ? SysConfigConstants.UPLOAD_FILE_MAX_SIZE_CONFIG_KEY : SysConfigConstants.UPLOAD_IMAGE_MAX_SIZE_CONFIG_KEY)); + String fs = String.format("%.2f", fileSize); + if (fileSize > size) { + throw new CrmebException(CommonResultCode.VALIDATE_FAILED, StrUtil.format("最大允许上传 {} MB文件，当前文件大小为 {} MB", size, fs)); + } + return extName; + } + + + /** + * 公共上传 + * + * @param multipartFile 文件 + * @param model 模块 用户user,商品product,微信wechat,文章article,系统system + * @param pid 分类ID 0编辑器,1商品图片,2拼团图片,3砍价图片,4秒杀图片,5文章图片,6组合数据图,7前台用户,8微信系列 + * @param fileType 文件类型 + * @return FileResultVo + * @throws IOException IOE异常 + */ + private FileResultVo commonUpload(MultipartFile multipartFile, String model, Integer pid, String fileType) throws IOException { + if (ObjectUtil.isNull(multipartFile) || multipartFile.isEmpty()) { + throw new CrmebException(CommonResultCode.VALIDATE_FAILED, "上载的文件对象不存在..."); + } + // 校验 + String fileName = multipartFile.getOriginalFilename(); + float fileSize = (float) multipartFile.getSize() / 1024 / 1024; + // 文件后缀名 + String extName = uploadValidate(fileName, fileSize, fileType, multipartFile.getContentType()); if (fileName.length() > 99) { fileName = StrUtil.subPre(fileName, 90).concat(".").concat(extName); } - //文件大小验证 - // 文件分隔符转化为当前系统的格式 - float fileSize = (float)multipartFile.getSize() / 1024 / 1024; - String fs = String.format("%.2f", fileSize); - if( fileSize > uploadCommonVo.getSize()){ - throw new CrmebException("最大允许上传" + uploadCommonVo.getSize() + " MB的文件, 当前文件大小为 " + fs + " MB"); - } + // 服务器存储地址 + String rootPath = crmebConfig.getImagePath().trim(); + // 模块 + String modelPath = "public/" + model + "/"; + // 类型 + String type = (fileType.equals(UploadConstants.UPLOAD_FILE_KEYWORD) ? UploadConstants.UPLOAD_FILE_KEYWORD : UploadConstants.UPLOAD_AFTER_FILE_KEYWORD) + "/"; - // 判断文件的后缀名是否符合规则 -// isContains(extName); - if (StringUtils.isNotEmpty(uploadCommonVo.getExtStr())) { - // 切割文件扩展名 - List extensionList = CrmebUtil.stringToArrayStr(uploadCommonVo.getExtStr()); - - if (extensionList.size() > 0) { - //判断 - if (!extensionList.contains(extName)) { - throw new CrmebException("上传文件的类型只能是：" + uploadCommonVo.getExtStr()); - } - } else { - throw new CrmebException("上传文件的类型只能是：" + uploadCommonVo.getExtStr()); - } - } - - //文件名 + // 变更文件名 String newFileName = UploadUtil.fileName(extName); - // 创建目标文件的名称，规则请看destPath方法 - //规则： 子目录/年/月/日.后缀名 + // 创建目标文件的名称，规则： 子目录/年/月/日.后缀名 + String webPath = type + modelPath + CrmebDateUtil.nowDate("yyyy/MM/dd") + "/"; // 文件分隔符转化为当前系统的格式 - // 文件分隔符转化为当前系统的格式 - String webPath = uploadCommonVo.getType() + uploadCommonVo.getModelPath() + DateUtil.nowDate(Constants.DATE_FORMAT_DATE).replace("-", "/") + "/"; - String destPath = FilenameUtils.separatorsToSystem(uploadCommonVo.getRootPath() + webPath) + newFileName; + String destPath = FilenameUtils.separatorsToSystem(rootPath + webPath) + newFileName; // 创建文件 File file = UploadUtil.createFile(destPath); @@ -353,66 +201,58 @@ public class UploadServiceImpl implements UploadService { resultFile.setFileSize(multipartFile.getSize()); resultFile.setFileName(fileName); resultFile.setExtName(extName); -// resultFile.setServerPath(destPath); resultFile.setUrl(webPath + newFileName); resultFile.setType(multipartFile.getContentType()); + if (fileType.equals(UploadConstants.UPLOAD_FILE_KEYWORD)) { + resultFile.setType(resultFile.getType().replace("image/", "")); + } else { + resultFile.setType(resultFile.getType().replace("file/", "")); + } - //图片上传类型 1本地 2七牛云 3OSS 4COS, 默认本地 - String uploadType = systemConfigService.getValueByKeyException("uploadType"); - Integer uploadTypeInt = Integer.parseInt(uploadType); - String pre; - CloudVo cloudVo = new CloudVo(); - - resultFile.setType(resultFile.getType().replace("file/", "")); SystemAttachment systemAttachment = new SystemAttachment(); systemAttachment.setName(resultFile.getFileName()); systemAttachment.setSattDir(resultFile.getUrl()); systemAttachment.setAttSize(resultFile.getFileSize().toString()); systemAttachment.setAttType(resultFile.getType()); - systemAttachment.setImageType(1); //图片上传类型 1本地 2七牛云 3OSS 4COS, 默认本地，任务轮询数据库放入云服务 + systemAttachment.setImageType(1); //图片上传类型 1本地 2七牛云 3OSS 4COS, 默认本地 systemAttachment.setPid(pid); + //图片上传类型 1本地 2七牛云 3OSS 4COS, 默认本地 + String uploadType = systemConfigService.getValueByKeyException(SysConfigConstants.CONFIG_UPLOAD_TYPE); + Integer uploadTypeInt = Integer.parseInt(uploadType); if (uploadTypeInt.equals(1)) { // 保存文件 multipartFile.transferTo(file); systemAttachmentService.save(systemAttachment); return resultFile; } + CloudVo cloudVo = new CloudVo(); // 判断是否保存本地 - String fileIsSave = systemConfigService.getValueByKeyException("file_is_save"); - if ("1".equals(fileIsSave)) { - multipartFile.transferTo(file); - } - + String fileIsSave = systemConfigService.getValueByKeyException(SysConfigConstants.CONFIG_FILE_IS_SAVE); + multipartFile.transferTo(file); switch (uploadTypeInt) { - case 1: - // 保存文件 - multipartFile.transferTo(file); - break; case 2: systemAttachment.setImageType(2); - pre = "qn"; - cloudVo.setDomain(systemConfigService.getValueByKeyException(pre+"UploadUrl")); - cloudVo.setAccessKey(systemConfigService.getValueByKeyException(pre+"AccessKey")); - cloudVo.setSecretKey(systemConfigService.getValueByKeyException(pre+"SecretKey")); - cloudVo.setBucketName(systemConfigService.getValueByKeyException(pre+"StorageName")); - cloudVo.setRegion(systemConfigService.getValueByKeyException(pre+"StorageRegion")); - - try{ + cloudVo.setDomain(systemConfigService.getValueByKeyException(SysConfigConstants.CONFIG_QN_UPLOAD_URL)); + cloudVo.setAccessKey(systemConfigService.getValueByKeyException(SysConfigConstants.CONFIG_QN_ACCESS_KEY)); + cloudVo.setSecretKey(systemConfigService.getValueByKeyException(SysConfigConstants.CONFIG_QN_SECRET_KEY)); + cloudVo.setBucketName(systemConfigService.getValueByKeyException(SysConfigConstants.CONFIG_QN_STORAGE_NAME)); + cloudVo.setRegion(systemConfigService.getValueByKeyException(SysConfigConstants.CONFIG_QN_STORAGE_REGION)); + try { // 构造一个带指定Zone对象的配置类, 默认华东 - Configuration cfg = new Configuration(Region.huadong()); - if("huabei".equals(cloudVo.getRegion())){ - cfg = new Configuration(Region.huabei()); - } - if("huanan".equals(cloudVo.getRegion())){ - cfg = new Configuration(Region.huanan()); - } - if("beimei".equals(cloudVo.getRegion())){ - cfg = new Configuration(Region.beimei()); - } - if("dongnanya".equals(cloudVo.getRegion())){ - cfg = new Configuration(Region.xinjiapo()); - } + Configuration cfg = new Configuration(Region.autoRegion()); +// if (cloudVo.getRegion().equals("huabei")) { +// cfg = new Configuration(Region.huabei()); +// } +// if (cloudVo.getRegion().equals("huanan")) { +// cfg = new Configuration(Region.huanan()); +// } +// if (cloudVo.getRegion().equals("beimei")) { +// cfg = new Configuration(Region.beimei()); +// } +// if (cloudVo.getRegion().equals("dongnanya")) { +// cfg = new Configuration(Region.xinjiapo()); +// } // 其他参数参考类注释 UploadManager uploadManager = new UploadManager(cfg); @@ -421,57 +261,65 @@ public class UploadServiceImpl implements UploadService { String upToken = auth.uploadToken(cloudVo.getBucketName()); String webPathQn = crmebConfig.getImagePath(); - logger.info("AsyncServiceImpl.qCloud.id " + systemAttachment.getAttId()); - qiNiuService.uploadFile(uploadManager, cloudVo, upToken, - systemAttachment.getSattDir(), webPathQn + "/" + systemAttachment.getSattDir(), file); - }catch (Exception e){ + qiNiuService.uploadFile(uploadManager, upToken, + systemAttachment.getSattDir(), webPathQn + "/" + systemAttachment.getSattDir(), file); //异步处理 + } catch (Exception e) { logger.error("AsyncServiceImpl.qCloud.fail " + e.getMessage()); } break; case 3: systemAttachment.setImageType(3); - pre = "al"; - cloudVo.setDomain(systemConfigService.getValueByKeyException(pre+"UploadUrl")); - cloudVo.setAccessKey(systemConfigService.getValueByKeyException(pre+"AccessKey")); - cloudVo.setSecretKey(systemConfigService.getValueByKeyException(pre+"SecretKey")); - cloudVo.setBucketName(systemConfigService.getValueByKeyException(pre+"StorageName")); - cloudVo.setRegion(systemConfigService.getValueByKeyException(pre+"StorageRegion")); - try{ + cloudVo.setDomain(systemConfigService.getValueByKeyException(SysConfigConstants.CONFIG_AL_UPLOAD_URL)); + cloudVo.setAccessKey(systemConfigService.getValueByKeyException(SysConfigConstants.CONFIG_AL_ACCESS_KEY)); + cloudVo.setSecretKey(systemConfigService.getValueByKeyException(SysConfigConstants.CONFIG_AL_SECRET_KEY)); + cloudVo.setBucketName(systemConfigService.getValueByKeyException(SysConfigConstants.CONFIG_AL_STORAGE_NAME)); + cloudVo.setRegion(systemConfigService.getValueByKeyException(SysConfigConstants.CONFIG_AL_STORAGE_REGION)); + try { String webPathAl = crmebConfig.getImagePath(); - logger.info("AsyncServiceImpl.oss.id " + systemAttachment.getAttId()); - ossService.upload(cloudVo, systemAttachment.getSattDir(), webPathAl + "/" + systemAttachment.getSattDir(), + ossService.upload(cloudVo, systemAttachment.getSattDir(), webPathAl + "/" + systemAttachment.getSattDir(), file); - }catch (Exception e){ + } catch (Exception e) { logger.error("AsyncServiceImpl.oss fail " + e.getMessage()); } break; case 4: systemAttachment.setImageType(4); - pre = "tx"; - cloudVo.setDomain(systemConfigService.getValueByKeyException(pre+"UploadUrl")); - cloudVo.setAccessKey(systemConfigService.getValueByKeyException(pre+"AccessKey")); - cloudVo.setSecretKey(systemConfigService.getValueByKeyException(pre+"SecretKey")); - cloudVo.setBucketName(systemConfigService.getValueByKeyException(pre+"StorageName")); - cloudVo.setRegion(systemConfigService.getValueByKeyException(pre+"StorageRegion")); + cloudVo.setDomain(systemConfigService.getValueByKeyException(SysConfigConstants.CONFIG_TX_UPLOAD_URL)); + cloudVo.setAccessKey(systemConfigService.getValueByKeyException(SysConfigConstants.CONFIG_TX_ACCESS_KEY)); + cloudVo.setSecretKey(systemConfigService.getValueByKeyException(SysConfigConstants.CONFIG_TX_SECRET_KEY)); + cloudVo.setBucketName(systemConfigService.getValueByKeyException(SysConfigConstants.CONFIG_TX_STORAGE_NAME)); + cloudVo.setRegion(systemConfigService.getValueByKeyException(SysConfigConstants.CONFIG_TX_STORAGE_REGION)); // 1 初始化用户身份信息(secretId, secretKey) COSCredentials cred = new BasicCOSCredentials(cloudVo.getAccessKey(), cloudVo.getSecretKey()); // 2 设置bucket的区域, COS地域的简称请参照 https://cloud.tencent.com/document/product/436/6224 ClientConfig clientConfig = new ClientConfig(new com.qcloud.cos.region.Region(cloudVo.getRegion())); // 3 生成 cos 客户端。 COSClient cosClient = new COSClient(cred, clientConfig); - - try{ + try { String webPathTx = crmebConfig.getImagePath(); - logger.info("AsyncServiceImpl.cos.id " + systemAttachment.getAttId()); - cosService.uploadFile(cloudVo, systemAttachment.getSattDir(), webPathTx + "/" + systemAttachment.getSattDir(), file, cosClient); - }catch (Exception e){ + cosService.uploadFile(cloudVo, systemAttachment.getSattDir(), webPathTx + "/" + systemAttachment.getSattDir(), systemAttachment.getAttId(), cosClient); + } catch (Exception e) { logger.error("AsyncServiceImpl.cos.fail " + e.getMessage()); - }finally { + } finally { cosClient.shutdown(); } break; + case 5: // 京东云存储 + systemAttachment.setImageType(5); + String bucket = systemConfigService.getValueByKeyException(SysConfigConstants.CONFIG_JD_BUCKET_NAME); + try { + String webPathTx = crmebConfig.getImagePath(); + jdCloudService.uploadFile(systemAttachment.getSattDir(), webPathTx + "/" + systemAttachment.getSattDir(), bucket); + } catch (Exception e) { + logger.error("AsyncServiceImpl.cos.fail " + e.getMessage()); + } + break; } systemAttachmentService.save(systemAttachment); + if (!fileIsSave.equals("1")) { + // 删除本地文件 + file.delete(); + } return resultFile; } } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserAddressServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserAddressServiceImpl.java index d0fd61d9..abda99cb 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserAddressServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserAddressServiceImpl.java @@ -1,20 +1,21 @@ package com.zbkj.service.service.impl; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zbkj.common.request.PageParamRequest; -import com.zbkj.common.exception.CrmebException; -import com.zbkj.common.request.UserAddressRequest; import com.github.pagehelper.PageHelper; +import com.zbkj.common.exception.CrmebException; import com.zbkj.common.model.system.SystemCity; import com.zbkj.common.model.user.UserAddress; +import com.zbkj.common.request.PageParamRequest; +import com.zbkj.common.request.UserAddressRequest; import com.zbkj.service.dao.UserAddressDao; import com.zbkj.service.service.SystemCityService; import com.zbkj.service.service.UserAddressService; import com.zbkj.service.service.UserService; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -27,7 +28,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相关版权 * +---------------------------------------------------------------------- @@ -47,9 +48,10 @@ public class UserAddressServiceImpl extends ServiceImpl - */ + * 列表 + * + * @return List + */ @Override public List getList(PageParamRequest pageParamRequest) { Integer UserId = userService.getUserIdException(); @@ -66,6 +68,7 @@ public class UserAddressServiceImpl extends ServiceImpl */ @@ -79,17 +82,20 @@ public class UserAddressServiceImpl extends ServiceImpl 0 && StringUtils.isNotBlank(request.getAddress().getCity())) { + if (request.getAddress().getCityId() > 0 && StrUtil.isNotBlank(request.getAddress().getDistrict())) { checkCity(userAddress.getCityId()); } userAddress.setUid(userService.getUserIdException()); @@ -103,6 +109,7 @@ public class UserAddressServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(UserAddress::getIsDefault, true); lambdaQueryWrapper.eq(UserAddress::getUid, userService.getUserId()); + lambdaQueryWrapper.eq(UserAddress::getIsDel, false); return dao.selectOne(lambdaQueryWrapper); } @@ -155,6 +166,7 @@ public class UserAddressServiceImpl extends ServiceImpl impl if (request.getSort() == null) { queryWrapper.orderByDesc("create_time"); }else{ - if ("asc".equals(request.getSort())) { + if (request.getSort().equals("asc")) { queryWrapper.orderByAsc("number"); }else{ queryWrapper.orderByDesc("number"); @@ -101,9 +101,9 @@ public class UserBillServiceImpl extends ServiceImpl impl //时间范围 if (StringUtils.isNotBlank(request.getDateLimit())) { - dateLimitUtilVo dateLimit = DateUtil.getDateLimit(request.getDateLimit()); + DateLimitUtilVo dateLimit = CrmebDateUtil.getDateLimit(request.getDateLimit()); //判断时间 - int compareDateResult = DateUtil.compareDate(dateLimit.getEndTime(), dateLimit.getStartTime(), Constants.DATE_FORMAT); + int compareDateResult = CrmebDateUtil.compareDate(dateLimit.getEndTime(), dateLimit.getStartTime(), Constants.DATE_FORMAT); if (compareDateResult == -1) { throw new CrmebException("开始时间不能大于结束时间！"); } @@ -123,7 +123,7 @@ public class UserBillServiceImpl extends ServiceImpl impl //关联id if (StringUtils.isNotBlank(request.getLinkId())) { - if ("gt".equals(request.getLinkId())) { + if (request.getLinkId().equals("gt")) { queryWrapper.ne("link_id", 0); }else{ queryWrapper.eq("link_id", request.getLinkId()); @@ -172,7 +172,7 @@ public class UserBillServiceImpl extends ServiceImpl impl queryWrapper.eq("type", type); } if (null != date) { - dateLimitUtilVo dateLimit = DateUtil.getDateLimit(date); + DateLimitUtilVo dateLimit = CrmebDateUtil.getDateLimit(date); queryWrapper.between("create_time", dateLimit.getStartTime(), dateLimit.getEndTime()); } List userBills = dao.selectList(queryWrapper); @@ -216,7 +216,7 @@ public class UserBillServiceImpl extends ServiceImpl impl } //时间范围 if (StrUtil.isNotBlank(request.getDateLimit())) { - dateLimitUtilVo dateLimit = DateUtil.getDateLimit(request.getDateLimit()); + DateLimitUtilVo dateLimit = CrmebDateUtil.getDateLimit(request.getDateLimit()); map.put("startTime", dateLimit.getStartTime()); map.put("endTime", dateLimit.getEndTime()); } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserBrokerageRecordServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserBrokerageRecordServiceImpl.java index 1c03bb1d..0dd1ce23 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserBrokerageRecordServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserBrokerageRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.zbkj.service.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -15,12 +16,12 @@ import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.zbkj.common.utils.ArrayUtil; -import com.zbkj.common.utils.DateUtil; -import com.zbkj.common.vo.dateLimitUtilVo; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.common.request.BrokerageRecordRequest; import com.zbkj.common.request.RetailShopStairUserRequest; import com.zbkj.common.model.user.User; import com.zbkj.common.model.user.UserBrokerageRecord; +import com.zbkj.common.vo.DateLimitUtilVo; import com.zbkj.service.dao.UserBrokerageRecordDao; import com.zbkj.service.service.UserBrokerageRecordService; import com.zbkj.service.service.UserService; @@ -41,7 +42,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -115,6 +116,7 @@ public class UserBrokerageRecordServiceImpl extends ServiceImpl { + record.setUpdateTime(DateUtil.date()); updateById(record); userService.operationBrokerage(record.getUid(), record.getPrice(), user.getBrokeragePrice(), "add"); return Boolean.TRUE; @@ -136,7 +138,7 @@ public class UserBrokerageRecordServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); lqw.select(UserBrokerageRecord::getPrice); lqw.eq(UserBrokerageRecord::getUid, uid); - dateLimitUtilVo dateLimit = DateUtil.getDateLimit(Constants.SEARCH_DATE_YESTERDAY); + DateLimitUtilVo dateLimit = CrmebDateUtil.getDateLimit(Constants.SEARCH_DATE_YESTERDAY); lqw.between(UserBrokerageRecord::getUpdateTime, dateLimit.getStartTime(), dateLimit.getEndTime()); lqw.eq(UserBrokerageRecord::getType, 1); lqw.eq(UserBrokerageRecord::getLinkType, "order"); @@ -169,7 +171,7 @@ public class UserBrokerageRecordServiceImpl extends ServiceImpl responseList = CollUtil.newArrayList(); for (UserBrokerageRecord record : list) { - String month = DateUtil.dateToStr(record.getUpdateTime(), Constants.DATE_FORMAT_MONTH); + String month = CrmebDateUtil.dateToStr(record.getUpdateTime(), Constants.DATE_FORMAT_MONTH); responseList.add(new SpreadCommissionDetailResponse(month, getListByUidAndMonth(uid, month))); } return CommonPage.copyPageInfo(recordPage, responseList); @@ -230,7 +232,7 @@ public class UserBrokerageRecordServiceImpl extends ServiceImpl { - map.put(DateUtil.dateToStr(record.getUpdateTime(), Constants.DATE_FORMAT_MONTH), record.getUid()); + map.put(CrmebDateUtil.dateToStr(record.getUpdateTime(), Constants.DATE_FORMAT_MONTH), record.getUid()); }); return map; } @@ -275,7 +277,7 @@ public class UserBrokerageRecordServiceImpl extends ServiceImpl list = dao.selectList(lqw); @@ -334,7 +336,7 @@ public class UserBrokerageRecordServiceImpl extends ServiceImpl list = dao.selectList(lqw); diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserExperienceRecordServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserExperienceRecordServiceImpl.java index 50fc471e..fe94ea4a 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserExperienceRecordServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserExperienceRecordServiceImpl.java @@ -19,7 +19,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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserExtractServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserExtractServiceImpl.java index 69deb4e6..81d57ccf 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserExtractServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserExtractServiceImpl.java @@ -2,30 +2,31 @@ package com.zbkj.service.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zbkj.common.page.CommonPage; -import com.zbkj.common.request.PageParamRequest; -import com.zbkj.common.constants.BrokerageRecordConstants; -import com.zbkj.common.constants.Constants; -import com.zbkj.common.exception.CrmebException; -import com.zbkj.common.response.UserExtractRecordResponse; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.zbkj.common.utils.DateUtil; -import com.zbkj.common.vo.dateLimitUtilVo; +import com.zbkj.common.constants.BrokerageRecordConstants; +import com.zbkj.common.constants.Constants; +import com.zbkj.common.exception.CrmebException; import com.zbkj.common.model.finance.UserExtract; +import com.zbkj.common.model.user.User; +import com.zbkj.common.model.user.UserBrokerageRecord; +import com.zbkj.common.page.CommonPage; +import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.UserExtractRequest; import com.zbkj.common.request.UserExtractSearchRequest; import com.zbkj.common.response.BalanceResponse; +import com.zbkj.common.response.UserExtractRecordResponse; import com.zbkj.common.response.UserExtractResponse; -import com.zbkj.common.model.user.User; -import com.zbkj.common.model.user.UserBrokerageRecord; +import com.zbkj.common.utils.CrmebDateUtil; +import com.zbkj.common.vo.DateLimitUtilVo; import com.zbkj.service.dao.UserExtractDao; import com.zbkj.service.service.*; import org.apache.commons.lang3.StringUtils; @@ -45,17 +46,17 @@ import java.util.stream.Collectors; import static java.math.BigDecimal.ZERO; /** -* UserExtractServiceImpl 接口实现 -* +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: CRMEB Team - * +---------------------------------------------------------------------- -*/ + * UserExtractServiceImpl 接口实现 + * +---------------------------------------------------------------------- + * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] + * +---------------------------------------------------------------------- + * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved. + * +---------------------------------------------------------------------- + * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 + * +---------------------------------------------------------------------- + * | Author: CRMEB Team + * +---------------------------------------------------------------------- + */ @Service public class UserExtractServiceImpl extends ServiceImpl implements UserExtractService { @@ -79,13 +80,14 @@ public class UserExtractServiceImpl extends ServiceImpl - */ + * 列表 + * + * @param request 请求参数 + * @param pageParamRequest 分页类参数 + * @return List + * @author Mr.Zhang + * @since 2020-05-11 + */ @Override public List getList(UserExtractSearchRequest request, PageParamRequest pageParamRequest) { PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit()); @@ -95,11 +97,11 @@ public class UserExtractServiceImpl extends ServiceImpl i. or().like(UserExtract::getWechat, request.getKeywords()). //微信号 - or().like(UserExtract::getRealName, request.getKeywords()). //名称 - or().like(UserExtract::getBankCode, request.getKeywords()). //银行卡 - or().like(UserExtract::getBankAddress, request.getKeywords()). //开户行 - or().like(UserExtract::getAlipayCode, request.getKeywords()). //支付宝 - or().like(UserExtract::getFailMsg, request.getKeywords()) //失败原因 + or().like(UserExtract::getRealName, request.getKeywords()). //名称 + or().like(UserExtract::getBankCode, request.getKeywords()). //银行卡 + or().like(UserExtract::getBankAddress, request.getKeywords()). //开户行 + or().like(UserExtract::getAlipayCode, request.getKeywords()). //支付宝 + or().like(UserExtract::getFailMsg, request.getKeywords()) //失败原因 ); } @@ -115,7 +117,7 @@ public class UserExtractServiceImpl extends ServiceImpl uidList = extractList.stream().map(o -> o.getUid()).distinct().collect(Collectors.toList()); + List uidList = extractList.stream().map(UserExtract::getUid).distinct().collect(Collectors.toList()); HashMap userMap = userService.getMapListInUid(uidList); for (UserExtract userExtract : extractList) { - userExtract.setNickName(Optional.ofNullable(userMap.get(userExtract.getUid()).getNickname()).orElse("")); + User user = userMap.get(userExtract.getUid()); + String nickName = user != null ? Optional.ofNullable(user.getNickname()).orElse("") : ""; + userExtract.setNickName(nickName); } return extractList; } @@ -149,7 +153,7 @@ public class UserExtractServiceImpl extends ServiceImpl lqw = Wrappers.lambdaQuery(); if (null != userId) { - lqw.eq(UserExtract::getUid,userId); + lqw.eq(UserExtract::getUid, userId); } - lqw.eq(UserExtract::getStatus,status); + lqw.eq(UserExtract::getStatus, status); if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) { lqw.between(UserExtract::getCreateTime, startTime, endTime); } @@ -213,6 +220,7 @@ public class UserExtractServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); qw.select("SUM(extract_price) as extract_price,count(id) as id, uid"); qw.ge("status", 1); - qw.eq("uid",userId); + qw.eq("uid", userId); qw.groupBy("uid"); UserExtract ux = dao.selectOne(qw); UserExtractResponse uexr = new UserExtractResponse(); @@ -229,7 +237,7 @@ public class UserExtractServiceImpl extends ServiceImpl { // 返还佣金 userService.operationBrokerage(userExtract.getUid(), userExtract.getExtractPrice(), user.getBrokeragePrice(), "add"); + userExtract.setUpdateTime(DateUtil.date()); updateById(userExtract); userBrokerageRecordService.save(brokerageRecord); return Boolean.TRUE; @@ -300,8 +309,10 @@ public class UserExtractServiceImpl extends ServiceImpl { + userExtract.setUpdateTime(DateUtil.date()); updateById(userExtract); brokerageRecord.setStatus(BrokerageRecordConstants.BROKERAGE_RECORD_STATUS_COMPLETE); + brokerageRecord.setUpdateTime(DateUtil.date()); userBrokerageRecordService.updateById(brokerageRecord); return Boolean.TRUE; }); @@ -311,7 +322,8 @@ public class UserExtractServiceImpl extends ServiceImpl userExtractRecordResponseList = CollectionUtil.newArrayList(); for (UserExtract userExtract : list) { - String date = DateUtil.dateToStr(userExtract.getCreateTime(), Constants.DATE_FORMAT_MONTH); + String date = CrmebDateUtil.dateToStr(userExtract.getCreateTime(), Constants.DATE_FORMAT_MONTH); userExtractRecordResponseList.add(new UserExtractRecordResponse(date, getListByMonth(userId, date))); } @@ -347,6 +359,7 @@ public class UserExtractServiceImpl extends ServiceImpl { // 保存提现记录 @@ -420,7 +434,8 @@ public class UserExtractServiceImpl extends ServiceImpl i */ @Override public Boolean create(UserGroupRequest userGroupRequest) { + if (isExistName(userGroupRequest.getGroupName(), null)) { + throw new CrmebException("分组名称已存在"); + } UserGroup userGroup = new UserGroup(); BeanUtils.copyProperties(userGroupRequest, userGroup); return save(userGroup); } + /** + * 是否存在用户分组 + * @param groupName 分组名称 + * @param id 分组ID + */ + private Boolean isExistName(String groupName, Integer id) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.select(UserGroup::getId); + lqw.eq(UserGroup::getGroupName, groupName); + if (ObjectUtil.isNotNull(id)) { + lqw.ne(UserGroup::getId, id); + } + lqw.last(" limit 1"); + UserGroup userGroup = dao.selectOne(lqw); + return ObjectUtil.isNotNull(userGroup); + } + /** * 修改用户分组 * @param id 分组id @@ -80,6 +102,9 @@ public class UserGroupServiceImpl extends ServiceImpl i */ @Override public Boolean edit(Integer id, UserGroupRequest userGroupRequest) { + if (isExistName(userGroupRequest.getGroupName(), id)) { + throw new CrmebException("分组名称已存在"); + } UserGroup userGroup = new UserGroup(); BeanUtils.copyProperties(userGroupRequest, userGroup); userGroup.setId(id); diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserIntegralRecordServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserIntegralRecordServiceImpl.java index 0e90588e..5068a499 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserIntegralRecordServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserIntegralRecordServiceImpl.java @@ -17,8 +17,8 @@ import com.zbkj.common.response.UserIntegralRecordResponse; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.zbkj.common.utils.DateUtil; -import com.zbkj.common.vo.dateLimitUtilVo; +import com.zbkj.common.utils.CrmebDateUtil; +import com.zbkj.common.vo.DateLimitUtilVo; import com.zbkj.common.model.user.User; import com.zbkj.common.model.user.UserIntegralRecord; import com.zbkj.service.dao.UserIntegralRecordDao; @@ -40,7 +40,7 @@ import java.util.stream.Collectors; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -150,9 +150,9 @@ public class UserIntegralRecordServiceImpl extends ServiceImpl linkTypeList) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.select("sum(integral) as integral"); queryWrapper.eq("uid", uid); queryWrapper.eq("type", type); - if (StrUtil.isNotBlank(linkType)) { - queryWrapper.eq("link_type", linkType); + if (CollUtil.isNotEmpty(linkTypeList)) { + queryWrapper.in("link_type", linkTypeList); } queryWrapper.eq("status", IntegralRecordConstants.INTEGRAL_RECORD_STATUS_COMPLETE); if (StrUtil.isNotBlank(date)) { - dateLimitUtilVo dateLimit = DateUtil.getDateLimit(date); + DateLimitUtilVo dateLimit = CrmebDateUtil.getDateLimit(date); queryWrapper.between("update_time", dateLimit.getStartTime(), dateLimit.getEndTime()); } UserIntegralRecord integralRecord = dao.selectOne(queryWrapper); diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserLevelServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserLevelServiceImpl.java index ef1d03ed..4d8aef8c 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserLevelServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserLevelServiceImpl.java @@ -1,6 +1,7 @@ package com.zbkj.service.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -8,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.constants.Constants; import com.github.pagehelper.PageHelper; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.common.model.system.SystemUserLevel; import com.zbkj.common.model.user.User; import com.zbkj.common.model.user.UserLevel; @@ -30,7 +31,7 @@ import java.util.stream.Collectors; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -112,9 +113,9 @@ public class UserLevelServiceImpl extends ServiceImpl i newLevel.setLevelId(userLevelConfig.getId()); newLevel.setDiscount(userLevelConfig.getDiscount()); - Date date = DateUtil.nowDateTimeReturnDate(Constants.DATE_FORMAT); + Date date = CrmebDateUtil.nowDateTimeReturnDate(Constants.DATE_FORMAT); String mark = Constants.USER_LEVEL_UP_LOG_MARK.replace("【{$userName}】", user.getNickname()). - replace("{$date}", DateUtil.dateToStr(date, Constants.DATE_FORMAT)). + replace("{$date}", CrmebDateUtil.dateToStr(date, Constants.DATE_FORMAT)). replace("{$levelName}", userLevelConfig.getName()); newLevel.setMark(mark); @@ -122,6 +123,7 @@ public class UserLevelServiceImpl extends ServiceImpl i user.setLevel(userLevelConfig.getId()); return transactionTemplate.execute(e -> { save(newLevel); + user.setUpdateTime(DateUtil.date()); userService.updateById(user); return Boolean.TRUE; }); @@ -168,9 +170,9 @@ public class UserLevelServiceImpl extends ServiceImpl i newLevel.setLevelId(userLevelConfig.getId()); newLevel.setDiscount(userLevelConfig.getDiscount()); - Date date = DateUtil.nowDateTimeReturnDate(Constants.DATE_FORMAT); + Date date = CrmebDateUtil.nowDateTimeReturnDate(Constants.DATE_FORMAT); String mark = Constants.USER_LEVEL_OPERATE_LOG_MARK.replace("【{$userName}】", user.getNickname()). - replace("{$date}", DateUtil.dateToStr(date, Constants.DATE_FORMAT)). + replace("{$date}", CrmebDateUtil.dateToStr(date, Constants.DATE_FORMAT)). replace("{$levelName}", userLevelConfig.getName()); newLevel.setMark(mark); @@ -178,6 +180,7 @@ public class UserLevelServiceImpl extends ServiceImpl i user.setLevel(userLevelConfig.getId()); return transactionTemplate.execute(e -> { save(newLevel); + user.setUpdateTime(DateUtil.date()); userService.updateById(user); return Boolean.TRUE; }); diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserRechargeServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserRechargeServiceImpl.java index c830a04b..b71ba54a 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserRechargeServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserRechargeServiceImpl.java @@ -1,12 +1,14 @@ package com.zbkj.service.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateTime; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zbkj.common.constants.PayConstants; import com.zbkj.common.page.CommonPage; import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.constants.Constants; @@ -14,12 +16,12 @@ import com.zbkj.common.exception.CrmebException; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.zbkj.common.utils.DateUtil; -import com.zbkj.common.vo.dateLimitUtilVo; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.common.model.finance.UserRecharge; import com.zbkj.common.request.UserRechargeSearchRequest; import com.zbkj.common.response.UserRechargeResponse; import com.zbkj.common.model.user.User; +import com.zbkj.common.vo.DateLimitUtilVo; import com.zbkj.service.dao.UserRechargeDao; import com.zbkj.service.service.UserRechargeService; import com.zbkj.service.service.UserService; @@ -38,7 +40,7 @@ import java.util.stream.Collectors; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -65,7 +67,7 @@ public class UserRechargeServiceImpl extends ServiceImpl getList(UserRechargeSearchRequest request, PageParamRequest pageParamRequest) { Page userRechargesList = PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit()); - dateLimitUtilVo dateLimit = DateUtil.getDateLimit(request.getDateLimit()); + DateLimitUtilVo dateLimit = CrmebDateUtil.getDateLimit(request.getDateLimit()); //带 UserExtract 类的多条件查询 LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); if (ObjectUtil.isNotNull(request.getUid()) && request.getUid() > 0) { @@ -80,7 +82,7 @@ public class UserRechargeServiceImpl extends ServiceImpl wrapper = Wrappers.query(); - wrapper.select("id"); + //wrapper.select("id"); + wrapper.select(" ANY_VALUE(id) AS id "); wrapper.eq("paid", 1); wrapper.groupBy("uid"); List list = dao.selectList(wrapper); @@ -216,7 +219,8 @@ public class UserRechargeServiceImpl extends ServiceImpl wrapper = Wrappers.query(); - wrapper.select("id"); + //wrapper.select("id"); + wrapper.select(" ANY_VALUE(id) AS id "); wrapper.eq("paid", 1); wrapper.apply("date_format(create_time, '%Y-%m-%d') = {0}", date); wrapper.groupBy("uid"); @@ -236,7 +240,8 @@ public class UserRechargeServiceImpl extends ServiceImpl wrapper = Wrappers.query(); - wrapper.select("id"); + //wrapper.select("id"); + wrapper.select(" ANY_VALUE(id) AS id "); wrapper.eq("paid", 1); wrapper.apply("date_format(create_time, '%Y-%m-%d') between {0} and {1}", startDate, endDate); wrapper.groupBy("uid"); @@ -246,5 +251,32 @@ public class UserRechargeServiceImpl extends ServiceImpl findAwaitUploadWechatList() { + DateTime date = cn.hutool.core.date.DateUtil.date(); + DateTime offsetMinute = cn.hutool.core.date.DateUtil.offsetMinute(date, -10); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(UserRecharge::getPaid, 1); + lqw.eq(UserRecharge::getIsWechatShipping, 0); + lqw.eq(UserRecharge::getRechargeType, PayConstants.PAY_CHANNEL_WE_CHAT_PROGRAM); + lqw.le(UserRecharge::getPayTime, offsetMinute); + return dao.selectList(lqw); + } + + /** + * 获取订单 + * @param outTradeNo 商户系统内部的订单号 + */ + @Override + public UserRecharge getByOutTradeNo(String outTradeNo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(UserRecharge::getOutTradeNo, outTradeNo); + lqw.last(" limit 1"); + return dao.selectOne(lqw); + } } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserServiceImpl.java index 86854146..8f2e7ce4 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserServiceImpl.java @@ -1,6 +1,7 @@ package com.zbkj.service.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ReUtil; import cn.hutool.core.util.StrUtil; @@ -25,11 +26,8 @@ import com.zbkj.common.page.CommonPage; import com.zbkj.common.request.*; import com.zbkj.common.response.*; import com.zbkj.common.token.FrontTokenComponent; -import com.zbkj.common.utils.CommonUtil; -import com.zbkj.common.utils.CrmebUtil; -import com.zbkj.common.utils.DateUtil; -import com.zbkj.common.utils.RedisUtil; -import com.zbkj.common.vo.dateLimitUtilVo; +import com.zbkj.common.utils.*; +import com.zbkj.common.vo.DateLimitUtilVo; import com.zbkj.service.dao.UserDao; import com.zbkj.service.service.*; import org.apache.commons.codec.digest.DigestUtils; @@ -51,7 +49,7 @@ import java.util.stream.Collectors; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -123,6 +121,13 @@ public class UserServiceImpl extends ServiceImpl implements UserS @Autowired private SystemAttachmentService systemAttachmentService; + @Autowired + private SCRMUtils scrmUtils; + + @Autowired + private CrmebUtil crmebUtil; + + /** * 分页显示用户表 * @@ -139,8 +144,9 @@ public class UserServiceImpl extends ServiceImpl implements UserS map.put("isPromoter", request.getIsPromoter() ? 1 : 0); } - if (!StringUtils.isBlank(request.getGroupId())) { - map.put("groupId", request.getGroupId()); + if (StrUtil.isNotBlank(request.getGroupId())) { + List groupIdList = CrmebUtil.stringToArray(request.getGroupId()); + map.put("groupIdList", groupIdList); } if (!StringUtils.isBlank(request.getLabelId())) { @@ -148,8 +154,9 @@ public class UserServiceImpl extends ServiceImpl implements UserS map.put("tagIdSql", tagIdSql); } - if (!StringUtils.isBlank(request.getLevel())) { - map.put("level", request.getLevel()); + if (StrUtil.isNotBlank(request.getLevel())) { + List levelList = CrmebUtil.stringToArray(request.getLevel()); + map.put("levelList", levelList); } if (StringUtils.isNotBlank(request.getUserType())) { @@ -179,7 +186,7 @@ public class UserServiceImpl extends ServiceImpl implements UserS map.put("status", request.getStatus() ? 1 : 0); } - dateLimitUtilVo dateLimit = DateUtil.getDateLimit(request.getDateLimit()); + DateLimitUtilVo dateLimit = CrmebDateUtil.getDateLimit(request.getDateLimit()); if (!StringUtils.isBlank(dateLimit.getStartTime())) { map.put("startTime", dateLimit.getStartTime()); @@ -212,7 +219,7 @@ public class UserServiceImpl extends ServiceImpl implements UserS } else { userResponse.setSpreadNickname(userDao.selectById(user.getSpreadUid()).getNickname()); } - userResponse.setPhone(CrmebUtil.maskMobile(userResponse.getPhone())); + userResponse.setPhone(crmebUtil.maskMobile(userResponse.getPhone())); userResponses.add(userResponse); } return CommonPage.copyPageInfo(pageUser, userResponses); @@ -227,7 +234,7 @@ public class UserServiceImpl extends ServiceImpl implements UserS throw new CrmebException("至少输入一个金额"); } if (request.getMoneyValue().compareTo(BigDecimal.ZERO) < 1 && request.getIntegralValue() <= 0) { - throw new CrmebException("修改值不能等小于等于0"); + throw new CrmebException("修改值不能小于等于0"); } User user = getById(request.getUid()); @@ -268,7 +275,7 @@ public class UserServiceImpl extends ServiceImpl implements UserS userBill.setCategory(Constants.USER_BILL_CATEGORY_MONEY); userBill.setNumber(request.getMoneyValue()); userBill.setStatus(1); - userBill.setCreateTime(DateUtil.nowDateTime()); + userBill.setCreateTime(CrmebDateUtil.nowDateTime()); if (request.getMoneyType() == 1) {// 增加 userBill.setPm(1); @@ -294,7 +301,7 @@ public class UserServiceImpl extends ServiceImpl implements UserS // 生成记录 UserIntegralRecord integralRecord = new UserIntegralRecord(); integralRecord.setUid(user.getUid()); - integralRecord.setLinkType(IntegralRecordConstants.INTEGRAL_RECORD_LINK_TYPE_SIGN); + integralRecord.setLinkType(IntegralRecordConstants.INTEGRAL_RECORD_LINK_TYPE_SYSTEM); integralRecord.setTitle(IntegralRecordConstants.BROKERAGE_RECORD_TITLE_SYSTEM); integralRecord.setIntegral(request.getIntegralValue()); integralRecord.setStatus(IntegralRecordConstants.INTEGRAL_RECORD_STATUS_COMPLETE); @@ -365,6 +372,7 @@ public class UserServiceImpl extends ServiceImpl implements UserS } for (User user : list) { user.setGroupId(groupIdValue); + user.setUpdateTime(DateUtil.date()); } return updateBatchById(list); } @@ -480,7 +488,7 @@ public class UserServiceImpl extends ServiceImpl implements UserS QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.select("count(uid) as uid", "left(create_time, 10) as create_time"); if (StringUtils.isNotBlank(date)) { - dateLimitUtilVo dateLimit = DateUtil.getDateLimit(date); + DateLimitUtilVo dateLimit = CrmebDateUtil.getDateLimit(date); queryWrapper.between("create_time", dateLimit.getStartTime(), dateLimit.getEndTime()); } queryWrapper.groupBy("left(create_time, 10)").orderByAsc("create_time"); @@ -490,7 +498,7 @@ public class UserServiceImpl extends ServiceImpl implements UserS } for (User user : list) { - map.put(DateUtil.dateToStr(user.getCreateTime(), Constants.DATE_FORMAT_DATE), user.getUid()); + map.put(CrmebDateUtil.dateToStr(user.getCreateTime(), Constants.DATE_FORMAT_DATE), user.getUid()); } return map; } @@ -536,6 +544,7 @@ public class UserServiceImpl extends ServiceImpl implements UserS User bindUser = getInfoException(); bindUser.setAccount(request.getPhone()); bindUser.setPhone(request.getPhone()); + bindUser.setUpdateTime(DateUtil.date()); return updateById(bindUser); } @@ -583,6 +592,7 @@ public class UserServiceImpl extends ServiceImpl implements UserS visitRecord.setUid(getUserId()); visitRecord.setVisitType(4); userVisitRecordService.save(visitRecord); + return userCenterResponse; } @@ -629,6 +639,7 @@ public class UserServiceImpl extends ServiceImpl implements UserS User user = new User(); user.setUid(userId); user.setSignNum(0); + user.setUpdateTime(DateUtil.date()); updateById(user); } @@ -653,6 +664,7 @@ public class UserServiceImpl extends ServiceImpl implements UserS } for (User user : list) { user.setTagId(tagIdValue); + user.setUpdateTime(DateUtil.date()); } return updateBatchById(list); } @@ -686,7 +698,7 @@ public class UserServiceImpl extends ServiceImpl implements UserS PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit()); Map map = new HashMap<>(); - map.put("userIdList", userIdList.stream().map(String::valueOf).distinct().collect(Collectors.joining(","))); + map.put("userIdList", userIdList.stream().distinct().collect(Collectors.toList())); if (StringUtils.isNotBlank(keywords)) { map.put("keywords", "%" + keywords + "%"); } @@ -743,7 +755,7 @@ public class UserServiceImpl extends ServiceImpl implements UserS user.setUserType(Constants.USER_LOGIN_TYPE_H5); user.setNickname(CommonUtil.createNickName(phone)); user.setAvatar(systemConfigService.getValueByKey(Constants.USER_DEFAULT_AVATAR_CONFIG_KEY)); - Date nowDate = DateUtil.nowDateTime(); + Date nowDate = CrmebDateUtil.nowDateTime(); user.setCreateTime(nowDate); user.setLastLoginTime(nowDate); @@ -762,9 +774,9 @@ public class UserServiceImpl extends ServiceImpl implements UserS couponList.forEach(storeCoupon -> { //是否有固定的使用时间 if (!storeCoupon.getIsFixedTime()) { - String endTime = DateUtil.addDay(DateUtil.nowDate(Constants.DATE_FORMAT), storeCoupon.getDay(), Constants.DATE_FORMAT); - storeCoupon.setUseEndTime(DateUtil.strToDate(endTime, Constants.DATE_FORMAT)); - storeCoupon.setUseStartTime(DateUtil.nowDateTimeReturnDate(Constants.DATE_FORMAT)); + String endTime = CrmebDateUtil.addDay(CrmebDateUtil.nowDate(Constants.DATE_FORMAT), storeCoupon.getDay(), Constants.DATE_FORMAT); + storeCoupon.setUseEndTime(CrmebDateUtil.strToDate(endTime, Constants.DATE_FORMAT)); + storeCoupon.setUseStartTime(CrmebDateUtil.nowDateTimeReturnDate(Constants.DATE_FORMAT)); } StoreCouponUser storeCouponUser = new StoreCouponUser(); @@ -800,6 +812,11 @@ public class UserServiceImpl extends ServiceImpl implements UserS if (!execute) { throw new CrmebException("创建用户失败!"); } + try { + scrmUtils.addUserForSCRM(user.getPhone(), user.getNickname()); + } catch (Exception e) { + logger.error("SCRM用户同步失败: phone={}, nickname={}", user.getPhone(), user.getNickname(), e); + } return user; } @@ -910,7 +927,7 @@ public class UserServiceImpl extends ServiceImpl implements UserS .or().like(User::getPhone, keywords)); //手机号码 } if (StrUtil.isNotBlank(dateLimit)) { - dateLimitUtilVo dateLimitUtilVo = DateUtil.getDateLimit(dateLimit); + DateLimitUtilVo dateLimitUtilVo = CrmebDateUtil.getDateLimit(dateLimit); lqw.between(User::getPromoterTime, dateLimitUtilVo.getStartTime(), dateLimitUtilVo.getEndTime()); } lqw.orderByDesc(User::getUid); @@ -1062,25 +1079,29 @@ public class UserServiceImpl extends ServiceImpl implements UserS @Override public User registerByThird(RegisterThirdUserRequest thirdUserRequest) { User user = new User(); - user.setAccount(DigestUtils.md5Hex(CrmebUtil.getUuid() + DateUtil.getNowTime())); + user.setAccount(DigestUtils.md5Hex(CrmebUtil.getUuid() + CrmebDateUtil.getNowTime())); user.setUserType(thirdUserRequest.getType()); user.setNickname(thirdUserRequest.getNickName()); - String avatar = null; + String avatar = ""; switch (thirdUserRequest.getType()) { case Constants.USER_LOGIN_TYPE_PUBLIC: - avatar = thirdUserRequest.getHeadimgurl(); + avatar = StrUtil.isBlank(thirdUserRequest.getHeadimgurl()) ? "" : thirdUserRequest.getHeadimgurl(); break; case Constants.USER_LOGIN_TYPE_PROGRAM: case Constants.USER_LOGIN_TYPE_H5: case Constants.USER_LOGIN_TYPE_IOS_WX: case Constants.USER_LOGIN_TYPE_ANDROID_WX: - avatar = thirdUserRequest.getAvatar(); + avatar = StrUtil.isBlank(thirdUserRequest.getAvatar()) ? "" : thirdUserRequest.getAvatar(); break; } user.setAvatar(avatar); - user.setSpreadTime(DateUtil.nowDateTime()); - user.setSex(Integer.parseInt(thirdUserRequest.getSex())); - user.setAddres(thirdUserRequest.getCountry() + "," + thirdUserRequest.getProvince() + "," + thirdUserRequest.getCity()); + user.setSpreadTime(CrmebDateUtil.nowDateTime()); + // 因微信原因，无法再获取用户的隐私信息 + // 预设用户性别为0-未知，地址为空字符串 +// user.setSex(Integer.parseInt(thirdUserRequest.getSex())); +// user.setAddres(thirdUserRequest.getCountry() + "," + thirdUserRequest.getProvince() + "," + thirdUserRequest.getCity()); + user.setSex(0); + user.setAddres(""); return user; } @@ -1183,52 +1204,6 @@ public class UserServiceImpl extends ServiceImpl implements UserS return CommonPage.copyPageInfo(recordPageInfo, responseList); } -// /** -// * 根据推广级别和其他参数获取推广列表 -// * -// * @param request 推广层级和推广时间参数 -// * @return 推广订单列表 -// */ -// @Override -// public PageInfo getOrderListBySpreadLevel(RetailShopStairUserRequest request, PageParamRequest pageParamRequest) { -// // 获取推广人列表 -// if (ObjectUtil.isNull(request.getType())) { -// request.setType(0); -// } -// List userList = getSpreadListBySpreadIdAndType(request.getUid(), request.getType()); -// if (CollUtil.isEmpty(userList)) { -// return new PageInfo<>(); -// } -// -// List userIds = userList.stream().map(User::getUid).distinct().collect(Collectors.toList()); -// // 获取推广人订单号集合 -// List orderList = storeOrderService.getOrderListStrByUids(userIds, request); -// if (CollUtil.isEmpty(orderList)) { -// return new PageInfo<>(); -// } -// List orderNoList = CollUtil.newArrayList(); -// Map orderMap = CollUtil.newHashMap(); -// orderList.forEach(e -> { -// orderNoList.add(e.getOrderId()); -// orderMap.put(e.getOrderId(), e); -// }); -// // 获取用户佣金记录 -// PageInfo recordPageInfo = userBrokerageRecordService.findListByLinkIdsAndLinkTypeAndUid(orderNoList, BrokerageRecordConstants.BROKERAGE_RECORD_LINK_TYPE_ORDER, request.getUid(), pageParamRequest); -// List responseList = recordPageInfo.getList().stream().map(e -> { -// SpreadOrderResponse response = new SpreadOrderResponse(); -// StoreOrder storeOrder = orderMap.get(e.getLinkId()); -// response.setId(storeOrder.getId()); -// response.setOrderId(storeOrder.getOrderId()); -// response.setRealName(storeOrder.getRealName()); -// response.setUserPhone(storeOrder.getUserPhone()); -// response.setPrice(e.getPrice()); -// response.setUpdateTime(e.getUpdateTime()); -// return response; -// }).collect(Collectors.toList()); -// -// return CommonPage.copyPageInfo(recordPageInfo, responseList); -// } - /** * 获取推广人列表 * @@ -1281,6 +1256,7 @@ public class UserServiceImpl extends ServiceImpl implements UserS user.setSpreadUid(0); user.setSpreadTime(null); Boolean execute = transactionTemplate.execute(e -> { + user.setUpdateTime(DateUtil.date()); userDao.updateById(user); if (teamUser.getSpreadUid() > 0) { updateSpreadCountByUid(teamUser.getSpreadUid(), "sub"); @@ -1305,7 +1281,7 @@ public class UserServiceImpl extends ServiceImpl implements UserS .gt("spread_uid", 0) .eq("status", true); if (StrUtil.isNotBlank(type)) { - dateLimitUtilVo dateLimit = DateUtil.getDateLimit(type); + DateLimitUtilVo dateLimit = CrmebDateUtil.getDateLimit(type); queryWrapper.between("spread_time", dateLimit.getStartTime(), dateLimit.getEndTime()); } queryWrapper.groupBy("spread_uid").orderByDesc("spread_count"); @@ -1379,9 +1355,10 @@ public class UserServiceImpl extends ServiceImpl implements UserS if (!checkBingSpread) return false; user.setSpreadUid(spreadUid); - user.setSpreadTime(DateUtil.nowDateTime()); + user.setSpreadTime(CrmebDateUtil.nowDateTime()); Boolean execute = transactionTemplate.execute(e -> { + user.setUpdateTime(DateUtil.date()); updateById(user); updateSpreadCountByUid(spreadUid, "add"); return Boolean.TRUE; @@ -1426,8 +1403,9 @@ public class UserServiceImpl extends ServiceImpl implements UserS User tempUser = new User(); tempUser.setUid(userId); tempUser.setSpreadUid(spreadUid); - tempUser.setSpreadTime(DateUtil.nowDateTime()); + tempUser.setSpreadTime(CrmebDateUtil.nowDateTime()); Boolean execute = transactionTemplate.execute(e -> { + tempUser.setUpdateTime(DateUtil.date()); updateById(tempUser); updateSpreadCountByUid(spreadUid, "add"); if (oldSprUid > 0) { @@ -1487,6 +1465,7 @@ public class UserServiceImpl extends ServiceImpl implements UserS if (!tempUser.getIsPromoter() && user.getIsPromoter()) { user.setPromoterTime(cn.hutool.core.date.DateUtil.date()); } + user.setUpdateTime(DateUtil.date()); return updateById(user); } @@ -1512,7 +1491,7 @@ public class UserServiceImpl extends ServiceImpl implements UserS public Boolean updateUserPhone(Integer id, String phone) { boolean matchPhone = ReUtil.isMatch(RegularConstants.PHONE_TWO, phone); if (!matchPhone) { - throw new CrmebException("手机号格式错误，请输入正确得手机号"); + throw new CrmebException("手机号格式错误，请输入正确的手机号"); } User user = getById(id); if (ObjectUtil.isNull(user)) { @@ -1532,6 +1511,7 @@ public class UserServiceImpl extends ServiceImpl implements UserS newUser.setUid(id); newUser.setPhone(phone); newUser.setAccount(phone); + newUser.setUpdateTime(DateUtil.date()); return userDao.updateById(newUser) > 0; } @@ -1606,9 +1586,9 @@ public class UserServiceImpl extends ServiceImpl implements UserS newLevel.setLevelId(systemUserLevel.getId()); newLevel.setGrade(systemUserLevel.getGrade()); newLevel.setStatus(true); - newLevel.setMark(StrUtil.format("尊敬的用户 {},在{}管理员调整会员等级成为{}", user.getNickname(), DateUtil.nowDateTimeStr(), systemUserLevel.getName())); + newLevel.setMark(StrUtil.format("尊敬的用户 {},在{}管理员调整会员等级成为{}", user.getNickname(), CrmebDateUtil.nowDateTimeStr(), systemUserLevel.getName())); newLevel.setDiscount(systemUserLevel.getDiscount()); - newLevel.setCreateTime(DateUtil.nowDateTime()); + newLevel.setCreateTime(CrmebDateUtil.nowDateTime()); return transactionTemplate.execute(e -> { updateLevel(user.getUid(), request.getLevelId()); userLevelService.save(newLevel); @@ -1623,9 +1603,9 @@ public class UserServiceImpl extends ServiceImpl implements UserS newLevel.setLevelId(systemUserLevel.getId()); newLevel.setGrade(systemUserLevel.getGrade()); newLevel.setStatus(true); - newLevel.setMark(StrUtil.format("尊敬的用户 {},在{}管理员调整会员等级成为{},不扣除经验", user.getNickname(), DateUtil.nowDateTimeStr(), systemUserLevel.getName())); + newLevel.setMark(StrUtil.format("尊敬的用户 {},在{}管理员调整会员等级成为{},不扣除经验", user.getNickname(), CrmebDateUtil.nowDateTimeStr(), systemUserLevel.getName())); newLevel.setDiscount(systemUserLevel.getDiscount()); - newLevel.setCreateTime(DateUtil.nowDateTime()); + newLevel.setCreateTime(CrmebDateUtil.nowDateTime()); return transactionTemplate.execute(e -> { updateLevel(user.getUid(), request.getLevelId()); userLevelService.save(newLevel); @@ -1653,10 +1633,11 @@ public class UserServiceImpl extends ServiceImpl implements UserS newLevel.setLevelId(systemUserLevel.getId()); newLevel.setGrade(systemUserLevel.getGrade()); newLevel.setStatus(true); - newLevel.setMark(StrUtil.format("尊敬的用户 {},在{}管理员调整会员等级成为{},扣除经验{}", user.getNickname(), DateUtil.nowDateTimeStr(), systemUserLevel.getName(), deductionExp)); + newLevel.setMark(StrUtil.format("尊敬的用户 {},在{}管理员调整会员等级成为{},扣除经验{}", user.getNickname(), CrmebDateUtil.nowDateTimeStr(), systemUserLevel.getName(), deductionExp)); newLevel.setDiscount(systemUserLevel.getDiscount()); - newLevel.setCreateTime(DateUtil.nowDateTime()); + newLevel.setCreateTime(CrmebDateUtil.nowDateTime()); return transactionTemplate.execute(e -> { + user.setUpdateTime(DateUtil.date()); updateById(user); userLevelService.save(newLevel); experienceRecordService.save(experienceRecord); @@ -1732,6 +1713,7 @@ public class UserServiceImpl extends ServiceImpl implements UserS User user = getInfo(); user.setAvatar(systemAttachmentService.clearPrefix(request.getAvatar())); user.setNickname(request.getNickname()); + user.setUpdateTime(DateUtil.date()); return updateById(user); } @@ -1748,6 +1730,17 @@ public class UserServiceImpl extends ServiceImpl implements UserS return user; } + /** + * 批量清除用户推广人 + * @param spreadUid 推广人id + */ + private Boolean batchRemoveSpreadUid(Integer spreadUid) { + LambdaUpdateWrapper wrapper = Wrappers.lambdaUpdate(); + wrapper.set(User::getSpreadUid, 0); + wrapper.eq(User::getSpreadUid, spreadUid); + return update(wrapper); + } + /** * 根据日期获取注册用户数量 * @param date 日期 diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserSignServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserSignServiceImpl.java index 238e8073..45fb90be 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserSignServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserSignServiceImpl.java @@ -1,6 +1,7 @@ package com.zbkj.service.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -20,7 +21,7 @@ import com.zbkj.common.response.UserSignInfoResponse; import com.zbkj.common.vo.UserSignMonthVo; import com.zbkj.common.vo.UserSignVo; import com.github.pagehelper.PageHelper; -import com.zbkj.common.utils.DateUtil; +import com.zbkj.common.utils.CrmebDateUtil; import com.zbkj.common.vo.SystemGroupDataSignConfigVo; import com.zbkj.service.dao.UserSignDao; import com.zbkj.service.service.*; @@ -39,7 +40,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相关版权 * +---------------------------------------------------------------------- @@ -109,14 +110,14 @@ public class UserSignServiceImpl extends ServiceImpl impl user.setSignNum(0); } else { // 判断是否重复签到 - String lastDate = DateUtil.dateToStr(lastUserSign.getCreateDay(), Constants.DATE_FORMAT_DATE); - String nowDate = DateUtil.nowDate(Constants.DATE_FORMAT_DATE); + String lastDate = CrmebDateUtil.dateToStr(lastUserSign.getCreateDay(), Constants.DATE_FORMAT_DATE); + String nowDate = CrmebDateUtil.nowDate(Constants.DATE_FORMAT_DATE); //对比今天数据 - if (DateUtil.compareDate(lastDate, nowDate, Constants.DATE_FORMAT_DATE) == 0) { + if (CrmebDateUtil.compareDate(lastDate, nowDate, Constants.DATE_FORMAT_DATE) == 0) { throw new CrmebException("今日已签到。不可重复签到"); } - String nextDate = DateUtil.addDay(lastUserSign.getCreateDay(), 1, Constants.DATE_FORMAT_DATE); - int compareDate = DateUtil.compareDate(nextDate, nowDate, Constants.DATE_FORMAT_DATE); + String nextDate = CrmebDateUtil.addDay(lastUserSign.getCreateDay(), 1, Constants.DATE_FORMAT_DATE); + int compareDate = CrmebDateUtil.compareDate(nextDate, nowDate, Constants.DATE_FORMAT_DATE); if (compareDate != 0) { //不相等，所以不是连续签到,重置签到次数 user.setSignNum(0); @@ -153,7 +154,7 @@ public class UserSignServiceImpl extends ServiceImpl impl userSign.setNumber(configVo.getIntegral()); userSign.setType(Constants.SIGN_TYPE_INTEGRAL); userSign.setBalance(user.getIntegral() + configVo.getIntegral()); - userSign.setCreateDay(DateUtil.strToDate(DateUtil.nowDate(Constants.DATE_FORMAT_DATE), Constants.DATE_FORMAT_DATE)); + userSign.setCreateDay(CrmebDateUtil.strToDate(CrmebDateUtil.nowDate(Constants.DATE_FORMAT_DATE), Constants.DATE_FORMAT_DATE)); // 生成用户积分记录 UserIntegralRecord integralRecord = new UserIntegralRecord(); @@ -190,6 +191,7 @@ public class UserSignServiceImpl extends ServiceImpl impl //更新用户经验信息 userExperienceRecordService.save(experienceRecord); //更新用户 签到天数、积分、经验 + user.setUpdateTime(DateUtil.date()); userService.updateById(user); // 用户升级 userLevelService.upLevel(user); @@ -254,7 +256,7 @@ public class UserSignServiceImpl extends ServiceImpl impl } for (UserSign userSign : userSignList) { - String date = DateUtil.dateToStr(userSign.getCreateDay(), Constants.DATE_FORMAT_MONTH); + String date = CrmebDateUtil.dateToStr(userSign.getCreateDay(), Constants.DATE_FORMAT_MONTH); UserSignVo userSignVo = new UserSignVo(userSign.getTitle(), userSign.getNumber(), userSign.getCreateDay()); boolean findResult = false; if (signMonthVoArrayList.size() > 0) { @@ -323,7 +325,7 @@ public class UserSignServiceImpl extends ServiceImpl impl * @since 2020-05-29 */ private Boolean checkDaySign(Integer userId) { - List userSignList = getInfoByDay(userId, DateUtil.nowDate(Constants.DATE_FORMAT_DATE)); + List userSignList = getInfoByDay(userId, CrmebDateUtil.nowDate(Constants.DATE_FORMAT_DATE)); return userSignList.size() != 0; } @@ -336,8 +338,8 @@ public class UserSignServiceImpl extends ServiceImpl impl * @since 2020-05-29 */ private Boolean checkYesterdaySign(Integer userId) { - String day = DateUtil.nowDate(Constants.DATE_FORMAT_DATE); - String yesterday = DateUtil.addDay(day, -1, Constants.DATE_FORMAT_DATE); + String day = CrmebDateUtil.nowDate(Constants.DATE_FORMAT_DATE); + String yesterday = CrmebDateUtil.addDay(day, -1, Constants.DATE_FORMAT_DATE); List userSignList = getInfoByDay(userId, yesterday); return userSignList.size() != 0; } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserTagServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserTagServiceImpl.java index 2c674771..fcfbd577 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserTagServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserTagServiceImpl.java @@ -1,12 +1,14 @@ package com.zbkj.service.service.impl; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; +import com.zbkj.common.exception.CrmebException; +import com.zbkj.common.model.user.UserTag; import com.zbkj.common.request.PageParamRequest; import com.zbkj.common.request.UserTagRequest; -import com.github.pagehelper.PageHelper; import com.zbkj.common.utils.CrmebUtil; -import com.zbkj.common.model.user.UserTag; import com.zbkj.service.dao.UserTagDao; import com.zbkj.service.service.UserService; import com.zbkj.service.service.UserTagService; @@ -23,7 +25,7 @@ import java.util.stream.Collectors; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -73,11 +75,31 @@ public class UserTagServiceImpl extends ServiceImpl impleme */ @Override public Boolean create(UserTagRequest userTagRequest) { + if (isExistName(userTagRequest.getName(), null)) { + throw new CrmebException("标签名称已存在"); + } UserTag userTag = new UserTag(); BeanUtils.copyProperties(userTagRequest, userTag); return save(userTag); } + /** + * 是否存在用户标签 + * @param tagName 标签名称 + * @param id 标签ID + */ + private Boolean isExistName(String tagName, Integer id) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.select(UserTag::getId); + lqw.eq(UserTag::getName, tagName); + if (ObjectUtil.isNotNull(id)) { + lqw.ne(UserTag::getId, id); + } + lqw.last(" limit 1"); + UserTag userTag = dao.selectOne(lqw); + return ObjectUtil.isNotNull(userTag); + } + /** * 删除用户标签 * @param id 标签id @@ -86,7 +108,7 @@ public class UserTagServiceImpl extends ServiceImpl impleme public Boolean delete(Integer id) { boolean remove = removeById(id); if (remove) { - userService.clearGroupByGroupId(id+""); + userService.clearGroupByGroupId(id.toString()); } return remove; } @@ -98,6 +120,9 @@ public class UserTagServiceImpl extends ServiceImpl impleme */ @Override public Boolean updateTag(Integer id, UserTagRequest userTagRequest) { + if (isExistName(userTagRequest.getName(), id)) { + throw new CrmebException("标签名称已存在"); + } UserTag userTag = new UserTag(); BeanUtils.copyProperties(userTagRequest, userTag); userTag.setId(id); diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserTokenServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserTokenServiceImpl.java index 6b2d03e6..716055be 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserTokenServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserTokenServiceImpl.java @@ -1,6 +1,8 @@ package com.zbkj.service.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zbkj.common.model.user.UserToken; import com.zbkj.service.dao.UserTokenDao; @@ -14,7 +16,7 @@ import javax.annotation.Resource; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -62,5 +64,6 @@ public class UserTokenServiceImpl extends ServiceImpl i lambdaQueryWrapper.eq(UserToken::getUid, userId).eq(UserToken::getType, type); return dao.selectOne(lambdaQueryWrapper); } + } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserVisitRecordServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserVisitRecordServiceImpl.java index e32ef39f..9607f689 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserVisitRecordServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserVisitRecordServiceImpl.java @@ -14,7 +14,7 @@ import javax.annotation.Resource; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WeChatPayServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WeChatPayServiceImpl.java index 28692119..121949dd 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WeChatPayServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WeChatPayServiceImpl.java @@ -2,6 +2,7 @@ package com.zbkj.service.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; @@ -36,7 +37,7 @@ import java.util.Map; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -90,6 +91,9 @@ public class WeChatPayServiceImpl implements WeChatPayService { @Autowired private StorePinkService storePinkService; +// @Autowired +// private PayComponentOrderService componentOrderService; + @Autowired private WechatNewService wechatNewService; @@ -108,7 +112,7 @@ public class WeChatPayServiceImpl implements WeChatPayService { } // 切割字符串，判断是支付订单还是充值订单 String pre = StrUtil.subPre(orderNo, 5); - if ("order".equals(pre)) {// 支付订单 + if (pre.equals("order")) {// 支付订单 StoreOrder storeOrder = storeOrderService.getByOderId(orderNo); if (ObjectUtil.isNull(storeOrder)) { throw new CrmebException("订单不存在"); @@ -174,6 +178,12 @@ public class WeChatPayServiceImpl implements WeChatPayService { if (storeOrder.getUseIntegral() > 0) { userService.updateIntegral(user, storeOrder.getUseIntegral(), "sub"); } +// if (storeOrder.getType().equals(1)) { +// PayComponentOrder componentOrder = componentOrderService.getByOrderNo(orderNo); +// componentOrder.setTransactionId(record.getStr("transaction_id")); +// componentOrder.setTimeEnd(record.getStr("time_end")); +// componentOrderService.updateById(componentOrder); +// } // 处理拼团 if (storeOrder.getCombinationId() > 0) { // 判断拼团团长是否存在 @@ -226,6 +236,7 @@ public class WeChatPayServiceImpl implements WeChatPayService { storePinkService.save(storePink); // 如果是开团，需要更新订单数据 storeOrder.setPinkId(storePink.getId()); + storeOrder.setUpdateTime(DateUtil.date()); storeOrderService.updateById(storeOrder); } return Boolean.TRUE; @@ -253,18 +264,18 @@ public class WeChatPayServiceImpl implements WeChatPayService { String appId = ""; String mchId = ""; String signKey = ""; - if ("public".equals(userRecharge.getRechargeType())) {// 公众号 + if (userRecharge.getRechargeType().equals("public")) {// 公众号 appId = systemConfigService.getValueByKeyException(Constants.CONFIG_KEY_PAY_WE_CHAT_APP_ID); mchId = systemConfigService.getValueByKeyException(Constants.CONFIG_KEY_PAY_WE_CHAT_MCH_ID); signKey = systemConfigService.getValueByKeyException(Constants.CONFIG_KEY_PAY_WE_CHAT_APP_KEY); } - if ("routine".equals(userRecharge.getRechargeType())) {// 小程序 + if (userRecharge.getRechargeType().equals("routine")) {// 小程序 appId = systemConfigService.getValueByKeyException(Constants.CONFIG_KEY_PAY_ROUTINE_APP_ID); mchId = systemConfigService.getValueByKeyException(Constants.CONFIG_KEY_PAY_ROUTINE_MCH_ID); signKey = systemConfigService.getValueByKeyException(Constants.CONFIG_KEY_PAY_ROUTINE_APP_KEY); } // 生成查询订单对象 - Map payVo = getWxChantQueryPayVo(orderNo, appId, mchId, signKey); + Map payVo = getWxChantQueryPayVo(userRecharge.getOutTradeNo(), appId, mchId, signKey); // 查询订单信息 MyRecord record = wechatNewService.payOrderQuery(payVo); // 支付成功处理 @@ -338,10 +349,12 @@ public class WeChatPayServiceImpl implements WeChatPayService { Long currentTimestamp = WxPayUtil.getCurrentTimestamp(); map.put("timeStamp", Long.toString(currentTimestamp)); String paySign = WxPayUtil.getSign(map, signKey); + map.put("outTradeNo", unifiedorderVo.getOut_trade_no()); map.put("paySign", paySign); if (userRecharge.getRechargeType().equals(PayConstants.PAY_CHANNEL_WE_CHAT_H5)) { map.put("mweb_url", responseVo.getMWebUrl()); } + return map; } @@ -423,11 +436,11 @@ public class WeChatPayServiceImpl implements WeChatPayService { throw new CrmebException("微信下单失败！"); } CreateOrderResponseVo responseVo = CrmebUtil.mapToObj(map, CreateOrderResponseVo.class); - if ("FAIL".equals(responseVo.getReturnCode().toUpperCase())) { + if (responseVo.getReturnCode().toUpperCase().equals("FAIL")) { throw new CrmebException("微信下单失败1！" + responseVo.getReturnMsg()); } - if ("FAIL".equals(responseVo.getResultCode().toUpperCase())) { + if (responseVo.getResultCode().toUpperCase().equals("FAIL")) { throw new CrmebException("微信下单失败2！" + responseVo.getErrCodeDes()); } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WechatCallbackServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WechatCallbackServiceImpl.java index 3446d5c7..38eb75b0 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WechatCallbackServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WechatCallbackServiceImpl.java @@ -1,14 +1,19 @@ package com.zbkj.service.service.impl; import cn.hutool.core.date.DateUtil; + import com.alibaba.fastjson.JSONObject; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + import com.zbkj.common.model.wechat.WechatCallback; import com.zbkj.service.dao.WechatCallbackDao; -import com.zbkj.service.service.WechatCallbackService; +import com.zbkj.service.service.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.support.TransactionTemplate; import javax.annotation.Resource; @@ -17,7 +22,7 @@ import javax.annotation.Resource; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -32,6 +37,7 @@ public class WechatCallbackServiceImpl extends ServiceImpl wrapper = Wrappers.update(); wrapper.lt("create_time", beforeDate); dao.delete(wrapper); diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WechatNewServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WechatNewServiceImpl.java index 8ca9de8c..6cb6403e 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WechatNewServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WechatNewServiceImpl.java @@ -13,6 +13,7 @@ import com.zbkj.common.constants.WeChatConstants; import com.zbkj.common.exception.CrmebException; import com.zbkj.common.model.wechat.WechatExceptions; import com.zbkj.common.model.wechat.WechatPayInfo; +import com.zbkj.common.request.SaveConfigRequest; import com.zbkj.common.response.WeChatJsSdkConfigResponse; import com.zbkj.common.token.WeChatOauthToken; import com.zbkj.common.utils.CrmebUtil; @@ -43,7 +44,7 @@ import java.util.concurrent.TimeUnit; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -145,7 +146,7 @@ public class WechatNewServiceImpl implements WechatNewService { if (ObjectUtil.isNull(data)) { throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if (data.containsKey("errcode") && !"0".equals(data.getString("errcode"))) { + if (data.containsKey("errcode") && !data.getString("errcode").equals("0")) { if (data.containsKey("errmsg")) { // 保存到微信异常表 wxExceptionDispose(data, "微信获取开放平台access_token异常"); @@ -169,7 +170,7 @@ public class WechatNewServiceImpl implements WechatNewService { if (ObjectUtil.isNull(data)) { throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if (data.containsKey("errcode") && !"0".equals(data.getString("errcode"))) { + if (data.containsKey("errcode") && !data.getString("errcode").equals("0")) { if (data.containsKey("errmsg")) { // 保存到微信异常表 wxExceptionDispose(data, "微信获取开放平台用户信息异常"); @@ -198,7 +199,7 @@ public class WechatNewServiceImpl implements WechatNewService { if (ObjectUtil.isNull(data)) { throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if (data.containsKey("errcode") && !"0".equals(data.getString("errcode"))) { + if (data.containsKey("errcode") && !data.getString("errcode").equals("0")) { if (data.containsKey("errmsg")) { // 保存到微信异常表 wxExceptionDispose(data, "微信小程序登录凭证校验异常"); @@ -261,7 +262,7 @@ public class WechatNewServiceImpl implements WechatNewService { JSONObject data = JSONObject.parseObject(response); // 保存到微信异常表 wxExceptionDispose(data, "微信小程序生成小程序码异常"); - if ("40001".equals(data.getString("errcode"))) { + if (data.getString("errcode").equals("40001")) { redisUtil.delete(WeChatConstants.REDIS_WECAHT_MINI_ACCESS_TOKEN_KEY); miniAccessToken = getMiniAccessToken(); url = StrUtil.format(WeChatConstants.WECHAT_MINI_QRCODE_UNLIMITED_URL, miniAccessToken); @@ -291,6 +292,54 @@ public class WechatNewServiceImpl implements WechatNewService { } } + /** + * 生成小程序码 + * + * @param jsonObject 微信端参数 + * @return 小程序码 + */ + @Override + public String createQrCode(JSONObject jsonObject) { + String miniAccessToken = getMiniAccessToken(); + String url = StrUtil.format(WeChatConstants.WECHAT_MINI_QRCODE_UNLIMITED_URL, miniAccessToken); + logger.info("微信小程序码生成参数:{}", jsonObject); + byte[] bytes = restTemplateUtil.postJsonDataAndReturnBuffer(url, jsonObject); + String response = new String(bytes); + if (StringUtils.contains(response, "errcode")) { + logger.error("微信生成小程序码异常" + response); + JSONObject data = JSONObject.parseObject(response); + // 保存到微信异常表 + wxExceptionDispose(data, "微信小程序生成小程序码异常"); + if (data.getString("errcode").equals("40001")) { + redisUtil.secondDelete(WeChatConstants.REDIS_WECAHT_MINI_ACCESS_TOKEN_KEY); + miniAccessToken = getMiniAccessToken(); + url = StrUtil.format(WeChatConstants.WECHAT_MINI_QRCODE_UNLIMITED_URL, miniAccessToken); + bytes = restTemplateUtil.postJsonDataAndReturnBuffer(url, jsonObject); + response = new String(bytes); + if (StringUtils.contains(response, "errcode")) { + logger.error("微信生成小程序码重试异常" + response); + JSONObject data2 = JSONObject.parseObject(response); + // 保存到微信异常表 + wxExceptionDispose(data2, "微信小程序重试生成小程序码异常"); + } else { + try { + return CrmebUtil.getBase64Image(Base64.encodeBase64String(bytes)); + } catch (Exception e) { + e.printStackTrace(); + throw new CrmebException("微信小程序码转换Base64异常"); + } + } + } + throw new CrmebException("微信生成二维码异常"); + } + try { + return CrmebUtil.getBase64Image(Base64.encodeBase64String(bytes)); + } catch (Exception e) { + e.printStackTrace(); + throw new CrmebException("微信小程序码转换Base64异常"); + } + } + /** * 微信预下单接口(统一下单) * @param unifiedorderVo 预下单请求对象 @@ -310,7 +359,7 @@ public class WechatNewServiceImpl implements WechatNewService { WechatPayInfo wechatPayInfo = createWechatPayInfo(unifiedorderVo); CreateOrderResponseVo responseVo = CrmebUtil.mapToObj(map, CreateOrderResponseVo.class); - if ("FAIL".equals(responseVo.getReturnCode().toUpperCase())) { + if (responseVo.getReturnCode().toUpperCase().equals("FAIL")) { // 保存到微信异常表 wxPayExceptionDispose(map, "微信支付预下单异常"); wechatPayInfo.setErrCode(map.get("return_code").toString()); @@ -318,7 +367,7 @@ public class WechatNewServiceImpl implements WechatNewService { throw new CrmebException("微信下单失败1！" + responseVo.getReturnMsg()); } - if ("FAIL".equals(responseVo.getResultCode().toUpperCase())) { + if (responseVo.getResultCode().toUpperCase().equals("FAIL")) { wxPayExceptionDispose(map, "微信支付预下单业务异常"); wechatPayInfo.setErrCode(map.get("err_code").toString()); wechatPayInfoService.save(wechatPayInfo); @@ -381,16 +430,16 @@ public class WechatNewServiceImpl implements WechatNewService { throw new CrmebException("微信订单查询失败！"); } record.setColums(map); - if ("FAIL".equals(record.getStr("return_code").toUpperCase())) { + if (record.getStr("return_code").toUpperCase().equals("FAIL")) { wxPayQueryExceptionDispose(record, "微信支付查询订单通信异常"); throw new CrmebException("微信订单查询失败1！" + record.getStr("return_msg")); } - if ("FAIL".equals(record.getStr("result_code").toUpperCase())) { + if (record.getStr("result_code").toUpperCase().equals("FAIL")) { wxPayQueryExceptionDispose(record, "微信支付查询订单结果异常"); throw new CrmebException("微信订单查询失败2！" + record.getStr("err_code") + record.getStr("err_code_des")); } - if (!"SUCCESS".equals(record.getStr("trade_state").toUpperCase())) { + if (!record.getStr("trade_state").toUpperCase().equals("SUCCESS")) { wxPayQueryExceptionDispose(record, "微信支付查询订单状态异常"); throw new CrmebException("微信订单支付失败3！" + record.getStr("trade_state")); } @@ -417,7 +466,7 @@ public class WechatNewServiceImpl implements WechatNewService { if (ObjectUtil.isNull(data)) { throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if (data.containsKey("errcode") && !"0".equals(data.getString("errcode"))) { + if (data.containsKey("errcode") && !data.getString("errcode").equals("0")) { if (data.containsKey("errmsg")) { wxExceptionDispose(data, "微信公众号发送模板消息异常"); throw new CrmebException("微信接口调用失败：" + data.getString("errcode") + data.getString("errmsg")); @@ -441,15 +490,15 @@ public class WechatNewServiceImpl implements WechatNewService { if (ObjectUtil.isNull(data)) { throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if (data.containsKey("errcode") && !"0".equals(data.getString("errcode"))) { - if ("40001".equals(data.getString("errcode"))) { + if (data.containsKey("errcode") && !data.getString("errcode").equals("0")) { + if (data.getString("errcode").equals("40001")) { wxExceptionDispose(data, "微信小程序发送订阅消息异常"); redisUtil.delete(WeChatConstants.REDIS_WECAHT_MINI_ACCESS_TOKEN_KEY); accessToken = getMiniAccessToken(); url = StrUtil.format(WeChatConstants.WECHAT_MINI_SEND_SUBSCRIBE_URL, accessToken); result = restTemplateUtil.postJsonData(url, messAge); JSONObject data2 = JSONObject.parseObject(result); - if (data2.containsKey("errcode") && !"0".equals(data2.getString("errcode"))) { + if (data2.containsKey("errcode") && !data2.getString("errcode").equals("0")) { if (data2.containsKey("errmsg")) { wxExceptionDispose(data2, "微信小程序发送订阅消息重试异常"); throw new CrmebException("微信接口调用失败：" + data2.getString("errcode") + data2.getString("errmsg")); @@ -479,7 +528,7 @@ public class WechatNewServiceImpl implements WechatNewService { if (ObjectUtil.isNull(result)) { throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if (result.containsKey("errcode") && "0".equals(result.getString("errcode"))) { + if (result.containsKey("errcode") && result.getString("errcode").equals("0")) { return result; } if (result.containsKey("errmsg")) { @@ -504,7 +553,7 @@ public class WechatNewServiceImpl implements WechatNewService { if (ObjectUtil.isNull(jsonObject)) { throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if (jsonObject.containsKey("errcode") && "0".equals(jsonObject.getString("errcode"))) { + if (jsonObject.containsKey("errcode") && jsonObject.getString("errcode").equals("0")) { return Boolean.TRUE; } if (jsonObject.containsKey("errmsg")) { @@ -526,7 +575,7 @@ public class WechatNewServiceImpl implements WechatNewService { if (ObjectUtil.isNull(result)) { throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if (result.containsKey("errcode") && "0".equals(result.getString("errcode"))) { + if (result.containsKey("errcode") && result.getString("errcode").equals("0")) { return Boolean.TRUE; } if (result.containsKey("errmsg")) { @@ -571,12 +620,12 @@ public class WechatNewServiceImpl implements WechatNewService { } WxRefundResponseVo responseVo = CrmebUtil.mapToObj(map, WxRefundResponseVo.class); - if ("FAIL".equals(responseVo.getReturnCode().toUpperCase())) { + if (responseVo.getReturnCode().toUpperCase().equals("FAIL")) { wxPayExceptionDispose(map, "微信申请退款异常1"); throw new CrmebException("微信申请退款失败1！" + responseVo.getReturnMsg()); } - if ("FAIL".equals(responseVo.getResultCode().toUpperCase())) { + if (responseVo.getResultCode().toUpperCase().equals("FAIL")) { wxPayExceptionDispose(map, "微信申请退款业务异常"); throw new CrmebException("微信申请退款失败2！" + responseVo.getErrCodeDes()); } @@ -596,7 +645,7 @@ public class WechatNewServiceImpl implements WechatNewService { if (ObjectUtil.isNull(jsonObject)) { throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if (jsonObject.containsKey("errcode") && !"0".equals(jsonObject.getString("errcode"))) { + if (jsonObject.containsKey("errcode") && !jsonObject.getString("errcode").equals("0")) { if (jsonObject.containsKey("errmsg")) { // 保存到微信异常表 wxExceptionDispose(jsonObject, StrUtil.format("获取我的公众号模板消息列表异常")); @@ -625,7 +674,7 @@ public class WechatNewServiceImpl implements WechatNewService { if (ObjectUtil.isNull(data)) { throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if (data.containsKey("errcode") && !"0".equals(data.getString("errcode"))) { + if (data.containsKey("errcode") && !data.getString("errcode").equals("0")) { if (data.containsKey("errmsg")) { wxExceptionDispose(data, "删除微信公众号模板消息异常"); throw new CrmebException("微信接口调用失败：" + data.getString("errcode") + data.getString("errmsg")); @@ -651,7 +700,7 @@ public class WechatNewServiceImpl implements WechatNewService { if (ObjectUtil.isNull(data)) { throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if (data.containsKey("errcode") && !"0".equals(data.getString("errcode"))) { + if (data.containsKey("errcode") && !data.getString("errcode").equals("0")) { if (data.containsKey("errmsg")) { wxExceptionDispose(data, "添加公众号模板消息异常"); throw new CrmebException("微信接口调用失败：" + data.getString("errcode") + data.getString("errmsg")); @@ -672,7 +721,7 @@ public class WechatNewServiceImpl implements WechatNewService { if (ObjectUtil.isNull(jsonObject)) { throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if (jsonObject.containsKey("errcode") && !"0".equals(jsonObject.getString("errcode"))) { + if (jsonObject.containsKey("errcode") && !jsonObject.getString("errcode").equals("0")) { if (jsonObject.containsKey("errmsg")) { // 保存到微信异常表 wxExceptionDispose(jsonObject, StrUtil.format("获取小程序当前帐号下的个人模板列表异常")); @@ -700,7 +749,7 @@ public class WechatNewServiceImpl implements WechatNewService { if (ObjectUtil.isNull(data)) { throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if (data.containsKey("errcode") && !"0".equals(data.getString("errcode"))) { + if (data.containsKey("errcode") && !data.getString("errcode").equals("0")) { if (data.containsKey("errmsg")) { wxExceptionDispose(data, "删除微信小程序订阅消息异常"); throw new CrmebException("微信接口调用失败：" + data.getString("errcode") + data.getString("errmsg")); @@ -722,7 +771,7 @@ public class WechatNewServiceImpl implements WechatNewService { if (ObjectUtil.isNull(jsonObject)) { throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if (jsonObject.containsKey("errcode") && !"0".equals(jsonObject.getString("errcode"))) { + if (jsonObject.containsKey("errcode") && !jsonObject.getString("errcode").equals("0")) { if (jsonObject.containsKey("errmsg")) { // 保存到微信异常表 wxExceptionDispose(jsonObject, "获取小程序平台上的标准模板异常"); @@ -754,7 +803,7 @@ public class WechatNewServiceImpl implements WechatNewService { if (ObjectUtil.isNull(data)) { throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if (data.containsKey("errcode") && !"0".equals(data.getString("errcode"))) { + if (data.containsKey("errcode") && !data.getString("errcode").equals("0")) { if (data.containsKey("errmsg")) { wxExceptionDispose(data, "添加小程序订阅消息异常"); throw new CrmebException("微信接口调用失败：" + data.getString("errcode") + data.getString("errmsg")); @@ -763,6 +812,7 @@ public class WechatNewServiceImpl implements WechatNewService { return data.getString("priTmplId"); } + /** * 获取JS-SDK的签名 * @param nonceStr 随机字符串 @@ -794,7 +844,7 @@ public class WechatNewServiceImpl implements WechatNewService { if (ObjectUtil.isNull(data)) { throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if (data.containsKey("errcode") && !"0".equals(data.getString("errcode"))) { + if (data.containsKey("errcode") && !data.getString("errcode").equals("0")) { if (data.containsKey("errmsg")) { // 保存到微信异常表 wxExceptionDispose(data, "微信获取JS-SDK的ticket异常"); @@ -819,7 +869,7 @@ public class WechatNewServiceImpl implements WechatNewService { if (ObjectUtil.isNull(data)) { throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if (data.containsKey("errcode") && !"0".equals(data.getString("errcode"))) { + if (data.containsKey("errcode") && !data.getString("errcode").equals("0")) { if (data.containsKey("errmsg")) { // 保存到微信异常表 wxExceptionDispose(data, StrUtil.format("微信获取accessToken异常，{}端", type)); @@ -853,7 +903,7 @@ public class WechatNewServiceImpl implements WechatNewService { private void wxPayExceptionDispose(HashMap map, String remark) { WechatExceptions wechatExceptions = new WechatExceptions(); String returnCode = (String) map.get("return_code"); - if ("FAIL".equals(returnCode.toUpperCase())) { + if (returnCode.toUpperCase().equals("FAIL")) { wechatExceptions.setErrcode("-100"); wechatExceptions.setErrmsg(map.get("return_msg").toString()); } else { @@ -874,13 +924,13 @@ public class WechatNewServiceImpl implements WechatNewService { */ private void wxPayQueryExceptionDispose(MyRecord record, String remark) { WechatExceptions wechatExceptions = new WechatExceptions(); - if ("FAIL".equals(record.getStr("return_code").toUpperCase())) { + if (record.getStr("return_code").toUpperCase().equals("FAIL")) { wechatExceptions.setErrcode("-200"); wechatExceptions.setErrmsg(record.getStr("return_msg")); - } else if ("FAIL".equals(record.getStr("result_code").toUpperCase())) { + } else if (record.getStr("result_code").toUpperCase().equals("FAIL")) { wechatExceptions.setErrcode(record.getStr("err_code")); wechatExceptions.setErrmsg(record.getStr("err_code_des")); - } else if (!"SUCCESS".equals(record.getStr("trade_state").toUpperCase())) { + } else if (!record.getStr("trade_state").toUpperCase().equals("SUCCESS")) { wechatExceptions.setErrcode("-201"); wechatExceptions.setErrmsg(record.getStr("trade_state")); } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WechatPayInfoServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WechatPayInfoServiceImpl.java index 5563c4bb..48efd574 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WechatPayInfoServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WechatPayInfoServiceImpl.java @@ -15,7 +15,7 @@ import javax.annotation.Resource; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WechatPublicServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WechatPublicServiceImpl.java index 51f7b7f0..e746997a 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WechatPublicServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WechatPublicServiceImpl.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; * +---------------------------------------------------------------------- * | 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相关版权 * +---------------------------------------------------------------------- @@ -36,7 +36,7 @@ public class WechatPublicServiceImpl implements WechatPublicService { @Override public Object getCustomizeMenus() { Object list = redisUtil.get(WeChatConstants.REDIS_PUBLIC_MENU_KEY); - if (list == null || "".equals(list)) { + if (list == null || list.equals("")) { //如果没有， 去读取 JSONObject tagsList = wechatNewService.getPublicCustomMenu(); redisUtil.set(WeChatConstants.REDIS_PUBLIC_MENU_KEY, tagsList); diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WechatReplyServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WechatReplyServiceImpl.java index 6cc472a3..7a1a0cef 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WechatReplyServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WechatReplyServiceImpl.java @@ -1,5 +1,6 @@ package com.zbkj.service.service.impl; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zbkj.common.request.PageParamRequest; @@ -24,7 +25,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相关版权 * +---------------------------------------------------------------------- @@ -91,6 +92,7 @@ public class WechatReplyServiceImpl extends ServiceImpl map = new LinkedMultiValueMap<>(); - map.add("account", loginVo.getAccount()); - map.add("secret", loginVo.getSecret()); + map.add(OnePassConstants.ONE_PASS_ACCESS_KEY, loginVo.getAccessKey()); + map.add(OnePassConstants.ONE_PASS_SECRET_KEY, loginVo.getSecretKey()); JSONObject jsonObject = postFrom(OnePassConstants.ONE_PASS_API_URL + OnePassConstants.USER_LOGIN_URI, map, null); String accessToken = ""; - Long expiresIn = 0L; + Integer expiresIn = 0; accessToken = OnePassConstants.ONE_PASS_USER_TOKEN_PREFIX.concat(jsonObject.getJSONObject("data").getString("access_token")); - expiresIn = jsonObject.getJSONObject("data").getLong("expires_in"); - expiresIn = expiresIn - DateUtil.getTime(); - redisUtil.set(StrUtil.format(OnePassConstants.ONE_PASS_TOKEN_KEY_PREFIX, loginVo.getSecret()), accessToken, expiresIn, TimeUnit.SECONDS); + expiresIn = jsonObject.getJSONObject("data").getInteger("expires_in"); + expiresIn = expiresIn - 1000; + redisUtil.set(StrUtil.format(OnePassConstants.ONE_PASS_TOKEN_KEY_PREFIX, loginVo.getAccessKey()), accessToken, Long.valueOf(expiresIn), TimeUnit.SECONDS); return accessToken; } @@ -94,22 +97,22 @@ public class OnePassUtil { */ public String getToken() { OnePassLoginVo loginVo = getLoginVo(); - boolean exists = redisUtil.exists(StrUtil.format(OnePassConstants.ONE_PASS_TOKEN_KEY_PREFIX, loginVo.getSecret())); + boolean exists = redisUtil.exists(StrUtil.format(OnePassConstants.ONE_PASS_TOKEN_KEY_PREFIX, loginVo.getAccessKey())); if (exists) { - Object token = redisUtil.get(StrUtil.format(OnePassConstants.ONE_PASS_TOKEN_KEY_PREFIX, loginVo.getSecret())); + Object token = redisUtil.get(StrUtil.format(OnePassConstants.ONE_PASS_TOKEN_KEY_PREFIX, loginVo.getAccessKey())); return token.toString(); } // 缓存中不存在token，重新获取，存入缓存 MultiValueMap map = new LinkedMultiValueMap<>(); - map.add("account", loginVo.getAccount()); - map.add("secret", loginVo.getSecret()); + map.add(OnePassConstants.ONE_PASS_ACCESS_KEY, loginVo.getAccessKey()); + map.add(OnePassConstants.ONE_PASS_SECRET_KEY, loginVo.getSecretKey()); JSONObject jsonObject = postFrom(OnePassConstants.ONE_PASS_API_URL + OnePassConstants.USER_LOGIN_URI, map, null); String accessToken = ""; Long expiresIn = 0L; accessToken = OnePassConstants.ONE_PASS_USER_TOKEN_PREFIX.concat(jsonObject.getJSONObject("data").getString("access_token")); expiresIn = jsonObject.getJSONObject("data").getLong("expires_in"); - expiresIn = expiresIn - DateUtil.getTime(); - redisUtil.set(StrUtil.format(OnePassConstants.ONE_PASS_TOKEN_KEY_PREFIX, loginVo.getSecret()), accessToken, expiresIn, TimeUnit.SECONDS); + expiresIn = expiresIn - CrmebDateUtil.getTime(); + redisUtil.set(StrUtil.format(OnePassConstants.ONE_PASS_TOKEN_KEY_PREFIX, loginVo.getAccessKey()), accessToken, expiresIn, TimeUnit.SECONDS); return accessToken; } @@ -117,9 +120,9 @@ public class OnePassUtil { * 清除token */ public void removeToken(OnePassLoginVo loginVo) { - boolean exists = redisUtil.exists(StrUtil.format(OnePassConstants.ONE_PASS_TOKEN_KEY_PREFIX, loginVo.getSecret())); + boolean exists = redisUtil.exists(StrUtil.format(OnePassConstants.ONE_PASS_TOKEN_KEY_PREFIX, loginVo.getAccessKey())); if (exists) { - redisUtil.delete(StrUtil.format(OnePassConstants.ONE_PASS_TOKEN_KEY_PREFIX, loginVo.getSecret())); + redisUtil.delete(StrUtil.format(OnePassConstants.ONE_PASS_TOKEN_KEY_PREFIX, loginVo.getAccessKey())); } } @@ -128,9 +131,9 @@ public class OnePassUtil { */ public void removeToken() { OnePassLoginVo loginVo = getLoginVo(); - boolean exists = redisUtil.exists(StrUtil.format(OnePassConstants.ONE_PASS_TOKEN_KEY_PREFIX, loginVo.getSecret())); + boolean exists = redisUtil.exists(StrUtil.format(OnePassConstants.ONE_PASS_TOKEN_KEY_PREFIX, loginVo.getAccessKey())); if (exists) { - redisUtil.delete(StrUtil.format(OnePassConstants.ONE_PASS_TOKEN_KEY_PREFIX, loginVo.getSecret())); + redisUtil.delete(StrUtil.format(OnePassConstants.ONE_PASS_TOKEN_KEY_PREFIX, loginVo.getAccessKey())); } } @@ -139,6 +142,21 @@ public class OnePassUtil { */ public JSONObject postFrom(String url, MultiValueMap param, Map header) { String result = restTemplateUtil.postFromUrlencoded(url, param, header); + logger.info("OnePass-postForm:{}", result); + return checkResult(result); + } + + public JSONObject getFrom(String url, MultiValueMap param, Map header) { + JSONObject jsonObject = restTemplateUtil.getDataForm(url, param, header); + return checkResult(jsonObject); + } + + /** + * post请求from表单模式提交 + */ + public JSONObject getData(String url, Map header) { + String result = restTemplateUtil.getData(url, header); + logger.info("OnePass-postForm:{}", result); return checkResult(result); } @@ -166,6 +184,16 @@ public class OnePassUtil { return jsonObject; } + private JSONObject checkResult(JSONObject jsonObject) { + if (ObjectUtil.isNull(jsonObject)) { + throw new CrmebException("一号通平台接口异常，没任何数据返回！"); + } + if (OnePassConstants.ONE_PASS_ERROR_CODE.equals(jsonObject.getInteger("status"))) { + throw new CrmebException("一号通平台接口" + jsonObject.getString("msg")); + } + return jsonObject; + } + /** * 获取请求的headerMap * diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/util/YlyUtil.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/util/YlyUtil.java index b12ecb20..fac7c715 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/util/YlyUtil.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/util/YlyUtil.java @@ -26,7 +26,7 @@ import java.util.concurrent.TimeUnit; * +---------------------------------------------------------------------- * * | 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相关版权 * * +---------------------------------------------------------------------- diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/util/yly/RequestMethod.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/util/yly/RequestMethod.java index c7d99ff6..b23306c6 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/util/yly/RequestMethod.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/util/yly/RequestMethod.java @@ -24,13 +24,13 @@ public class RequestMethod { } private static boolean CCIsNull(String client_id, String client_secret) { - if (ClientId != null && ClientSecret != null && !"".equals(ClientId) && !"".equals(ClientSecret)) + if (ClientId != null && ClientSecret != null && !ClientId.equals("") && !ClientSecret.equals("")) return true; return false; } public String getCodeOpen(String redirect_uri) { - if (ClientId != null && !"".equals(ClientId)) + if (ClientId != null && !ClientId.equals("")) return UtilUrl.openType + "?response_type=code&client_id=" + ClientId + "&redirect_uri=" + redirect_uri + "&state=1"; return example; } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/util/yly/Utils.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/util/yly/Utils.java index 5878f46b..e66ae544 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/util/yly/Utils.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/util/yly/Utils.java @@ -29,7 +29,7 @@ public class Utils { } public static boolean isNull(String content) { - if (content != null && !"".equals(content)) + if (content != null && !content.equals("")) return false; return true; } diff --git a/crmeb/crmeb-service/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml b/crmeb/crmeb-service/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml index cfdb8acf..ab4e50c8 100644 --- a/crmeb/crmeb-service/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml +++ b/crmeb/crmeb-service/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml @@ -2,7 +2,10 @@ - + SELECT group_concat(`title`) AS title, `number`, price, uniqid + FROM eb_shipping_templates_free + where temp_id = #{tempId, jdbcType=INTEGER} + GROUP BY `uniqid` ORDER BY id ASC diff --git a/crmeb/crmeb-service/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml b/crmeb/crmeb-service/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml index 4bd90642..8fe1b469 100644 --- a/crmeb/crmeb-service/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml +++ b/crmeb/crmeb-service/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml @@ -2,7 +2,11 @@ - + SELECT group_concat(`title`) AS title, `first`, first_price, `renewal`, renewal_price, uniqid + FROM eb_shipping_templates_region + where temp_id = #{tempId, jdbcType=INTEGER} + GROUP BY `uniqid` + ORDER BY id ASC diff --git a/crmeb/crmeb-service/src/main/resources/mapper/finance/UserFundsMonitorMapper.xml b/crmeb/crmeb-service/src/main/resources/mapper/finance/UserFundsMonitorMapper.xml index 318cb49e..a2f12b2d 100644 --- a/crmeb/crmeb-service/src/main/resources/mapper/finance/UserFundsMonitorMapper.xml +++ b/crmeb/crmeb-service/src/main/resources/mapper/finance/UserFundsMonitorMapper.xml @@ -20,6 +20,6 @@ and u.brokerage_price >= #{min, jdbcType=DECIMAL} GROUP BY u.uid - order by total_brokerage #{sort} + order by total_brokerage ${sort} diff --git a/crmeb/crmeb-service/src/main/resources/mapper/gencode/MySQLGeneratorMapper.xml b/crmeb/crmeb-service/src/main/resources/mapper/gencode/MySQLGeneratorMapper.xml deleted file mode 100644 index 00243adb..00000000 --- a/crmeb/crmeb-service/src/main/resources/mapper/gencode/MySQLGeneratorMapper.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - diff --git a/crmeb/crmeb-service/src/main/resources/mapper/marketing/StoreCouponUserMapper.xml b/crmeb/crmeb-service/src/main/resources/mapper/marketing/StoreCouponUserMapper.xml index e8bd9c61..f33aa202 100644 --- a/crmeb/crmeb-service/src/main/resources/mapper/marketing/StoreCouponUserMapper.xml +++ b/crmeb/crmeb-service/src/main/resources/mapper/marketing/StoreCouponUserMapper.xml @@ -2,4 +2,28 @@ + + + diff --git a/crmeb/crmeb-service/src/main/resources/mapper/store/StoreBargainUserMapper.xml b/crmeb/crmeb-service/src/main/resources/mapper/store/StoreBargainUserMapper.xml index 2467b160..77808ba0 100644 --- a/crmeb/crmeb-service/src/main/resources/mapper/store/StoreBargainUserMapper.xml +++ b/crmeb/crmeb-service/src/main/resources/mapper/store/StoreBargainUserMapper.xml @@ -2,4 +2,18 @@ + diff --git a/crmeb/crmeb-service/src/main/resources/mapper/store/StoreOrderMapper.xml b/crmeb/crmeb-service/src/main/resources/mapper/store/StoreOrderMapper.xml index e41ee51f..c215daa8 100644 --- a/crmeb/crmeb-service/src/main/resources/mapper/store/StoreOrderMapper.xml +++ b/crmeb/crmeb-service/src/main/resources/mapper/store/StoreOrderMapper.xml @@ -11,6 +11,61 @@ + + SELECT + p.id, p.uid, p.order_id, p.order_id_key, p.total_num, p.total_price, + p.cid, p.pid, p.people, p.price, p.add_time, p.stop_time, p.k_id, + p.is_tpl, p.is_refund, p.status, p.nickname, p.avatar, p.is_virtual + FROM eb_store_pink p + INNER JOIN ( + SELECT uid, MAX(id) AS max_id + FROM eb_store_pink + WHERE is_refund = 'false' AND status IN (1, 2) + GROUP BY uid + ) AS tmp ON p.uid = tmp.uid AND p.id = tmp.max_id + ORDER BY p.id DESC + LIMIT #{size}; + diff --git a/crmeb/crmeb-service/src/main/resources/mapper/store/StoreProductCateMapper.xml b/crmeb/crmeb-service/src/main/resources/mapper/store/StoreProductCateMapper.xml deleted file mode 100644 index 8fcd0064..00000000 --- a/crmeb/crmeb-service/src/main/resources/mapper/store/StoreProductCateMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/crmeb/crmeb-service/src/main/resources/mapper/system/SystemStoreMapper.xml b/crmeb/crmeb-service/src/main/resources/mapper/system/SystemStoreMapper.xml index 6ee9e336..d03d195e 100644 --- a/crmeb/crmeb-service/src/main/resources/mapper/system/SystemStoreMapper.xml +++ b/crmeb/crmeb-service/src/main/resources/mapper/system/SystemStoreMapper.xml @@ -3,7 +3,7 @@ diff --git a/crmeb/crmeb-service/src/main/resources/mapper/user/UserMapper.xml b/crmeb/crmeb-service/src/main/resources/mapper/user/UserMapper.xml index 0d4cfc1f..462f3bbc 100644 --- a/crmeb/crmeb-service/src/main/resources/mapper/user/UserMapper.xml +++ b/crmeb/crmeb-service/src/main/resources/mapper/user/UserMapper.xml @@ -3,15 +3,21 @@ diff --git a/crmeb/crmeb-service/src/main/resources/template/java/Controller.java.vm b/crmeb/crmeb-service/src/main/resources/template/java/Controller.java.vm deleted file mode 100644 index 5615872c..00000000 --- a/crmeb/crmeb-service/src/main/resources/template/java/Controller.java.vm +++ /dev/null @@ -1,103 +0,0 @@ -package ${package}.${moduleName}.controller; - -import java.util.Arrays; -import java.util.Map; - -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import ${package}.${moduleName}.entity.${className}Entity; -import ${package}.${moduleName}.service.${className}Service; -import ${mainPath}.common.utils.PageUtils; -import ${mainPath}.common.utils.R; - - - - -/** - * ${comments} 控制器 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * | Author: ${author} - * +---------------------------------------------------------------------- - * ｜ @date ${datetime} - * +---------------------------------------------------------------------- - * ｜ @date ${email} - * +---------------------------------------------------------------------- - */ -@RestController -@RequestMapping("${moduleName}/${pathName}") -public class ${className}Controller { - @Autowired - private ${className}Service ${classname}Service; - - /** - * 列表信息 - */ - @RequestMapping("/list") - @PreAuthorize("${moduleName}:${pathName}:list") - public CommonResult> list(@RequestParam Map params){ - CommonPage<${classname}> page = CommonPage.restPag(${classname}Service.queryPage(params)); - - return CommonResult.success(page); - } - - - /** - * 详情数据 - */ - @RequestMapping("/info/{${pk.attrname}}") - @PreAuthorize("${moduleName}:${pathName}:info") - public CommonResult<${classname}> info(@PathVariable("${pk.attrname}") ${pk.attrType} ${pk.attrname}){ - ${className}Entity ${classname} = ${classname}Service.getById(${pk.attrname}); - - return CommonResult.success(${classname}); - } - - /** - * 新增数据 - */ - @RequestMapping("/save") - @PreAuthorize("${moduleName}:${pathName}:save") - public CommonResult save(@RequestBody ${className}Entity ${classname}){ - if (${classname}Service.save(${classname})) { - return CommonResult.success(); - } - return CommonResult.failed(); - } - - /** - * 修改数据 - */ - @RequestMapping("/update") - @PreAuthorize("${moduleName}:${pathName}:update") - public CommonResult update(@RequestBody ${className}Entity ${classname}){ - if (${classname}Service.updateById(${classname})) { - return CommonResult.success(); - } - return CommonResult.failed(); - } - - /** - * 删除:根据id集合 - */ - @RequestMapping("/delete") - @PreAuthorize("${moduleName}:${pathName}:delete") - public CommonResult delete(@RequestBody ${pk.attrType}[] ${pk.attrname}s){ - if (${classname}Service.removeByIds(Arrays.asList(${pk.attrname}))) { - return CommonResult.success(); - } - return CommonResult.failed(); - } - -} diff --git a/crmeb/crmeb-service/src/main/resources/template/java/Dao.java.vm b/crmeb/crmeb-service/src/main/resources/template/java/Dao.java.vm deleted file mode 100644 index 56a70dcd..00000000 --- a/crmeb/crmeb-service/src/main/resources/template/java/Dao.java.vm +++ /dev/null @@ -1,26 +0,0 @@ -package ${package}.${moduleName}.dao; - -import ${package}.${moduleName}.entity.${className}Entity; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - * ${comments} DAO 映射层 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * @author: ${author} - * +---------------------------------------------------------------------- - * @date ${datetime} - * +---------------------------------------------------------------------- - * @email ${email} - * +---------------------------------------------------------------------- - */ -@Mapper -public interface ${className}Dao extends BaseMapper<${className}Entity> { - -} diff --git a/crmeb/crmeb-service/src/main/resources/template/java/Entity.java.vm b/crmeb/crmeb-service/src/main/resources/template/java/Entity.java.vm deleted file mode 100644 index d48b625d..00000000 --- a/crmeb/crmeb-service/src/main/resources/template/java/Entity.java.vm +++ /dev/null @@ -1,44 +0,0 @@ -package ${package}.${moduleName}.entity; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; - - #if(${hasBigDecimal}) - import java.math.BigDecimal; - #end -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - -/** - * ${comments} Entity 实体类 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * @author: ${author} - * +---------------------------------------------------------------------- - * @date ${datetime} - * +---------------------------------------------------------------------- - * @email ${email} - * +---------------------------------------------------------------------- - */ -@Data -@TableName("${tableName}") -public class ${className}Entity implements Serializable { - private static final long serialVersionUID = 1L; - - #foreach ($column in $columns) - /** - * $column.comments - */ - #if($column.columnName == $pk.columnName) - @TableId - #end - private $column.attrType $column.attrname; - #end - -} diff --git a/crmeb/crmeb-service/src/main/resources/template/java/Service.java.vm b/crmeb/crmeb-service/src/main/resources/template/java/Service.java.vm deleted file mode 100644 index 2244ed8f..00000000 --- a/crmeb/crmeb-service/src/main/resources/template/java/Service.java.vm +++ /dev/null @@ -1,35 +0,0 @@ -package ${package}.${moduleName}.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import ${mainPath}.common.utils.PageUtils; -import ${package}.${moduleName}.entity.${className}Entity; - -import java.util.Map; - -/** - * ${comments} 业务接口 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * @author: ${author} - * +---------------------------------------------------------------------- - * @date ${datetime} - * +---------------------------------------------------------------------- - * @email ${email} - * +---------------------------------------------------------------------- - */ -public interface ${className}Service extends IService<${className}Entity> { - - /** - * ${className} 列表查询 - * @param request 默认是是体类 根据自己需求修改或者创建自己的request - * @param pageParamRequest 分页参数对象 - * @return - */ - List<${className}> getList(${className}Entity request, PageParamRequest pageParamRequest) -} - diff --git a/crmeb/crmeb-service/src/main/resources/template/java/ServiceImpl.java.vm b/crmeb/crmeb-service/src/main/resources/template/java/ServiceImpl.java.vm deleted file mode 100644 index f7f928b2..00000000 --- a/crmeb/crmeb-service/src/main/resources/template/java/ServiceImpl.java.vm +++ /dev/null @@ -1,54 +0,0 @@ -package ${package}.${moduleName}.service.impl; - -import org.springframework.stereotype.Service; -import java.util.Map; -import com.baomidou.mybatisplus.core.conditions.pageQueryUtils.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import ${mainPath}.common.utils.PageUtils; -import ${mainPath}.common.utils.Query; - -import ${package}.${moduleName}.dao.${className}Dao; -import ${package}.${moduleName}.entity.${className}Entity; -import ${package}.${moduleName}.service.${className}Service; - - -/** - * ${comments} 接口实现类 - * +---------------------------------------------------------------------- - * | CRMEB [ CRMEB赋能开发者，助力企业发展 ] - * +---------------------------------------------------------------------- - * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 - * +---------------------------------------------------------------------- - * @author: ${author} - * +---------------------------------------------------------------------- - * @date ${datetime} - * +---------------------------------------------------------------------- - * @email ${email} - * +---------------------------------------------------------------------- - */ - -@Service("${classname}Service") -public class ${className}ServiceImpl extends ServiceImpl<${className}Dao, ${className}Entity> implements ${className}Service { - - /** - * ${className}列表查询 - * @param request 默认是是体类 根据自己需求修改或者创建自己的request - * @param pageParamRequest 分页参数对象 - * @return - */ - @Override - public PageUtils queryPage(${className}Entity request, PageParamRequest pageParamRequest) { - PageHelper.startPage(pageParamRequest.getPageNum(), pageParamRequest.getPageSize()); - - //列表查询 ${className} 类的多条件查询 - LambdaQueryWrapper<${className}> lambdaQueryWrapper = new LambdaQueryWrapper<>(); - ${className} model = new ${className}(); - BeanUtils.copyProperties(request, model); - lambdaQueryWrapper.setEntity(model); - return dao.selectList(lambdaQueryWrapper); - } - -} diff --git a/crmeb/crmeb-service/src/main/resources/template/sql/eb_system_menu.sql.vm b/crmeb/crmeb-service/src/main/resources/template/sql/eb_system_menu.sql.vm deleted file mode 100644 index 08e74a85..00000000 --- a/crmeb/crmeb-service/src/main/resources/template/sql/eb_system_menu.sql.vm +++ /dev/null @@ -1,11 +0,0 @@ --- 自动生成新增菜单SQL 这里仅仅是新增菜单数据，实际开发中需要分配对应权限才可以正常使用 --- 菜单目录SQL menu_type = M-目录，C-菜单，A-按钮 - INSERT INTO `eb_system_menu` (`pid`, `name`,`perms`,`component`, `menu_type`) VALUES (0,'${moduleName}','${moduleName}:${pathName}','','C'); --- 目录菜单id 用于按钮新增时作为父ID - set @parentId = @@identity; --- 所在表的CRUD菜单 根据自己需求修改添加 - INSERT INTO `eb_system_menu` (`pid`, `name`,`perms`,`component`, `menu_type`) SELECT @parentId,'DATA_LIST','${moduleName}:${pathName}:list','${moduleName}/${pathName}/list','A'; - INSERT INTO `eb_system_menu` (`pid`, `name`,`perms`,`component`, `menu_type`) SELECT @parentId,'DATA_INFO','${moduleName}:${pathName}:info','${moduleName}:${pathName}/info','A'; - INSERT INTO `eb_system_menu` (`pid`, `name`,`perms`,`component`, `menu_type`) SELECT @parentId,'DATA_EDITE','${moduleName}:${pathName}:update','${moduleName}:${pathName}/info','A'; - INSERT INTO `eb_system_menu` (`pid`, `name`,`perms`,`component`, `menu_type`) SELECT @parentId,'DATA_SAVE','${moduleName}:${pathName}:save','','A'; - INSERT INTO `eb_system_menu` (`pid`, `name`,`perms`,`component`, `menu_type`) SELECT @parentId,'DATA_DELETE','${moduleName}:${pathName}:delete','','A'; diff --git a/crmeb/crmeb-service/src/main/resources/template/vue/add-and-update.vue.vm b/crmeb/crmeb-service/src/main/resources/template/vue/add-and-update.vue.vm deleted file mode 100644 index bb80183a..00000000 --- a/crmeb/crmeb-service/src/main/resources/template/vue/add-and-update.vue.vm +++ /dev/null @@ -1,77 +0,0 @@ - - - diff --git a/crmeb/crmeb-service/src/main/resources/template/vue/api.js.vm b/crmeb/crmeb-service/src/main/resources/template/vue/api.js.vm deleted file mode 100644 index f0d3d84a..00000000 --- a/crmeb/crmeb-service/src/main/resources/template/vue/api.js.vm +++ /dev/null @@ -1,71 +0,0 @@ -// +---------------------------------------------------------------------- -// | CRMEB [ CRMEB赋能开发者，助力企业发展 ] -// +---------------------------------------------------------------------- -// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved. -// +---------------------------------------------------------------------- -// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 -// +---------------------------------------------------------------------- -// | Author: CRMEB Team -// +---------------------------------------------------------------------- - -import request from '@/utils/request' - -/** - * 新增${className} - * @param pram - */ -export function ${className}CreateApi(data) { - return request({ - url: '${moduleName}/${pathName}/save', - method: 'POST', - data - }) -} - -/** - * ${pathName}更新 - * @param pram - */ -export function ${pathName}UpdateApi(data) { - return request({ - url: '${moduleName}/${pathName}/update', - method: 'POST', - data - }) -} - -/** - * ${pathName}详情 - * @param pram - */ -export function ${pathName}DetailApi(id) { - return request({ - url: `${moduleName}/${pathName}/info/${id}`, - method: 'GET' - }) -} - -/** - * ${pathName}删除 - * @param pram - */ -export function ${pathName}DeleteApi(id) { - return request({ - url: `${moduleName}/${pathName}/delete/${id}`, - method: 'get' - }) -} - - -/** - * ${pathName}列表 - * @param pram - */ -export function ${pathName}ListApi(params) { - return request({ - url: '${moduleName}/${pathName}/list', - method: 'GET', - params - }) -} - diff --git a/crmeb/crmeb-service/src/main/resources/template/vue/index.vue.vm b/crmeb/crmeb-service/src/main/resources/template/vue/index.vue.vm deleted file mode 100644 index 2529d39b..00000000 --- a/crmeb/crmeb-service/src/main/resources/template/vue/index.vue.vm +++ /dev/null @@ -1,131 +0,0 @@ - - - diff --git a/crmeb/crmeb-service/src/main/resources/template/xml/Dao.xml.vm b/crmeb/crmeb-service/src/main/resources/template/xml/Dao.xml.vm deleted file mode 100644 index eba22689..00000000 --- a/crmeb/crmeb-service/src/main/resources/template/xml/Dao.xml.vm +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - -#foreach($column in $columns) - -#end - - - - diff --git a/crmeb/crmebimage/crmebimage/change/bargain_header/bargain_header1.jpg b/crmeb/crmebimage/crmebimage/change/bargain_header/bargain_header1.jpg deleted file mode 100755 index fb1fd03d..00000000 Binary files a/crmeb/crmebimage/crmebimage/change/bargain_header/bargain_header1.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/change/bargain_header/bargain_header2.jpg b/crmeb/crmebimage/crmebimage/change/bargain_header/bargain_header2.jpg deleted file mode 100755 index ef4d3da2..00000000 Binary files a/crmeb/crmebimage/crmebimage/change/bargain_header/bargain_header2.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/change/bargain_header/bargain_header3.jpg b/crmeb/crmebimage/crmebimage/change/bargain_header/bargain_header3.jpg deleted file mode 100755 index 9a6ec06b..00000000 Binary files a/crmeb/crmebimage/crmebimage/change/bargain_header/bargain_header3.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/change/bargain_header/bargain_header4.jpg b/crmeb/crmebimage/crmebimage/change/bargain_header/bargain_header4.jpg deleted file mode 100755 index 9d906273..00000000 Binary files a/crmeb/crmebimage/crmebimage/change/bargain_header/bargain_header4.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/change/bargain_header/bargain_header5.jpg b/crmeb/crmebimage/crmebimage/change/bargain_header/bargain_header5.jpg deleted file mode 100755 index bd80f9f4..00000000 Binary files a/crmeb/crmebimage/crmebimage/change/bargain_header/bargain_header5.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/change/bargain_header_bg/bargain_header_bg1.jpg b/crmeb/crmebimage/crmebimage/change/bargain_header_bg/bargain_header_bg1.jpg deleted file mode 100755 index 049d912d..00000000 Binary files a/crmeb/crmebimage/crmebimage/change/bargain_header_bg/bargain_header_bg1.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/change/bargain_header_bg/bargain_header_bg2.jpg b/crmeb/crmebimage/crmebimage/change/bargain_header_bg/bargain_header_bg2.jpg deleted file mode 100755 index 243df76c..00000000 Binary files a/crmeb/crmebimage/crmebimage/change/bargain_header_bg/bargain_header_bg2.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/change/bargain_header_bg/bargain_header_bg3.jpg b/crmeb/crmebimage/crmebimage/change/bargain_header_bg/bargain_header_bg3.jpg deleted file mode 100755 index d33fa0e9..00000000 Binary files a/crmeb/crmebimage/crmebimage/change/bargain_header_bg/bargain_header_bg3.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/change/bargain_header_bg/bargain_header_bg4.jpg b/crmeb/crmebimage/crmebimage/change/bargain_header_bg/bargain_header_bg4.jpg deleted file mode 100755 index 475c5d7c..00000000 Binary files a/crmeb/crmebimage/crmebimage/change/bargain_header_bg/bargain_header_bg4.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/change/bargain_header_bg/bargain_header_bg5.jpg b/crmeb/crmebimage/crmebimage/change/bargain_header_bg/bargain_header_bg5.jpg deleted file mode 100755 index fea3f88d..00000000 Binary files a/crmeb/crmebimage/crmebimage/change/bargain_header_bg/bargain_header_bg5.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/change/bargain_post/bargain_post1.png b/crmeb/crmebimage/crmebimage/change/bargain_post/bargain_post1.png deleted file mode 100755 index c53973a0..00000000 Binary files a/crmeb/crmebimage/crmebimage/change/bargain_post/bargain_post1.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/change/bargain_post/bargain_post2.png b/crmeb/crmebimage/crmebimage/change/bargain_post/bargain_post2.png deleted file mode 100755 index 4eb99dd3..00000000 Binary files a/crmeb/crmebimage/crmebimage/change/bargain_post/bargain_post2.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/change/bargain_post/bargain_post3.png b/crmeb/crmebimage/crmebimage/change/bargain_post/bargain_post3.png deleted file mode 100755 index b9ebbae9..00000000 Binary files a/crmeb/crmebimage/crmebimage/change/bargain_post/bargain_post3.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/change/bargain_post/bargain_post4.png b/crmeb/crmebimage/crmebimage/change/bargain_post/bargain_post4.png deleted file mode 100755 index 5281b747..00000000 Binary files a/crmeb/crmebimage/crmebimage/change/bargain_post/bargain_post4.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/change/bargain_post/bargain_post5.png b/crmeb/crmebimage/crmebimage/change/bargain_post/bargain_post5.png deleted file mode 100755 index ae1a33c3..00000000 Binary files a/crmeb/crmebimage/crmebimage/change/bargain_post/bargain_post5.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/change/bargain_tip/bargain_tip1.png b/crmeb/crmebimage/crmebimage/change/bargain_tip/bargain_tip1.png deleted file mode 100755 index 36227572..00000000 Binary files a/crmeb/crmebimage/crmebimage/change/bargain_tip/bargain_tip1.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/change/bargain_tip/bargain_tip2.png b/crmeb/crmebimage/crmebimage/change/bargain_tip/bargain_tip2.png deleted file mode 100755 index 5b7b4f41..00000000 Binary files a/crmeb/crmebimage/crmebimage/change/bargain_tip/bargain_tip2.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/change/bargain_tip/bargain_tip3.png b/crmeb/crmebimage/crmebimage/change/bargain_tip/bargain_tip3.png deleted file mode 100755 index 769932fe..00000000 Binary files a/crmeb/crmebimage/crmebimage/change/bargain_tip/bargain_tip3.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/change/bargain_tip/bargain_tip4.png b/crmeb/crmebimage/crmebimage/change/bargain_tip/bargain_tip4.png deleted file mode 100755 index 0b56e05f..00000000 Binary files a/crmeb/crmebimage/crmebimage/change/bargain_tip/bargain_tip4.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/change/bargain_tip/bargain_tip5.png b/crmeb/crmebimage/crmebimage/change/bargain_tip/bargain_tip5.png deleted file mode 100755 index 2e8a0406..00000000 Binary files a/crmeb/crmebimage/crmebimage/change/bargain_tip/bargain_tip5.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/change/new_header/new_header1.png b/crmeb/crmebimage/crmebimage/change/new_header/new_header1.png deleted file mode 100755 index 04fa8f8d..00000000 Binary files a/crmeb/crmebimage/crmebimage/change/new_header/new_header1.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/change/new_header/new_header2.png b/crmeb/crmebimage/crmebimage/change/new_header/new_header2.png deleted file mode 100755 index a3202efc..00000000 Binary files a/crmeb/crmebimage/crmebimage/change/new_header/new_header2.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/change/new_header/new_header3.png b/crmeb/crmebimage/crmebimage/change/new_header/new_header3.png deleted file mode 100755 index 7e2abd51..00000000 Binary files a/crmeb/crmebimage/crmebimage/change/new_header/new_header3.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/change/new_header/new_header4.png b/crmeb/crmebimage/crmebimage/change/new_header/new_header4.png deleted file mode 100755 index 1067ed92..00000000 Binary files a/crmeb/crmebimage/crmebimage/change/new_header/new_header4.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/change/new_header/new_header5.png b/crmeb/crmebimage/crmebimage/change/new_header/new_header5.png deleted file mode 100755 index 9d53ae90..00000000 Binary files a/crmeb/crmebimage/crmebimage/change/new_header/new_header5.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/change/share_tip/share_tip1.png b/crmeb/crmebimage/crmebimage/change/share_tip/share_tip1.png deleted file mode 100755 index e04b65be..00000000 Binary files a/crmeb/crmebimage/crmebimage/change/share_tip/share_tip1.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/change/share_tip/share_tip2.png b/crmeb/crmebimage/crmebimage/change/share_tip/share_tip2.png deleted file mode 100755 index d21de927..00000000 Binary files a/crmeb/crmebimage/crmebimage/change/share_tip/share_tip2.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/change/share_tip/share_tip3.png b/crmeb/crmebimage/crmebimage/change/share_tip/share_tip3.png deleted file mode 100755 index 1557628f..00000000 Binary files a/crmeb/crmebimage/crmebimage/change/share_tip/share_tip3.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/change/share_tip/share_tip4.png b/crmeb/crmebimage/crmebimage/change/share_tip/share_tip4.png deleted file mode 100755 index 23ac593d..00000000 Binary files a/crmeb/crmebimage/crmebimage/change/share_tip/share_tip4.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/change/share_tip/share_tip5.png b/crmeb/crmebimage/crmebimage/change/share_tip/share_tip5.png deleted file mode 100755 index 6baa2683..00000000 Binary files a/crmeb/crmebimage/crmebimage/change/share_tip/share_tip5.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/demoimage/001admin.jpg b/crmeb/crmebimage/crmebimage/demoimage/001admin.jpg deleted file mode 100644 index 64be7074..00000000 Binary files a/crmeb/crmebimage/crmebimage/demoimage/001admin.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/demoimage/001front.jpg b/crmeb/crmebimage/crmebimage/demoimage/001front.jpg deleted file mode 100644 index 26e052a9..00000000 Binary files a/crmeb/crmebimage/crmebimage/demoimage/001front.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/demoimage/01qiyejiangxiang.webp b/crmeb/crmebimage/crmebimage/demoimage/01qiyejiangxiang.webp deleted file mode 100644 index cc14e29d..00000000 Binary files a/crmeb/crmebimage/crmebimage/demoimage/01qiyejiangxiang.webp and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/demoimage/02yulan.jpg b/crmeb/crmebimage/crmebimage/demoimage/02yulan.jpg deleted file mode 100644 index 7b143a15..00000000 Binary files a/crmeb/crmebimage/crmebimage/demoimage/02yulan.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/demoimage/03-mobile-01.png b/crmeb/crmebimage/crmebimage/demoimage/03-mobile-01.png deleted file mode 100644 index 66c6fd08..00000000 Binary files a/crmeb/crmebimage/crmebimage/demoimage/03-mobile-01.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/demoimage/04-mobile-02.png b/crmeb/crmebimage/crmebimage/demoimage/04-mobile-02.png deleted file mode 100644 index a281c963..00000000 Binary files a/crmeb/crmebimage/crmebimage/demoimage/04-mobile-02.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/demoimage/05-mobile-03.png b/crmeb/crmebimage/crmebimage/demoimage/05-mobile-03.png deleted file mode 100644 index 04099595..00000000 Binary files a/crmeb/crmebimage/crmebimage/demoimage/05-mobile-03.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/demoimage/06-optionList.jpg b/crmeb/crmebimage/crmebimage/demoimage/06-optionList.jpg deleted file mode 100644 index 3644786a..00000000 Binary files a/crmeb/crmebimage/crmebimage/demoimage/06-optionList.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/demoimage/07-pc-01.png b/crmeb/crmebimage/crmebimage/demoimage/07-pc-01.png deleted file mode 100644 index c378a38e..00000000 Binary files a/crmeb/crmebimage/crmebimage/demoimage/07-pc-01.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/demoimage/08-pc-02.png b/crmeb/crmebimage/crmebimage/demoimage/08-pc-02.png deleted file mode 100644 index 250978fd..00000000 Binary files a/crmeb/crmebimage/crmebimage/demoimage/08-pc-02.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/demoimage/09-pc-03.png b/crmeb/crmebimage/crmebimage/demoimage/09-pc-03.png deleted file mode 100644 index 842de36b..00000000 Binary files a/crmeb/crmebimage/crmebimage/demoimage/09-pc-03.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/demoimage/10-pc-04.png b/crmeb/crmebimage/crmebimage/demoimage/10-pc-04.png deleted file mode 100644 index 05f951c0..00000000 Binary files a/crmeb/crmebimage/crmebimage/demoimage/10-pc-04.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/demoimage/11-pc-05.png b/crmeb/crmebimage/crmebimage/demoimage/11-pc-05.png deleted file mode 100644 index 76e50fcd..00000000 Binary files a/crmeb/crmebimage/crmebimage/demoimage/11-pc-05.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/demoimage/12-pc-06.png b/crmeb/crmebimage/crmebimage/demoimage/12-pc-06.png deleted file mode 100644 index 31796777..00000000 Binary files a/crmeb/crmebimage/crmebimage/demoimage/12-pc-06.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/demoimage/13yemiandesiner-min.gif b/crmeb/crmebimage/crmebimage/demoimage/13yemiandesiner-min.gif deleted file mode 100644 index 85608c12..00000000 Binary files a/crmeb/crmebimage/crmebimage/demoimage/13yemiandesiner-min.gif and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/demoimage/13yemiandesiner.gif b/crmeb/crmebimage/crmebimage/demoimage/13yemiandesiner.gif deleted file mode 100644 index 30496bac..00000000 Binary files a/crmeb/crmebimage/crmebimage/demoimage/13yemiandesiner.gif and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/demoimage/14yijianhuanse-min.gif b/crmeb/crmebimage/crmebimage/demoimage/14yijianhuanse-min.gif deleted file mode 100644 index 996b4b58..00000000 Binary files a/crmeb/crmebimage/crmebimage/demoimage/14yijianhuanse-min.gif and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/demoimage/14yijianhuanse.gif b/crmeb/crmebimage/crmebimage/demoimage/14yijianhuanse.gif deleted file mode 100644 index c31cf548..00000000 Binary files a/crmeb/crmebimage/crmebimage/demoimage/14yijianhuanse.gif and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/demoimage/15webPCadmin-min.gif b/crmeb/crmebimage/crmebimage/demoimage/15webPCadmin-min.gif deleted file mode 100644 index c89714c9..00000000 Binary files a/crmeb/crmebimage/crmebimage/demoimage/15webPCadmin-min.gif and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/demoimage/15webPCadmin.gif b/crmeb/crmebimage/crmebimage/demoimage/15webPCadmin.gif deleted file mode 100644 index 16346882..00000000 Binary files a/crmeb/crmebimage/crmebimage/demoimage/15webPCadmin.gif and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/demoimage/17lianxikefu.png b/crmeb/crmebimage/crmebimage/demoimage/17lianxikefu.png deleted file mode 100644 index 28348691..00000000 Binary files a/crmeb/crmebimage/crmebimage/demoimage/17lianxikefu.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/demoimage/c1.jpg b/crmeb/crmebimage/crmebimage/demoimage/c1.jpg deleted file mode 100644 index adc017c7..00000000 Binary files a/crmeb/crmebimage/crmebimage/demoimage/c1.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/demoimage/c2.jpg b/crmeb/crmebimage/crmebimage/demoimage/c2.jpg deleted file mode 100644 index 306d4480..00000000 Binary files a/crmeb/crmebimage/crmebimage/demoimage/c2.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/demoimage/crmebdouyin.jpg b/crmeb/crmebimage/crmebimage/demoimage/crmebdouyin.jpg deleted file mode 100644 index b97a7160..00000000 Binary files a/crmeb/crmebimage/crmebimage/demoimage/crmebdouyin.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/demoimage/cus01.jpg b/crmeb/crmebimage/crmebimage/demoimage/cus01.jpg deleted file mode 100644 index 676a6f17..00000000 Binary files a/crmeb/crmebimage/crmebimage/demoimage/cus01.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/demoimage/danshanghu_kefu.jpg b/crmeb/crmebimage/crmebimage/demoimage/danshanghu_kefu.jpg deleted file mode 100644 index 92068e93..00000000 Binary files a/crmeb/crmebimage/crmebimage/demoimage/danshanghu_kefu.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/demoimage/duoshanghu_kefu.jpg b/crmeb/crmebimage/crmebimage/demoimage/duoshanghu_kefu.jpg deleted file mode 100644 index e071e00c..00000000 Binary files a/crmeb/crmebimage/crmebimage/demoimage/duoshanghu_kefu.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/demoimage/gitee-java.jpg b/crmeb/crmebimage/crmebimage/demoimage/gitee-java.jpg deleted file mode 100644 index 9f8bcacd..00000000 Binary files a/crmeb/crmebimage/crmebimage/demoimage/gitee-java.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/demoimage/gitee-广告_java多商户.jpg b/crmeb/crmebimage/crmebimage/demoimage/gitee-广告_java多商户.jpg deleted file mode 100644 index d95c997a..00000000 Binary files a/crmeb/crmebimage/crmebimage/demoimage/gitee-广告_java多商户.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/demoimage/home2023618.jpg b/crmeb/crmebimage/crmebimage/demoimage/home2023618.jpg deleted file mode 100644 index ae34d8ce..00000000 Binary files a/crmeb/crmebimage/crmebimage/demoimage/home2023618.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/demoimage/javaop2.jpg b/crmeb/crmebimage/crmebimage/demoimage/javaop2.jpg deleted file mode 100644 index ee91dffe..00000000 Binary files a/crmeb/crmebimage/crmebimage/demoimage/javaop2.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/demoimage/kefu.jpg b/crmeb/crmebimage/crmebimage/demoimage/kefu.jpg deleted file mode 100644 index c593687b..00000000 Binary files a/crmeb/crmebimage/crmebimage/demoimage/kefu.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/demoimage/qqcus.jpg b/crmeb/crmebimage/crmebimage/demoimage/qqcus.jpg deleted file mode 100644 index da43f2d4..00000000 Binary files a/crmeb/crmebimage/crmebimage/demoimage/qqcus.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/demoimage/wellcomJavaGroup.jpg b/crmeb/crmebimage/crmebimage/demoimage/wellcomJavaGroup.jpg deleted file mode 100644 index ce6424ff..00000000 Binary files a/crmeb/crmebimage/crmebimage/demoimage/wellcomJavaGroup.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/0016d1efa86d41e38e76801a7cd743c6wcupy21hvb.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/0016d1efa86d41e38e76801a7cd743c6wcupy21hvb.jpg deleted file mode 100644 index 30025850..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/0016d1efa86d41e38e76801a7cd743c6wcupy21hvb.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/010f3a33b48846a39c2c086b4a289fa1c0aply6wjn.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/010f3a33b48846a39c2c086b4a289fa1c0aply6wjn.png deleted file mode 100755 index c045f8b5..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/010f3a33b48846a39c2c086b4a289fa1c0aply6wjn.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/02805afbe2964016a7ec11dc723273634a65204z4d.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/02805afbe2964016a7ec11dc723273634a65204z4d.png deleted file mode 100755 index afc89777..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/02805afbe2964016a7ec11dc723273634a65204z4d.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/0353c775de384b939cd994ac33b6c3f4m328kwji83.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/0353c775de384b939cd994ac33b6c3f4m328kwji83.png deleted file mode 100755 index 13b70ec7..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/0353c775de384b939cd994ac33b6c3f4m328kwji83.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/03cc34d0bb3f4bbcafa751462a2783c35u00exmfji.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/03cc34d0bb3f4bbcafa751462a2783c35u00exmfji.jpg deleted file mode 100755 index 78add732..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/03cc34d0bb3f4bbcafa751462a2783c35u00exmfji.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/044cb00c43134dde88a76770a65c4b73aggk7cb6bo.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/044cb00c43134dde88a76770a65c4b73aggk7cb6bo.png deleted file mode 100755 index 6791c1e6..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/044cb00c43134dde88a76770a65c4b73aggk7cb6bo.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/04fae7b9bc9a44e899ea8f6fbce1600aexehrjdj82.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/04fae7b9bc9a44e899ea8f6fbce1600aexehrjdj82.png deleted file mode 100755 index 883ba6a8..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/04fae7b9bc9a44e899ea8f6fbce1600aexehrjdj82.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/0517e880a70b4c539ff9163c90ab21f9hz0bea05p7.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/0517e880a70b4c539ff9163c90ab21f9hz0bea05p7.png deleted file mode 100755 index d4108a66..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/0517e880a70b4c539ff9163c90ab21f9hz0bea05p7.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/05896e9a492041e7b665596046b8b4fa8fxkw2x1k9.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/05896e9a492041e7b665596046b8b4fa8fxkw2x1k9.png deleted file mode 100755 index 02cfad59..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/05896e9a492041e7b665596046b8b4fa8fxkw2x1k9.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/058dd806ac3b49ddad1bcd610981bf85dixxzthr5d.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/058dd806ac3b49ddad1bcd610981bf85dixxzthr5d.png deleted file mode 100755 index 55bc6c07..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/058dd806ac3b49ddad1bcd610981bf85dixxzthr5d.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/05be58dd877f45d28d1af418614e8fa5mi3mwr9p5o.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/05be58dd877f45d28d1af418614e8fa5mi3mwr9p5o.png deleted file mode 100755 index 352856e5..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/05be58dd877f45d28d1af418614e8fa5mi3mwr9p5o.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/0624fe22d770438891ad666ebef9e21e1rhiepyec1.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/0624fe22d770438891ad666ebef9e21e1rhiepyec1.png deleted file mode 100755 index ca623a4d..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/0624fe22d770438891ad666ebef9e21e1rhiepyec1.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/0c32e97956d34f6e8a8b67caacec685283ufh1vuoy.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/0c32e97956d34f6e8a8b67caacec685283ufh1vuoy.png deleted file mode 100755 index 4d9b8879..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/0c32e97956d34f6e8a8b67caacec685283ufh1vuoy.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/0cd9800f27e9400c859859277baf469c28c7hjd64b.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/0cd9800f27e9400c859859277baf469c28c7hjd64b.png deleted file mode 100755 index b0830a0f..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/0cd9800f27e9400c859859277baf469c28c7hjd64b.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/0d82b367fcf34c90a328bc8800af7f05jrg0cg172i.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/0d82b367fcf34c90a328bc8800af7f05jrg0cg172i.jpg deleted file mode 100755 index a8b0ad0b..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/0d82b367fcf34c90a328bc8800af7f05jrg0cg172i.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/0e67de5c892047cf8788b9b51d1c4d5al5g2khm62q.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/0e67de5c892047cf8788b9b51d1c4d5al5g2khm62q.jpg deleted file mode 100755 index cb71023a..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/0e67de5c892047cf8788b9b51d1c4d5al5g2khm62q.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/0eabacb2ab774f54bddd9b2b0ff212a49e7etvhouq.gif b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/0eabacb2ab774f54bddd9b2b0ff212a49e7etvhouq.gif deleted file mode 100644 index a841ac7a..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/0eabacb2ab774f54bddd9b2b0ff212a49e7etvhouq.gif and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/11113e1876ac427bb3173086a3bd6c5bhyan1ea9pz.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/11113e1876ac427bb3173086a3bd6c5bhyan1ea9pz.png deleted file mode 100755 index ec71be3b..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/11113e1876ac427bb3173086a3bd6c5bhyan1ea9pz.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/1369d83740284b6aa0601a0bc0960a050wfmede2py.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/1369d83740284b6aa0601a0bc0960a050wfmede2py.png deleted file mode 100755 index 883548b8..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/1369d83740284b6aa0601a0bc0960a050wfmede2py.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/14e4ecbdbfcb48909b4a7f93b2ce6a3e360qlj0rtb.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/14e4ecbdbfcb48909b4a7f93b2ce6a3e360qlj0rtb.png deleted file mode 100755 index 60e84227..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/14e4ecbdbfcb48909b4a7f93b2ce6a3e360qlj0rtb.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/1618a47e11e745ff90c70f752c204e17qi6vjngrcd.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/1618a47e11e745ff90c70f752c204e17qi6vjngrcd.jpg deleted file mode 100755 index 8246d729..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/1618a47e11e745ff90c70f752c204e17qi6vjngrcd.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/166caeeb0f234d5e93c4baebf533e3c6cpk8chqitx.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/166caeeb0f234d5e93c4baebf533e3c6cpk8chqitx.jpg deleted file mode 100644 index 039bb979..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/166caeeb0f234d5e93c4baebf533e3c6cpk8chqitx.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/19171c7360924d47a39f048414045e765k3rr7xwr2.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/19171c7360924d47a39f048414045e765k3rr7xwr2.png deleted file mode 100755 index f2782398..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/19171c7360924d47a39f048414045e765k3rr7xwr2.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/19242c389ab749d1b7dece74000b26204j7q3sirs1.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/19242c389ab749d1b7dece74000b26204j7q3sirs1.png deleted file mode 100755 index b1964c8f..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/19242c389ab749d1b7dece74000b26204j7q3sirs1.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/197b96e3a4d24728b4069b0c288326352gcds3duga.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/197b96e3a4d24728b4069b0c288326352gcds3duga.png deleted file mode 100755 index 728aa441..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/197b96e3a4d24728b4069b0c288326352gcds3duga.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/1aa14360c7264153acc50ff5c5af7451fejoxdb2bt.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/1aa14360c7264153acc50ff5c5af7451fejoxdb2bt.png deleted file mode 100755 index 3b1190b7..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/1aa14360c7264153acc50ff5c5af7451fejoxdb2bt.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/1d14f2d2fa8f451a9d46fccacc3aa661tdwihn07he.gif b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/1d14f2d2fa8f451a9d46fccacc3aa661tdwihn07he.gif deleted file mode 100644 index a841ac7a..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/1d14f2d2fa8f451a9d46fccacc3aa661tdwihn07he.gif and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/1ec20d53b5fe4cea9b6b83dd90026d15qvui1h1cpp.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/1ec20d53b5fe4cea9b6b83dd90026d15qvui1h1cpp.png deleted file mode 100755 index 7d33c390..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/1ec20d53b5fe4cea9b6b83dd90026d15qvui1h1cpp.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/1f052138a6514e748137d863f54d719axyr6kovjd3.gif b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/1f052138a6514e748137d863f54d719axyr6kovjd3.gif deleted file mode 100755 index 9b3478d2..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/1f052138a6514e748137d863f54d719axyr6kovjd3.gif and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/1fcc02fe479e493db9da240ee8e83675b3rprs95sz.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/1fcc02fe479e493db9da240ee8e83675b3rprs95sz.png deleted file mode 100755 index 095c6d41..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/1fcc02fe479e493db9da240ee8e83675b3rprs95sz.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/206799794c1b4602aa94340279bc36946x7jz72lzl.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/206799794c1b4602aa94340279bc36946x7jz72lzl.png deleted file mode 100755 index 40bf6b42..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/206799794c1b4602aa94340279bc36946x7jz72lzl.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/21c84909461c434a8ff39d467ba8d648prefpnpq15.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/21c84909461c434a8ff39d467ba8d648prefpnpq15.png deleted file mode 100755 index b411f90b..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/21c84909461c434a8ff39d467ba8d648prefpnpq15.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/22e7a94a8c7a48318e895aa3f23d24f1ecq3mqcdx8.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/22e7a94a8c7a48318e895aa3f23d24f1ecq3mqcdx8.jpg deleted file mode 100755 index a6962eb3..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/22e7a94a8c7a48318e895aa3f23d24f1ecq3mqcdx8.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/24fb34ad03244e1aa0899672f6450605x4g288iyus.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/24fb34ad03244e1aa0899672f6450605x4g288iyus.png deleted file mode 100755 index ecc9d7c2..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/24fb34ad03244e1aa0899672f6450605x4g288iyus.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/25077b4a4d654f9fa738b7433a118d4552177mpsc5.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/25077b4a4d654f9fa738b7433a118d4552177mpsc5.png deleted file mode 100755 index 55e06e47..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/25077b4a4d654f9fa738b7433a118d4552177mpsc5.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/2631ca1695464da982b202d239bdf717eunywwsimu.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/2631ca1695464da982b202d239bdf717eunywwsimu.jpg deleted file mode 100644 index d06bfc5d..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/2631ca1695464da982b202d239bdf717eunywwsimu.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/28d8c56d248948ddab759d1eb708ab1c2zquoclgbq.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/28d8c56d248948ddab759d1eb708ab1c2zquoclgbq.png deleted file mode 100755 index f76ae4b2..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/28d8c56d248948ddab759d1eb708ab1c2zquoclgbq.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/29a253f8752a46f4b2fb3b63767b4d89v1098p6yiv.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/29a253f8752a46f4b2fb3b63767b4d89v1098p6yiv.jpg deleted file mode 100755 index 25e4ee20..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/29a253f8752a46f4b2fb3b63767b4d89v1098p6yiv.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/2a104b07589e45998fe604f81e56c216ozicop5k74.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/2a104b07589e45998fe604f81e56c216ozicop5k74.jpg deleted file mode 100644 index d2dc5cea..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/2a104b07589e45998fe604f81e56c216ozicop5k74.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/2a8554bcbf1b4396afef370f9255df19sacbmpcodn.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/2a8554bcbf1b4396afef370f9255df19sacbmpcodn.png deleted file mode 100755 index 70fc8894..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/2a8554bcbf1b4396afef370f9255df19sacbmpcodn.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/2e47a337dbdf445d81b20c1b5aeedf01ybm0jmic0h.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/2e47a337dbdf445d81b20c1b5aeedf01ybm0jmic0h.png deleted file mode 100755 index b05ff9c0..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/2e47a337dbdf445d81b20c1b5aeedf01ybm0jmic0h.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/2eef89b403dd47619e349e3edb057ce4g2clr5d4xn.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/2eef89b403dd47619e349e3edb057ce4g2clr5d4xn.jpg deleted file mode 100755 index 32b63d1f..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/2eef89b403dd47619e349e3edb057ce4g2clr5d4xn.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/31a9c9c08ae84c33879f8709a98877cb0tr5hsoh0p.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/31a9c9c08ae84c33879f8709a98877cb0tr5hsoh0p.png deleted file mode 100755 index afef17b8..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/31a9c9c08ae84c33879f8709a98877cb0tr5hsoh0p.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/3308f2d779874079b0e02ae206cf141bwb23ii2z52.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/3308f2d779874079b0e02ae206cf141bwb23ii2z52.png deleted file mode 100755 index 7ff068bb..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/3308f2d779874079b0e02ae206cf141bwb23ii2z52.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/3316070ce6bb49aab05776cd21d91b21pra6fxiblz.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/3316070ce6bb49aab05776cd21d91b21pra6fxiblz.png deleted file mode 100755 index 124dd81a..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/3316070ce6bb49aab05776cd21d91b21pra6fxiblz.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/33a35c7b85de4fec8ed148fc6f3e8e670itip8qtor.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/33a35c7b85de4fec8ed148fc6f3e8e670itip8qtor.png deleted file mode 100755 index 3a1088f4..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/33a35c7b85de4fec8ed148fc6f3e8e670itip8qtor.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/33d6b8f635384c85abf8912771dd89c5gf0qu8zfk9.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/33d6b8f635384c85abf8912771dd89c5gf0qu8zfk9.png deleted file mode 100755 index 6e5fcc43..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/33d6b8f635384c85abf8912771dd89c5gf0qu8zfk9.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/354c461aab964049b3d276a8588977a8ugvejjqbox.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/354c461aab964049b3d276a8588977a8ugvejjqbox.png deleted file mode 100755 index 7d3c8866..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/354c461aab964049b3d276a8588977a8ugvejjqbox.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/3598e8d0aa3f4bf1b61140daa0e36300k0te4s6z3j.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/3598e8d0aa3f4bf1b61140daa0e36300k0te4s6z3j.jpg deleted file mode 100755 index 979920ea..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/3598e8d0aa3f4bf1b61140daa0e36300k0te4s6z3j.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/367026e6e99a4bd490b6a424e921b3d4ymiteod2gx.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/367026e6e99a4bd490b6a424e921b3d4ymiteod2gx.png deleted file mode 100755 index 7325d21e..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/367026e6e99a4bd490b6a424e921b3d4ymiteod2gx.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/37382cca048b4011bdbacd3cbbe0814daw1o5x0tco.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/37382cca048b4011bdbacd3cbbe0814daw1o5x0tco.jpg deleted file mode 100644 index 18da489f..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/37382cca048b4011bdbacd3cbbe0814daw1o5x0tco.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/37901b98fba74345ad0e8a575999ad09n9d3winw2c.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/37901b98fba74345ad0e8a575999ad09n9d3winw2c.jpg deleted file mode 100755 index 1720f02f..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/37901b98fba74345ad0e8a575999ad09n9d3winw2c.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/3a21cc3f53444cd98078c5244a9472ac7r8mnpdj19.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/3a21cc3f53444cd98078c5244a9472ac7r8mnpdj19.png deleted file mode 100755 index ede80a34..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/3a21cc3f53444cd98078c5244a9472ac7r8mnpdj19.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/3a395df3d79a40a08cbc938c35e2dc35b84sujo2yn.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/3a395df3d79a40a08cbc938c35e2dc35b84sujo2yn.png deleted file mode 100755 index 5eb3b11f..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/3a395df3d79a40a08cbc938c35e2dc35b84sujo2yn.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/3ab2dae5527742319ae003c58cca264duewwp3esg8.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/3ab2dae5527742319ae003c58cca264duewwp3esg8.png deleted file mode 100755 index bf678568..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/3ab2dae5527742319ae003c58cca264duewwp3esg8.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/3c31dd504b0e440f9f3dafd7b4fb660cu1i58m9n65.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/3c31dd504b0e440f9f3dafd7b4fb660cu1i58m9n65.png deleted file mode 100755 index 9b771286..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/3c31dd504b0e440f9f3dafd7b4fb660cu1i58m9n65.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/3dac9309ddfd46b08f67e4b1a2bf08d3bf2mp09gow.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/3dac9309ddfd46b08f67e4b1a2bf08d3bf2mp09gow.png deleted file mode 100755 index e7f57e10..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/3dac9309ddfd46b08f67e4b1a2bf08d3bf2mp09gow.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/3eca7ab31b22479e80338e0a34cfaa3e5ikbs03gxz.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/3eca7ab31b22479e80338e0a34cfaa3e5ikbs03gxz.png deleted file mode 100755 index 2659e155..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/3eca7ab31b22479e80338e0a34cfaa3e5ikbs03gxz.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/3ed152917e3f4f7faa9414050b6cab49vuadulntb8.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/3ed152917e3f4f7faa9414050b6cab49vuadulntb8.jpg deleted file mode 100644 index 279623af..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/3ed152917e3f4f7faa9414050b6cab49vuadulntb8.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/40965a4dc1504b1fb360a942380996ee11bsimpqs3.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/40965a4dc1504b1fb360a942380996ee11bsimpqs3.png deleted file mode 100755 index ff6469f5..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/40965a4dc1504b1fb360a942380996ee11bsimpqs3.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/41622a74c8944f6cb7afac2e1d09da22wwjweacn72.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/41622a74c8944f6cb7afac2e1d09da22wwjweacn72.png deleted file mode 100755 index fa980e37..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/41622a74c8944f6cb7afac2e1d09da22wwjweacn72.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/418c7649b2b646f4a13dd6f335ae927426354rq62r.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/418c7649b2b646f4a13dd6f335ae927426354rq62r.png deleted file mode 100755 index 1ba14c34..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/418c7649b2b646f4a13dd6f335ae927426354rq62r.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/432cb941d4f64f4c88d2d3a8b784f282kqlp2cu55l.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/432cb941d4f64f4c88d2d3a8b784f282kqlp2cu55l.jpg deleted file mode 100755 index 27c5a24e..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/432cb941d4f64f4c88d2d3a8b784f282kqlp2cu55l.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/4336d25a226a4df1913369fd82ec8c53mre4nruc5s.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/4336d25a226a4df1913369fd82ec8c53mre4nruc5s.png deleted file mode 100755 index 9aa8d75a..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/4336d25a226a4df1913369fd82ec8c53mre4nruc5s.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/4410717d904943c6833933be3631787a7rva238ji2.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/4410717d904943c6833933be3631787a7rva238ji2.png deleted file mode 100755 index 13a952c5..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/4410717d904943c6833933be3631787a7rva238ji2.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/44bbd14303764d49a034ae51550a8452caek7lc1ch.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/44bbd14303764d49a034ae51550a8452caek7lc1ch.png deleted file mode 100755 index 2c8f8260..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/44bbd14303764d49a034ae51550a8452caek7lc1ch.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/469a3189a95643a8851d4158eb7ff606vs6efrhkrc.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/469a3189a95643a8851d4158eb7ff606vs6efrhkrc.png deleted file mode 100644 index e0596951..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/469a3189a95643a8851d4158eb7ff606vs6efrhkrc.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/46d9b5a7e9e24fceb31c80eb6f31e2c7u4birl7vr1.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/46d9b5a7e9e24fceb31c80eb6f31e2c7u4birl7vr1.png deleted file mode 100755 index 7a669f1b..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/46d9b5a7e9e24fceb31c80eb6f31e2c7u4birl7vr1.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/4811fe50a33f48309337e67c3d36318exseuh6qys6.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/4811fe50a33f48309337e67c3d36318exseuh6qys6.jpg deleted file mode 100755 index 838b68a8..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/4811fe50a33f48309337e67c3d36318exseuh6qys6.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/488a6dd9c9954b5b995d96908ca5fdb9qw0hda3qr8.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/488a6dd9c9954b5b995d96908ca5fdb9qw0hda3qr8.jpg deleted file mode 100755 index 1b9ed72e..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/488a6dd9c9954b5b995d96908ca5fdb9qw0hda3qr8.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/49ae68efce4848a185a8ddcb4e5c95a2zl2dlwi77v.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/49ae68efce4848a185a8ddcb4e5c95a2zl2dlwi77v.jpg deleted file mode 100644 index 3087c006..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/49ae68efce4848a185a8ddcb4e5c95a2zl2dlwi77v.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/4bdd334e3b084908ae56b7ce1e576204a43i68txom.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/4bdd334e3b084908ae56b7ce1e576204a43i68txom.jpg deleted file mode 100755 index e2d2c1cc..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/4bdd334e3b084908ae56b7ce1e576204a43i68txom.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/4bedfd95c947443685603bf08bae6947aw468cpz1y.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/4bedfd95c947443685603bf08bae6947aw468cpz1y.png deleted file mode 100755 index dbd11980..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/4bedfd95c947443685603bf08bae6947aw468cpz1y.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/4d6a7711c889409c92eaf580f62b90ca0f92wo6cz2.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/4d6a7711c889409c92eaf580f62b90ca0f92wo6cz2.png deleted file mode 100755 index 1f1f36da..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/4d6a7711c889409c92eaf580f62b90ca0f92wo6cz2.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/50b4a853b4aa41a9bc8125ac2c2ae3e8in85dafiwk.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/50b4a853b4aa41a9bc8125ac2c2ae3e8in85dafiwk.png deleted file mode 100755 index 7595addc..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/50b4a853b4aa41a9bc8125ac2c2ae3e8in85dafiwk.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/51c3c432ff5147fcb3b749af0404d7a783yc148lho.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/51c3c432ff5147fcb3b749af0404d7a783yc148lho.png deleted file mode 100755 index e0fdd07b..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/51c3c432ff5147fcb3b749af0404d7a783yc148lho.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/5267cf5c9aad49fa8b2699fe9c5344bbsw99nmba85.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/5267cf5c9aad49fa8b2699fe9c5344bbsw99nmba85.png deleted file mode 100755 index dd982b30..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/5267cf5c9aad49fa8b2699fe9c5344bbsw99nmba85.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/5407cb9947bc4b5fbca0a51653bee42c1m8uj2y4zr.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/5407cb9947bc4b5fbca0a51653bee42c1m8uj2y4zr.png deleted file mode 100755 index 3d39b2d1..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/5407cb9947bc4b5fbca0a51653bee42c1m8uj2y4zr.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/5409e5e504444752bb5c1076036ab7b44xcyhrtplk.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/5409e5e504444752bb5c1076036ab7b44xcyhrtplk.png deleted file mode 100755 index 0170fa73..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/5409e5e504444752bb5c1076036ab7b44xcyhrtplk.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/5486775d8cad4fd8adfc254d2e93857cn0wu5hq8f4.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/5486775d8cad4fd8adfc254d2e93857cn0wu5hq8f4.jpg deleted file mode 100644 index 663cd0a8..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/5486775d8cad4fd8adfc254d2e93857cn0wu5hq8f4.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/54d7a09f1dee463fa12ec01c02294b31z66prnux9w.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/54d7a09f1dee463fa12ec01c02294b31z66prnux9w.png deleted file mode 100755 index a38e0992..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/54d7a09f1dee463fa12ec01c02294b31z66prnux9w.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/55014ffb17b74d039b5670298e1047fcyw64lmyzlj.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/55014ffb17b74d039b5670298e1047fcyw64lmyzlj.jpg deleted file mode 100755 index d9a0e88e..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/55014ffb17b74d039b5670298e1047fcyw64lmyzlj.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/568f2d58e43a4dd9bae304e2112025bben74m2lpt9.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/568f2d58e43a4dd9bae304e2112025bben74m2lpt9.png deleted file mode 100755 index d070c925..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/568f2d58e43a4dd9bae304e2112025bben74m2lpt9.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/57a8dcf4457449dfb972b5beb015c053wxz70rjrsr.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/57a8dcf4457449dfb972b5beb015c053wxz70rjrsr.png deleted file mode 100755 index 8c86a155..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/57a8dcf4457449dfb972b5beb015c053wxz70rjrsr.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/58560559042841a498dc9a3ea975f3d2baabqbl1tp.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/58560559042841a498dc9a3ea975f3d2baabqbl1tp.png deleted file mode 100755 index 33342b90..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/58560559042841a498dc9a3ea975f3d2baabqbl1tp.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/5b40f7bd71f64931b30c38fa97631e7840rlio3vo2.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/5b40f7bd71f64931b30c38fa97631e7840rlio3vo2.jpg deleted file mode 100755 index 948eca74..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/5b40f7bd71f64931b30c38fa97631e7840rlio3vo2.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/5b4c2373aee143c79a2cda64c030e452vc2uhsxy3q.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/5b4c2373aee143c79a2cda64c030e452vc2uhsxy3q.png deleted file mode 100755 index 62fae53f..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/5b4c2373aee143c79a2cda64c030e452vc2uhsxy3q.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/5d6617d3440c4d67802fdf064b77b471qzfen9343d.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/5d6617d3440c4d67802fdf064b77b471qzfen9343d.png deleted file mode 100755 index e8eba441..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/5d6617d3440c4d67802fdf064b77b471qzfen9343d.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/5f08b84f574045da85e27548c5728ea3iwwv9b54dw.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/5f08b84f574045da85e27548c5728ea3iwwv9b54dw.png deleted file mode 100755 index fb8cb511..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/5f08b84f574045da85e27548c5728ea3iwwv9b54dw.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/5f08bcbb6d1a47a0baa96abb9a3d32bbpyujua6ecm.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/5f08bcbb6d1a47a0baa96abb9a3d32bbpyujua6ecm.jpg deleted file mode 100755 index 8bf7b47f..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/5f08bcbb6d1a47a0baa96abb9a3d32bbpyujua6ecm.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/6080162a7ef54ef2b9331c39f8f5d9d8wxskm48zy9.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/6080162a7ef54ef2b9331c39f8f5d9d8wxskm48zy9.png deleted file mode 100755 index 667ac7a7..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/6080162a7ef54ef2b9331c39f8f5d9d8wxskm48zy9.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/60e1d297eb5a49bca13b92e2b0b411c2siripyrcu0.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/60e1d297eb5a49bca13b92e2b0b411c2siripyrcu0.jpg deleted file mode 100755 index 7f94b387..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/60e1d297eb5a49bca13b92e2b0b411c2siripyrcu0.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/62414c551db44169a6429c0dd3d162833o6e82okff.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/62414c551db44169a6429c0dd3d162833o6e82okff.jpg deleted file mode 100755 index b98f2bae..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/62414c551db44169a6429c0dd3d162833o6e82okff.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/62afae7a0cea4401b2286715b2a5f69dsegpwwtsx2.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/62afae7a0cea4401b2286715b2a5f69dsegpwwtsx2.png deleted file mode 100755 index 6c013996..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/62afae7a0cea4401b2286715b2a5f69dsegpwwtsx2.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/63969148b6c4447d918124fd810c1da5m2h9aiylly.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/63969148b6c4447d918124fd810c1da5m2h9aiylly.jpg deleted file mode 100644 index dce2e9c9..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/63969148b6c4447d918124fd810c1da5m2h9aiylly.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/641eaebe810141229997b6a44670aa481xly87j88i.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/641eaebe810141229997b6a44670aa481xly87j88i.png deleted file mode 100755 index 8ad6a610..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/641eaebe810141229997b6a44670aa481xly87j88i.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/64f4f919b9f848aabfbcf56ed4c9dc5b0cvem1g2f8.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/64f4f919b9f848aabfbcf56ed4c9dc5b0cvem1g2f8.png deleted file mode 100755 index a14c5cbb..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/64f4f919b9f848aabfbcf56ed4c9dc5b0cvem1g2f8.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/6513e472eafe457c8613d0bb119d0c101elrmgn5tk.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/6513e472eafe457c8613d0bb119d0c101elrmgn5tk.png deleted file mode 100755 index 0bc61c29..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/6513e472eafe457c8613d0bb119d0c101elrmgn5tk.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/67b2961431ae473d8c24029b3d53d32a6xf1nljtw3.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/67b2961431ae473d8c24029b3d53d32a6xf1nljtw3.png deleted file mode 100644 index 3672014a..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/67b2961431ae473d8c24029b3d53d32a6xf1nljtw3.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/67fdef82a1fe4262bfb20f593860c948kw3oz1i8oz.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/67fdef82a1fe4262bfb20f593860c948kw3oz1i8oz.png deleted file mode 100755 index 1e1fc96b..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/67fdef82a1fe4262bfb20f593860c948kw3oz1i8oz.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/6927a786cace49d394334f2b6f2924d895tbhihuwr.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/6927a786cace49d394334f2b6f2924d895tbhihuwr.png deleted file mode 100755 index 9195550b..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/6927a786cace49d394334f2b6f2924d895tbhihuwr.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/6ba5bf3b13c446cca8b703bf155ccc9362b0gvz1rc.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/6ba5bf3b13c446cca8b703bf155ccc9362b0gvz1rc.png deleted file mode 100755 index 47662c47..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/6ba5bf3b13c446cca8b703bf155ccc9362b0gvz1rc.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/6c266c40bd5e4ff8bb574fcecb2156feklz8uzymox.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/6c266c40bd5e4ff8bb574fcecb2156feklz8uzymox.png deleted file mode 100755 index 1ac64cbd..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/6c266c40bd5e4ff8bb574fcecb2156feklz8uzymox.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/6e188941ad2b4c19a20b04316bb76c4636w09b1ghb.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/6e188941ad2b4c19a20b04316bb76c4636w09b1ghb.png deleted file mode 100755 index e8d9400c..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/6e188941ad2b4c19a20b04316bb76c4636w09b1ghb.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/6f599b7d21bf49dc9f93d6d1a1ef56e8hvyv1b4q5s.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/6f599b7d21bf49dc9f93d6d1a1ef56e8hvyv1b4q5s.png deleted file mode 100755 index abf85df0..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/6f599b7d21bf49dc9f93d6d1a1ef56e8hvyv1b4q5s.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/6f98afe5e63d4626a20ed710dc380d5bmc5a0w5phh.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/6f98afe5e63d4626a20ed710dc380d5bmc5a0w5phh.png deleted file mode 100755 index 6437de9b..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/6f98afe5e63d4626a20ed710dc380d5bmc5a0w5phh.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/6fcb5bd8f5dd4ba3a485e572de6b22b6bnt364bw4z.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/6fcb5bd8f5dd4ba3a485e572de6b22b6bnt364bw4z.png deleted file mode 100755 index 074f0793..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/6fcb5bd8f5dd4ba3a485e572de6b22b6bnt364bw4z.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/71b89c4f080948a981e06c6ba748c5e1x9mfhpzhfd.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/71b89c4f080948a981e06c6ba748c5e1x9mfhpzhfd.png deleted file mode 100755 index af711425..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/71b89c4f080948a981e06c6ba748c5e1x9mfhpzhfd.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/723c114372764a8d8344ffaf1606eea19m9rxjx1vf.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/723c114372764a8d8344ffaf1606eea19m9rxjx1vf.png deleted file mode 100755 index ac87689c..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/723c114372764a8d8344ffaf1606eea19m9rxjx1vf.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/73f05211b4e74783892c868ea168e16drvd0kxau4h.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/73f05211b4e74783892c868ea168e16drvd0kxau4h.png deleted file mode 100755 index 19b3a3de..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/73f05211b4e74783892c868ea168e16drvd0kxau4h.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/73f9c6c1b14445b5bb477e8c05d8a2763sfij1gamk.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/73f9c6c1b14445b5bb477e8c05d8a2763sfij1gamk.jpg deleted file mode 100755 index 17a7f0ea..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/73f9c6c1b14445b5bb477e8c05d8a2763sfij1gamk.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/7486f062431740098cb0923fec8d42f1pv9kxnbiag.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/7486f062431740098cb0923fec8d42f1pv9kxnbiag.png deleted file mode 100755 index 5b3f645d..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/7486f062431740098cb0923fec8d42f1pv9kxnbiag.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/74e6bf23d0284c22ac1ca7837a3927ea5mej4ww8aa.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/74e6bf23d0284c22ac1ca7837a3927ea5mej4ww8aa.jpg deleted file mode 100755 index edd19ecb..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/74e6bf23d0284c22ac1ca7837a3927ea5mej4ww8aa.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/750c33dcdf134878ba1024c8828a191ardbxljb5qf.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/750c33dcdf134878ba1024c8828a191ardbxljb5qf.png deleted file mode 100755 index c3d6cb69..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/750c33dcdf134878ba1024c8828a191ardbxljb5qf.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/77ac54ce5f514ebbb89854f927f2a891dzefr2qxmh.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/77ac54ce5f514ebbb89854f927f2a891dzefr2qxmh.png deleted file mode 100755 index beacfa78..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/77ac54ce5f514ebbb89854f927f2a891dzefr2qxmh.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/7824e193be8b4b29a0d895b15ad429b1z5l6m2hkvv.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/7824e193be8b4b29a0d895b15ad429b1z5l6m2hkvv.png deleted file mode 100755 index a2b15c8d..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/7824e193be8b4b29a0d895b15ad429b1z5l6m2hkvv.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/78ab644d84bc4e858adf6b4f83774125p0uz4p70sb.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/78ab644d84bc4e858adf6b4f83774125p0uz4p70sb.png deleted file mode 100755 index 493ba043..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/78ab644d84bc4e858adf6b4f83774125p0uz4p70sb.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/7965c1d75e9d4a689f09ecb207468468icfybjk9g9.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/7965c1d75e9d4a689f09ecb207468468icfybjk9g9.png deleted file mode 100755 index cf04f285..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/7965c1d75e9d4a689f09ecb207468468icfybjk9g9.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/7a0ce84c43fd470e8f960a6c463ffb98npn9grvkpb.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/7a0ce84c43fd470e8f960a6c463ffb98npn9grvkpb.png deleted file mode 100755 index 93c7e28c..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/7a0ce84c43fd470e8f960a6c463ffb98npn9grvkpb.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/7a6475bba07c47bb98e5db0e0d21c8ebq5sw2kijlc.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/7a6475bba07c47bb98e5db0e0d21c8ebq5sw2kijlc.jpg deleted file mode 100644 index 82375b38..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/7a6475bba07c47bb98e5db0e0d21c8ebq5sw2kijlc.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/7b93fd438d974bf2a7b999e2e3a24880ggis08twkr.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/7b93fd438d974bf2a7b999e2e3a24880ggis08twkr.png deleted file mode 100755 index cb81defe..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/7b93fd438d974bf2a7b999e2e3a24880ggis08twkr.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/7beeefdecba6465d93fae9ec9ae952bde1fprb1tqi.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/7beeefdecba6465d93fae9ec9ae952bde1fprb1tqi.jpg deleted file mode 100755 index 41e65e86..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/7beeefdecba6465d93fae9ec9ae952bde1fprb1tqi.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/7ccf9f4158794bf997d97b4e871dd34b4qy58l2fyg.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/7ccf9f4158794bf997d97b4e871dd34b4qy58l2fyg.png deleted file mode 100644 index 09321c1e..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/7ccf9f4158794bf997d97b4e871dd34b4qy58l2fyg.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/7de81090b87a4325a603e056a660c620q50t3etnee.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/7de81090b87a4325a603e056a660c620q50t3etnee.png deleted file mode 100755 index 9023cc3f..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/7de81090b87a4325a603e056a660c620q50t3etnee.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/7e1777f0b47b4a14952891aa4f1b8458hiyqi9zu5t.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/7e1777f0b47b4a14952891aa4f1b8458hiyqi9zu5t.png deleted file mode 100755 index 1f0e8e5d..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/7e1777f0b47b4a14952891aa4f1b8458hiyqi9zu5t.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/7ed93718dca04f9784517909f6bc4e2f8ee1idkw5m.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/7ed93718dca04f9784517909f6bc4e2f8ee1idkw5m.png deleted file mode 100755 index 1d018a8a..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/7ed93718dca04f9784517909f6bc4e2f8ee1idkw5m.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/800915654d504c4a8da14ab4771b0411146f3w26cg.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/800915654d504c4a8da14ab4771b0411146f3w26cg.jpg deleted file mode 100755 index 9eb71768..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/800915654d504c4a8da14ab4771b0411146f3w26cg.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/80a11304bac14a44aa95b841e0f104cdg9e6zqrnxq.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/80a11304bac14a44aa95b841e0f104cdg9e6zqrnxq.png deleted file mode 100755 index cc9c48b8..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/80a11304bac14a44aa95b841e0f104cdg9e6zqrnxq.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/83dace527287474c890d2cfbc43119f0bneqqh8l21.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/83dace527287474c890d2cfbc43119f0bneqqh8l21.png deleted file mode 100755 index 61c0c6e8..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/83dace527287474c890d2cfbc43119f0bneqqh8l21.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/84902bff7e5d4b09881b91b4a3d23b1bi0wwnljt9w.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/84902bff7e5d4b09881b91b4a3d23b1bi0wwnljt9w.png deleted file mode 100755 index 50771fb4..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/84902bff7e5d4b09881b91b4a3d23b1bi0wwnljt9w.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/8492febd4a4f4fbca9278e177ad85976518hamump8.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/8492febd4a4f4fbca9278e177ad85976518hamump8.png deleted file mode 100755 index 9e3498c3..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/8492febd4a4f4fbca9278e177ad85976518hamump8.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/84ed45fcdaf04ae3a53c9bc65f304fcepm3ioshj7j.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/84ed45fcdaf04ae3a53c9bc65f304fcepm3ioshj7j.png deleted file mode 100755 index f274e7eb..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/84ed45fcdaf04ae3a53c9bc65f304fcepm3ioshj7j.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/855c336f4cd84f3fb0bccae9d809365bpyfrc337l2.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/855c336f4cd84f3fb0bccae9d809365bpyfrc337l2.png deleted file mode 100755 index 3486cfe5..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/855c336f4cd84f3fb0bccae9d809365bpyfrc337l2.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/85b457e6ed29491e98e1789a96a00353bs4cpvc7we.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/85b457e6ed29491e98e1789a96a00353bs4cpvc7we.png deleted file mode 100755 index cdb5e260..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/85b457e6ed29491e98e1789a96a00353bs4cpvc7we.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/86f83bdc35534eeda2fb4daeb51dbb28pizkxqnzap.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/86f83bdc35534eeda2fb4daeb51dbb28pizkxqnzap.jpg deleted file mode 100755 index 69fc1230..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/86f83bdc35534eeda2fb4daeb51dbb28pizkxqnzap.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/886e04146694474c966d346222fe2897ealwo6qycj.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/886e04146694474c966d346222fe2897ealwo6qycj.png deleted file mode 100755 index dade5cd5..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/886e04146694474c966d346222fe2897ealwo6qycj.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/88cea6884f5e4ae48b8e407266fc03dbnqk5y6cdcv.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/88cea6884f5e4ae48b8e407266fc03dbnqk5y6cdcv.jpg deleted file mode 100644 index 3767f562..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/88cea6884f5e4ae48b8e407266fc03dbnqk5y6cdcv.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/892a81babb06410389df6ca54da57390wfl75dlpx9.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/892a81babb06410389df6ca54da57390wfl75dlpx9.png deleted file mode 100755 index 7413a6ed..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/892a81babb06410389df6ca54da57390wfl75dlpx9.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/8bb005bbf2fe4a168ed4c938063a1a6bgnj6w42pyb.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/8bb005bbf2fe4a168ed4c938063a1a6bgnj6w42pyb.png deleted file mode 100755 index 67c9c8a2..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/8bb005bbf2fe4a168ed4c938063a1a6bgnj6w42pyb.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/8bf3c1a3c2284ef5b29ab6e320d2baf2lzw5pxuw1j.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/8bf3c1a3c2284ef5b29ab6e320d2baf2lzw5pxuw1j.png deleted file mode 100755 index 36913442..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/8bf3c1a3c2284ef5b29ab6e320d2baf2lzw5pxuw1j.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/8c9a5bfa049d4c56817318cd5ff405507t3jozdncn.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/8c9a5bfa049d4c56817318cd5ff405507t3jozdncn.png deleted file mode 100755 index 22618dd2..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/8c9a5bfa049d4c56817318cd5ff405507t3jozdncn.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/8cf2817ac6ca4deb8ee956661e4ffd16m2u1lto2nu.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/8cf2817ac6ca4deb8ee956661e4ffd16m2u1lto2nu.png deleted file mode 100755 index 317699f9..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/8cf2817ac6ca4deb8ee956661e4ffd16m2u1lto2nu.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/8cf6cd4fd29c4a59a094ba028c8f3f4czyd21fctzc.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/8cf6cd4fd29c4a59a094ba028c8f3f4czyd21fctzc.png deleted file mode 100755 index 9198d1a2..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/8cf6cd4fd29c4a59a094ba028c8f3f4czyd21fctzc.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/8e03c0c2e4044c05a2c20e858945a2743nhibwclel.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/8e03c0c2e4044c05a2c20e858945a2743nhibwclel.png deleted file mode 100755 index 75427eed..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/8e03c0c2e4044c05a2c20e858945a2743nhibwclel.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/8e30a0b2fc0f4c19a14b5dea9d3f3e1ancrlbopakw.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/8e30a0b2fc0f4c19a14b5dea9d3f3e1ancrlbopakw.png deleted file mode 100755 index 1b80a4e8..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/8e30a0b2fc0f4c19a14b5dea9d3f3e1ancrlbopakw.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/8f9eca84e2b14752ad4afb1ab8d06974xua9ambm9y.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/8f9eca84e2b14752ad4afb1ab8d06974xua9ambm9y.jpg deleted file mode 100755 index 6f4b2642..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/8f9eca84e2b14752ad4afb1ab8d06974xua9ambm9y.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/907de1e2b8b048da9e75cfe48f27aaab42n9a7n2jr.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/907de1e2b8b048da9e75cfe48f27aaab42n9a7n2jr.png deleted file mode 100755 index 55a8b772..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/907de1e2b8b048da9e75cfe48f27aaab42n9a7n2jr.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/927222f030f146228d323c4af9d697c1ayirgv5ibc.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/927222f030f146228d323c4af9d697c1ayirgv5ibc.png deleted file mode 100755 index c1e8c9ea..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/927222f030f146228d323c4af9d697c1ayirgv5ibc.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/92f685f8a6044ec2a26a5901514fddb0qt5ygurp30.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/92f685f8a6044ec2a26a5901514fddb0qt5ygurp30.png deleted file mode 100755 index f8815a5a..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/92f685f8a6044ec2a26a5901514fddb0qt5ygurp30.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/956f4534d22343a88e860a1779c69afcboynkm8plz.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/956f4534d22343a88e860a1779c69afcboynkm8plz.png deleted file mode 100755 index 3c229e68..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/956f4534d22343a88e860a1779c69afcboynkm8plz.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/9612dab3a9ec44278dc5069c3d484f9388l25e3lxk.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/9612dab3a9ec44278dc5069c3d484f9388l25e3lxk.jpg deleted file mode 100755 index 57dcbe6f..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/9612dab3a9ec44278dc5069c3d484f9388l25e3lxk.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/961eeb398bae4e60a520d5abf04f02335vlh98hjuc.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/961eeb398bae4e60a520d5abf04f02335vlh98hjuc.png deleted file mode 100755 index ee53f821..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/961eeb398bae4e60a520d5abf04f02335vlh98hjuc.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/96cff8171dc8423ebd23559d0b14c8e8mv9d8a0iqw.gif b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/96cff8171dc8423ebd23559d0b14c8e8mv9d8a0iqw.gif deleted file mode 100644 index e2d254a7..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/96cff8171dc8423ebd23559d0b14c8e8mv9d8a0iqw.gif and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/980ef8cc00504f15af77712bf1cdde72yc273lnpt3.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/980ef8cc00504f15af77712bf1cdde72yc273lnpt3.jpg deleted file mode 100755 index 6d1ce5c9..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/980ef8cc00504f15af77712bf1cdde72yc273lnpt3.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/9ac69cbe9da4459db264b1902ff6f693spomyy6lkw.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/9ac69cbe9da4459db264b1902ff6f693spomyy6lkw.png deleted file mode 100755 index 512a327e..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/9ac69cbe9da4459db264b1902ff6f693spomyy6lkw.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/9b50f61c6ff748f0b491b971fe9b9d105p0d1echuu.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/9b50f61c6ff748f0b491b971fe9b9d105p0d1echuu.png deleted file mode 100755 index bbc02f2e..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/9b50f61c6ff748f0b491b971fe9b9d105p0d1echuu.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/9b7ccec87366454098153196b5ab091cqhibrmf8c5.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/9b7ccec87366454098153196b5ab091cqhibrmf8c5.png deleted file mode 100755 index 0223d14a..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/9b7ccec87366454098153196b5ab091cqhibrmf8c5.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/9bd5d3800bc34ace8e980251dd40bbf2ma64ym9653.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/9bd5d3800bc34ace8e980251dd40bbf2ma64ym9653.png deleted file mode 100755 index 1f50e5ae..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/9bd5d3800bc34ace8e980251dd40bbf2ma64ym9653.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/9d95f61a5db84591972fbc90f31c1fb21g5krqax8i.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/9d95f61a5db84591972fbc90f31c1fb21g5krqax8i.jpg deleted file mode 100755 index 58c0a89c..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/9d95f61a5db84591972fbc90f31c1fb21g5krqax8i.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/9dcafbf40f4a43909ef991338583e633qh2zl6rdwi.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/9dcafbf40f4a43909ef991338583e633qh2zl6rdwi.jpg deleted file mode 100755 index 0698838d..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/9dcafbf40f4a43909ef991338583e633qh2zl6rdwi.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/9deb872da95c42d2bf8c432075153b1egrrxlb666p.gif b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/9deb872da95c42d2bf8c432075153b1egrrxlb666p.gif deleted file mode 100644 index d79f826f..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/9deb872da95c42d2bf8c432075153b1egrrxlb666p.gif and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/9e97ddf78f804d50b985bdcf666478ebj76hbf3gpp.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/9e97ddf78f804d50b985bdcf666478ebj76hbf3gpp.jpg deleted file mode 100755 index d26bb753..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/9e97ddf78f804d50b985bdcf666478ebj76hbf3gpp.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/9efdb0a56b6643b8b4a42f7586b5a731bv3ouokg2s.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/9efdb0a56b6643b8b4a42f7586b5a731bv3ouokg2s.png deleted file mode 100755 index bb320920..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/9efdb0a56b6643b8b4a42f7586b5a731bv3ouokg2s.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/a1470da9ce7f44e3a0248f519b0b02844efygohg3b.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/a1470da9ce7f44e3a0248f519b0b02844efygohg3b.png deleted file mode 100755 index 4854eb76..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/a1470da9ce7f44e3a0248f519b0b02844efygohg3b.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/a17a7ac2e489478e95ba16e250e997ae0uq5mmtuud.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/a17a7ac2e489478e95ba16e250e997ae0uq5mmtuud.png deleted file mode 100755 index 2f3421e2..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/a17a7ac2e489478e95ba16e250e997ae0uq5mmtuud.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/a1ec5b32c97143379648f46166547f092y57yxrs9l.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/a1ec5b32c97143379648f46166547f092y57yxrs9l.png deleted file mode 100755 index ae3a59d0..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/a1ec5b32c97143379648f46166547f092y57yxrs9l.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/a272fcefed804cf2b1e6785d5662c29ejqjxha0eow.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/a272fcefed804cf2b1e6785d5662c29ejqjxha0eow.jpg deleted file mode 100755 index 6b049a8e..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/a272fcefed804cf2b1e6785d5662c29ejqjxha0eow.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/a2de0cb2c98e4c75be050949c4ffd602fvi2dw8tvl.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/a2de0cb2c98e4c75be050949c4ffd602fvi2dw8tvl.png deleted file mode 100755 index 03a6d908..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/a2de0cb2c98e4c75be050949c4ffd602fvi2dw8tvl.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/a498ea7fd9f74c4f812518c40c93fa79gtx5zeq28l.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/a498ea7fd9f74c4f812518c40c93fa79gtx5zeq28l.png deleted file mode 100755 index fe8f3532..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/a498ea7fd9f74c4f812518c40c93fa79gtx5zeq28l.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/a574f30b250941a7b3c0dd534e89df348n7shpz7t1.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/a574f30b250941a7b3c0dd534e89df348n7shpz7t1.png deleted file mode 100755 index 07fc01c3..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/a574f30b250941a7b3c0dd534e89df348n7shpz7t1.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/aaaa1ea4a9f64baabc08b7a30205e720qazetub0ha.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/aaaa1ea4a9f64baabc08b7a30205e720qazetub0ha.png deleted file mode 100755 index ae06b9ea..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/aaaa1ea4a9f64baabc08b7a30205e720qazetub0ha.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/aaee8de98d1b4e62961cceb35f9ea627j69xdnj980.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/aaee8de98d1b4e62961cceb35f9ea627j69xdnj980.png deleted file mode 100755 index a876c424..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/aaee8de98d1b4e62961cceb35f9ea627j69xdnj980.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/acbb97c8b30e4c63ae92a81f8679ab06uib5yau47a.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/acbb97c8b30e4c63ae92a81f8679ab06uib5yau47a.png deleted file mode 100755 index 02372bac..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/acbb97c8b30e4c63ae92a81f8679ab06uib5yau47a.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/ae020f17148b4cc19bcab221c0836dd1iy0vrck2jm.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/ae020f17148b4cc19bcab221c0836dd1iy0vrck2jm.png deleted file mode 100755 index 7602bdc5..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/ae020f17148b4cc19bcab221c0836dd1iy0vrck2jm.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/aeb852fe04e946fbaf8f166234d2984blhbejw91jj.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/aeb852fe04e946fbaf8f166234d2984blhbejw91jj.png deleted file mode 100755 index 81ce2b26..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/aeb852fe04e946fbaf8f166234d2984blhbejw91jj.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/afd2e837f9fe40e8998a9f3c37fb4d9cvnz3qsdfl2.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/afd2e837f9fe40e8998a9f3c37fb4d9cvnz3qsdfl2.png deleted file mode 100755 index 0757f12d..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/afd2e837f9fe40e8998a9f3c37fb4d9cvnz3qsdfl2.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/b4a1b5595add488db6a1a16c2dd45ec8lp8en2gask.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/b4a1b5595add488db6a1a16c2dd45ec8lp8en2gask.png deleted file mode 100755 index 3992dc26..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/b4a1b5595add488db6a1a16c2dd45ec8lp8en2gask.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/b531cf7e4c274afba6eac070c7bd6944jcc3suaufz.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/b531cf7e4c274afba6eac070c7bd6944jcc3suaufz.png deleted file mode 100755 index a36e51fc..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/b531cf7e4c274afba6eac070c7bd6944jcc3suaufz.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/b73c648fb7fd45cf8782e4ca0bc28a42s2a8dpad2x.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/b73c648fb7fd45cf8782e4ca0bc28a42s2a8dpad2x.png deleted file mode 100755 index 19420363..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/b73c648fb7fd45cf8782e4ca0bc28a42s2a8dpad2x.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/b7cc05160f3b4fa198a585042e7f3ac4yes1qlr9t8.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/b7cc05160f3b4fa198a585042e7f3ac4yes1qlr9t8.png deleted file mode 100755 index 0fe60169..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/b7cc05160f3b4fa198a585042e7f3ac4yes1qlr9t8.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/b96a241b6683440fb19d26ed90189273fyp23gsevb.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/b96a241b6683440fb19d26ed90189273fyp23gsevb.png deleted file mode 100755 index da49e45e..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/b96a241b6683440fb19d26ed90189273fyp23gsevb.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/b9f86161d09a44d29f7e5083d402245321764lzsus.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/b9f86161d09a44d29f7e5083d402245321764lzsus.jpg deleted file mode 100755 index a73ed63c..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/b9f86161d09a44d29f7e5083d402245321764lzsus.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/ba989d05b48445ad86a92e288b589cd8h4el74dhj0.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/ba989d05b48445ad86a92e288b589cd8h4el74dhj0.png deleted file mode 100755 index 883548b8..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/ba989d05b48445ad86a92e288b589cd8h4el74dhj0.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/bafcd155124643c49fa9cc750d0190fa5iru6zsc8m.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/bafcd155124643c49fa9cc750d0190fa5iru6zsc8m.jpg deleted file mode 100755 index a1ffa6df..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/bafcd155124643c49fa9cc750d0190fa5iru6zsc8m.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/bcc7fb293bfb471cbbebfadd8e6c150ey9n8o2vsnu.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/bcc7fb293bfb471cbbebfadd8e6c150ey9n8o2vsnu.png deleted file mode 100755 index 4716ed0a..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/bcc7fb293bfb471cbbebfadd8e6c150ey9n8o2vsnu.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/bd0d22b653b247fa840542c7b7b79bdflj966ybw1e.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/bd0d22b653b247fa840542c7b7b79bdflj966ybw1e.png deleted file mode 100755 index 253aa52f..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/bd0d22b653b247fa840542c7b7b79bdflj966ybw1e.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/bd7232963bec41da8f483289dde3fdf2whx5dk3owb.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/bd7232963bec41da8f483289dde3fdf2whx5dk3owb.jpg deleted file mode 100755 index 6aa28e39..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/bd7232963bec41da8f483289dde3fdf2whx5dk3owb.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/be891e57d9a74f8291d41a30b1e6f49che4zty98dx.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/be891e57d9a74f8291d41a30b1e6f49che4zty98dx.png deleted file mode 100755 index db87431d..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/be891e57d9a74f8291d41a30b1e6f49che4zty98dx.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/bf4e33ad4e994c3fbb48aba8e81b3be3zme09wjvqa.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/bf4e33ad4e994c3fbb48aba8e81b3be3zme09wjvqa.png deleted file mode 100755 index 50771fb4..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/bf4e33ad4e994c3fbb48aba8e81b3be3zme09wjvqa.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/bfba48d86c4b49e19e01496ea3e24540chlmmft4o7.gif b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/bfba48d86c4b49e19e01496ea3e24540chlmmft4o7.gif deleted file mode 100755 index 9c4ab1c3..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/bfba48d86c4b49e19e01496ea3e24540chlmmft4o7.gif and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/c0db7c50e7024a5aaeefdae3bc192c5eerx8f25qrb.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/c0db7c50e7024a5aaeefdae3bc192c5eerx8f25qrb.png deleted file mode 100755 index e146b540..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/c0db7c50e7024a5aaeefdae3bc192c5eerx8f25qrb.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/c17d24b632b544828bd4c70744bc2931tmnu4ffkoj.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/c17d24b632b544828bd4c70744bc2931tmnu4ffkoj.png deleted file mode 100755 index 889dd6fb..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/c17d24b632b544828bd4c70744bc2931tmnu4ffkoj.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/c71d6b74594e4f47a986abda5d5bf983o4drst1ojf.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/c71d6b74594e4f47a986abda5d5bf983o4drst1ojf.png deleted file mode 100755 index fd1b11a6..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/c71d6b74594e4f47a986abda5d5bf983o4drst1ojf.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/c818e9b4038642ea9702712af7d2c7c280tw4wj8yo.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/c818e9b4038642ea9702712af7d2c7c280tw4wj8yo.png deleted file mode 100755 index 7bf03eae..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/c818e9b4038642ea9702712af7d2c7c280tw4wj8yo.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/c959d47d07a64b14843ba67dfa5b3fe6j2c32uq6h0.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/c959d47d07a64b14843ba67dfa5b3fe6j2c32uq6h0.png deleted file mode 100755 index e89d9903..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/c959d47d07a64b14843ba67dfa5b3fe6j2c32uq6h0.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/c9b53340cfdc488f9d52bf121b715d45v9h0uswomi.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/c9b53340cfdc488f9d52bf121b715d45v9h0uswomi.png deleted file mode 100755 index f2787367..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/c9b53340cfdc488f9d52bf121b715d45v9h0uswomi.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/ca4e301ed76a44f8aa23e70b7df107b8v26l2p79u3.gif b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/ca4e301ed76a44f8aa23e70b7df107b8v26l2p79u3.gif deleted file mode 100644 index 4a4c5ea8..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/ca4e301ed76a44f8aa23e70b7df107b8v26l2p79u3.gif and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/cc016fa7d56d498d8cd767e6d0e0c5e8l34nugsvmi.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/cc016fa7d56d498d8cd767e6d0e0c5e8l34nugsvmi.png deleted file mode 100755 index ba2a71cd..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/cc016fa7d56d498d8cd767e6d0e0c5e8l34nugsvmi.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/cdce16eb7eba4346acb59c6d642e088f5cbhgz2yw9.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/cdce16eb7eba4346acb59c6d642e088f5cbhgz2yw9.png deleted file mode 100755 index 8a215764..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/cdce16eb7eba4346acb59c6d642e088f5cbhgz2yw9.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/cf5a4a7e233c4fe2bb9a554f74439921jcfgsu0dgg.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/cf5a4a7e233c4fe2bb9a554f74439921jcfgsu0dgg.png deleted file mode 100755 index f80e186d..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/cf5a4a7e233c4fe2bb9a554f74439921jcfgsu0dgg.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/d1c992690cf040d7bf87d7767f12ec9cks6in93p21.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/d1c992690cf040d7bf87d7767f12ec9cks6in93p21.png deleted file mode 100755 index 0d072592..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/d1c992690cf040d7bf87d7767f12ec9cks6in93p21.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/d287ad96e12e40fcbdb8e8608f69b03ebyh731wk9j.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/d287ad96e12e40fcbdb8e8608f69b03ebyh731wk9j.png deleted file mode 100755 index 6ec803b8..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/d287ad96e12e40fcbdb8e8608f69b03ebyh731wk9j.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/d2fff77310724a9999c1e0e97eac0b3830n6cpnhxp.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/d2fff77310724a9999c1e0e97eac0b3830n6cpnhxp.png deleted file mode 100755 index dafdd17b..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/d2fff77310724a9999c1e0e97eac0b3830n6cpnhxp.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/d4c7282740fb4e71bd2d7e80fad985d8o1wfu26pyd.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/d4c7282740fb4e71bd2d7e80fad985d8o1wfu26pyd.jpg deleted file mode 100755 index bc3ce214..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/d4c7282740fb4e71bd2d7e80fad985d8o1wfu26pyd.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/d8490798c1e141348c1ba3c109c26e18of6rw66y1f.gif b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/d8490798c1e141348c1ba3c109c26e18of6rw66y1f.gif deleted file mode 100755 index 107af4e7..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/d8490798c1e141348c1ba3c109c26e18of6rw66y1f.gif and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/d9253c01ace24140839435a81e045f1dko3od05i87.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/d9253c01ace24140839435a81e045f1dko3od05i87.png deleted file mode 100755 index a4b96cb1..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/d9253c01ace24140839435a81e045f1dko3od05i87.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/d9631b9c1b3641c4a0ab860a99e92d97nfwk9u6upj.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/d9631b9c1b3641c4a0ab860a99e92d97nfwk9u6upj.png deleted file mode 100755 index 25401f20..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/d9631b9c1b3641c4a0ab860a99e92d97nfwk9u6upj.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/d9dffd9eccbc40e0bc01553846c391b3vj8fuux52d.gif b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/d9dffd9eccbc40e0bc01553846c391b3vj8fuux52d.gif deleted file mode 100755 index bfdf4d11..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/d9dffd9eccbc40e0bc01553846c391b3vj8fuux52d.gif and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/dc9a2481719445d49f045bc18c265dccqww5ieybh3.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/dc9a2481719445d49f045bc18c265dccqww5ieybh3.jpg deleted file mode 100755 index 89b292e7..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/dc9a2481719445d49f045bc18c265dccqww5ieybh3.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/dd497d333f4541d7ae41b2c579706370jhp2x39yrg.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/dd497d333f4541d7ae41b2c579706370jhp2x39yrg.png deleted file mode 100755 index 819262e4..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/dd497d333f4541d7ae41b2c579706370jhp2x39yrg.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/dfa88bc269de407f95febe418269b65dlp2boy3pkr.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/dfa88bc269de407f95febe418269b65dlp2boy3pkr.png deleted file mode 100755 index 016d6cc6..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/dfa88bc269de407f95febe418269b65dlp2boy3pkr.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e0203b58c997468f928031df28b6a27acns5riul2t.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e0203b58c997468f928031df28b6a27acns5riul2t.png deleted file mode 100755 index 4ae92b23..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e0203b58c997468f928031df28b6a27acns5riul2t.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e07dda98525d4226818de310cb3c21ae6hg5f2sv5m.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e07dda98525d4226818de310cb3c21ae6hg5f2sv5m.png deleted file mode 100755 index 14a9ec85..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e07dda98525d4226818de310cb3c21ae6hg5f2sv5m.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e14049cfd2a3435abb4cdb938a52a3fbtd8uoupja1.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e14049cfd2a3435abb4cdb938a52a3fbtd8uoupja1.png deleted file mode 100755 index ffe65024..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e14049cfd2a3435abb4cdb938a52a3fbtd8uoupja1.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e46b09e6dd2944328426b32b7dceff92bhe08w4td0.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e46b09e6dd2944328426b32b7dceff92bhe08w4td0.png deleted file mode 100755 index f1768a7e..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e46b09e6dd2944328426b32b7dceff92bhe08w4td0.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e670a50e6c374f43abe6b61260ce0c33v1yf1aafwr.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e670a50e6c374f43abe6b61260ce0c33v1yf1aafwr.png deleted file mode 100755 index b26410af..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e670a50e6c374f43abe6b61260ce0c33v1yf1aafwr.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e739d5a88c2141a0b346e1bdb1d8e2dea6ktbegtad.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e739d5a88c2141a0b346e1bdb1d8e2dea6ktbegtad.png deleted file mode 100755 index 24e19a54..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e739d5a88c2141a0b346e1bdb1d8e2dea6ktbegtad.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e759d63f04b94689aaa6838c424e419cgcsk0dsagu.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e759d63f04b94689aaa6838c424e419cgcsk0dsagu.png deleted file mode 100755 index 5c71398b..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e759d63f04b94689aaa6838c424e419cgcsk0dsagu.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e78b705b1b2644c7a346faee51fcdd08qgtywp55en.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e78b705b1b2644c7a346faee51fcdd08qgtywp55en.png deleted file mode 100755 index e345cf2c..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e78b705b1b2644c7a346faee51fcdd08qgtywp55en.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e7e54160e9db4a9e814675763a80e58ce0j522s6ds.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e7e54160e9db4a9e814675763a80e58ce0j522s6ds.png deleted file mode 100755 index b2b9b3f5..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e7e54160e9db4a9e814675763a80e58ce0j522s6ds.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e8737e822d1c47a698b9ed16e4cd627aodkc2o145w.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e8737e822d1c47a698b9ed16e4cd627aodkc2o145w.png deleted file mode 100755 index 6c1c8938..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e8737e822d1c47a698b9ed16e4cd627aodkc2o145w.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e8c8ea8102524b8a9277d3ee623ac29dmvg2gsudr6.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e8c8ea8102524b8a9277d3ee623ac29dmvg2gsudr6.png deleted file mode 100755 index 1957aa51..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e8c8ea8102524b8a9277d3ee623ac29dmvg2gsudr6.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e91ccd7e37294221bfdb7b43a42d8ed5hghg7nw0qb.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e91ccd7e37294221bfdb7b43a42d8ed5hghg7nw0qb.jpg deleted file mode 100755 index ebd89c63..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e91ccd7e37294221bfdb7b43a42d8ed5hghg7nw0qb.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e97b753a3cf041169bae29045ff23d6a5g1vbrdgld.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e97b753a3cf041169bae29045ff23d6a5g1vbrdgld.png deleted file mode 100755 index 10d8f99c..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e97b753a3cf041169bae29045ff23d6a5g1vbrdgld.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e9b5981f0e82410da5dc83992b68289ekxngfwyuz0.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e9b5981f0e82410da5dc83992b68289ekxngfwyuz0.png deleted file mode 100755 index cdc4fdaf..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e9b5981f0e82410da5dc83992b68289ekxngfwyuz0.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e9d9bc38164f417b968d368d1158acf0sxq8tuqq5h.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e9d9bc38164f417b968d368d1158acf0sxq8tuqq5h.png deleted file mode 100755 index f9313ea8..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/e9d9bc38164f417b968d368d1158acf0sxq8tuqq5h.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/ea6b31f1839c42238ea1c129c1b4d5eaup7j6zz0so.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/ea6b31f1839c42238ea1c129c1b4d5eaup7j6zz0so.png deleted file mode 100755 index caa6e375..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/ea6b31f1839c42238ea1c129c1b4d5eaup7j6zz0so.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/ea80c26cfb3d441b9b6affd68c62acf5l3ncs7skt9.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/ea80c26cfb3d441b9b6affd68c62acf5l3ncs7skt9.jpg deleted file mode 100755 index 7ac40c23..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/ea80c26cfb3d441b9b6affd68c62acf5l3ncs7skt9.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/eaec5b3bf0a74de888cd55cfa3cb47ffa5y4mlsvzh.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/eaec5b3bf0a74de888cd55cfa3cb47ffa5y4mlsvzh.png deleted file mode 100755 index 75e52cba..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/eaec5b3bf0a74de888cd55cfa3cb47ffa5y4mlsvzh.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/eb26223281aa454389c735726790a415abrhvrtq4y.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/eb26223281aa454389c735726790a415abrhvrtq4y.png deleted file mode 100755 index f93968a7..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/eb26223281aa454389c735726790a415abrhvrtq4y.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/ebf72b915ecc4deab71c353b62ce7de9d0uv4lgzwz.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/ebf72b915ecc4deab71c353b62ce7de9d0uv4lgzwz.png deleted file mode 100755 index e14d259d..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/ebf72b915ecc4deab71c353b62ce7de9d0uv4lgzwz.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/ec49b431bee545e09abc3dc294d1e54669dtn9bvuy.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/ec49b431bee545e09abc3dc294d1e54669dtn9bvuy.png deleted file mode 100755 index 863159f9..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/ec49b431bee545e09abc3dc294d1e54669dtn9bvuy.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/ec5fbe4271674fba8873a45d6f767c98ygzcuucjsl.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/ec5fbe4271674fba8873a45d6f767c98ygzcuucjsl.png deleted file mode 100755 index 6151c8d9..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/ec5fbe4271674fba8873a45d6f767c98ygzcuucjsl.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/efbee20621ec424a983f45cfca57508bxitwgvu74n.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/efbee20621ec424a983f45cfca57508bxitwgvu74n.png deleted file mode 100755 index 7990611f..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/efbee20621ec424a983f45cfca57508bxitwgvu74n.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/f16789d76eab430e90de8ddbbf26b8362xifqs055m.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/f16789d76eab430e90de8ddbbf26b8362xifqs055m.png deleted file mode 100755 index 4ae92b23..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/f16789d76eab430e90de8ddbbf26b8362xifqs055m.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/f65b4fa1948a4dabbfc60a02aa8ca942bmxlxykd9i.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/f65b4fa1948a4dabbfc60a02aa8ca942bmxlxykd9i.png deleted file mode 100755 index a3f87180..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/f65b4fa1948a4dabbfc60a02aa8ca942bmxlxykd9i.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/f65ef5469f3a479497a710fb288d115cvl5imkvpo8.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/f65ef5469f3a479497a710fb288d115cvl5imkvpo8.jpg deleted file mode 100644 index 3194eede..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/f65ef5469f3a479497a710fb288d115cvl5imkvpo8.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/f71c687274cf42ed9757e5cf658cbfb9v1rgcok7j4.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/f71c687274cf42ed9757e5cf658cbfb9v1rgcok7j4.png deleted file mode 100755 index a03b50fe..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/f71c687274cf42ed9757e5cf658cbfb9v1rgcok7j4.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/f7d89b2f45d740e6b87cc0dc46356b21h0tn9ouid7.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/f7d89b2f45d740e6b87cc0dc46356b21h0tn9ouid7.png deleted file mode 100755 index bf57546f..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/f7d89b2f45d740e6b87cc0dc46356b21h0tn9ouid7.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/f8fa9ebb978f4564a1b6bdd145de5303fmswbc6mlr.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/f8fa9ebb978f4564a1b6bdd145de5303fmswbc6mlr.png deleted file mode 100755 index ef4dbb27..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/f8fa9ebb978f4564a1b6bdd145de5303fmswbc6mlr.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/f9e0a4939cb3484b9babfe72dc70cd7cqqexhsbdpu.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/f9e0a4939cb3484b9babfe72dc70cd7cqqexhsbdpu.png deleted file mode 100755 index 3dbd2210..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/f9e0a4939cb3484b9babfe72dc70cd7cqqexhsbdpu.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/f9ec9f03b8694a308b62f6158e5ccadb09fnoz19kc.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/f9ec9f03b8694a308b62f6158e5ccadb09fnoz19kc.png deleted file mode 100755 index 2351bbb5..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/f9ec9f03b8694a308b62f6158e5ccadb09fnoz19kc.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/fb364676ea364297b7441638f9e0f557dckg4t2rds.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/fb364676ea364297b7441638f9e0f557dckg4t2rds.jpg deleted file mode 100755 index 96272ede..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/fb364676ea364297b7441638f9e0f557dckg4t2rds.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/fc4be55bf8c8420f89db87cbe8c2a95fkpar5lv6tw.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/fc4be55bf8c8420f89db87cbe8c2a95fkpar5lv6tw.jpg deleted file mode 100755 index aae9de19..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/fc4be55bf8c8420f89db87cbe8c2a95fkpar5lv6tw.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/fef1aee22a04466d93693f5791d44bfd2rsm469mcr.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/fef1aee22a04466d93693f5791d44bfd2rsm469mcr.jpg deleted file mode 100644 index 936e3e8f..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/fef1aee22a04466d93693f5791d44bfd2rsm469mcr.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/ff3283593f0444da9038f578fff96bcfguve7bk9pf.png b/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/ff3283593f0444da9038f578fff96bcfguve7bk9pf.png deleted file mode 100755 index 73abadbf..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2021/12/25/ff3283593f0444da9038f578fff96bcfguve7bk9pf.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2023/02/23/1c0fa967eb764d918f064744cc51dc70a6f2bj3sha.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2023/02/23/1c0fa967eb764d918f064744cc51dc70a6f2bj3sha.jpg deleted file mode 100644 index 00239a77..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/maintain/2023/02/23/1c0fa967eb764d918f064744cc51dc70a6f2bj3sha.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/operation/2021/12/25/0427b90c74b64a03ae3e7e5c628ef7d69038aimgou.jpg b/crmeb/crmebimage/crmebimage/public/operation/2021/12/25/0427b90c74b64a03ae3e7e5c628ef7d69038aimgou.jpg deleted file mode 100644 index 1d5c158c..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/operation/2021/12/25/0427b90c74b64a03ae3e7e5c628ef7d69038aimgou.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/operation/2021/12/25/6d292f4a663a453e8bcc9410eda89db55z1vksp7fx.png b/crmeb/crmebimage/crmebimage/public/operation/2021/12/25/6d292f4a663a453e8bcc9410eda89db55z1vksp7fx.png deleted file mode 100644 index e0596951..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/operation/2021/12/25/6d292f4a663a453e8bcc9410eda89db55z1vksp7fx.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/0705b0fad3884eddb31745e453de6503atuqud1tr3.png b/crmeb/crmebimage/crmebimage/public/store/2021/12/25/0705b0fad3884eddb31745e453de6503atuqud1tr3.png deleted file mode 100755 index b63b9eb2..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/0705b0fad3884eddb31745e453de6503atuqud1tr3.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/090f2f83e9b343c38c7c7b4ebc860a352r8u8adjsq.png b/crmeb/crmebimage/crmebimage/public/store/2021/12/25/090f2f83e9b343c38c7c7b4ebc860a352r8u8adjsq.png deleted file mode 100755 index 596cb579..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/090f2f83e9b343c38c7c7b4ebc860a352r8u8adjsq.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/0e13333fdf2841a2a886a9595bebc855q5jgkr8b66.png b/crmeb/crmebimage/crmebimage/public/store/2021/12/25/0e13333fdf2841a2a886a9595bebc855q5jgkr8b66.png deleted file mode 100755 index 2b86192c..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/0e13333fdf2841a2a886a9595bebc855q5jgkr8b66.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/0f419f2a65844ae5a00c20e22dc9b92env32uvr4dy.png b/crmeb/crmebimage/crmebimage/public/store/2021/12/25/0f419f2a65844ae5a00c20e22dc9b92env32uvr4dy.png deleted file mode 100755 index 6cb7a24d..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/0f419f2a65844ae5a00c20e22dc9b92env32uvr4dy.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/1ccac5f9f62646ba930000ad70f741efpfgagvhrzh.png b/crmeb/crmebimage/crmebimage/public/store/2021/12/25/1ccac5f9f62646ba930000ad70f741efpfgagvhrzh.png deleted file mode 100755 index de36f6be..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/1ccac5f9f62646ba930000ad70f741efpfgagvhrzh.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/24119aa4d48e4c7a95b21ece82a41715uns67350bd.jpg b/crmeb/crmebimage/crmebimage/public/store/2021/12/25/24119aa4d48e4c7a95b21ece82a41715uns67350bd.jpg deleted file mode 100755 index 3087c006..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/24119aa4d48e4c7a95b21ece82a41715uns67350bd.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/476f2b8a50644f5f80124f831ac14aecct8ewiyvwf.png b/crmeb/crmebimage/crmebimage/public/store/2021/12/25/476f2b8a50644f5f80124f831ac14aecct8ewiyvwf.png deleted file mode 100755 index 50a1111c..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/476f2b8a50644f5f80124f831ac14aecct8ewiyvwf.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/489bd8c24e904f6d93a827ee0d051a52m796u5yxlu.jpeg b/crmeb/crmebimage/crmebimage/public/store/2021/12/25/489bd8c24e904f6d93a827ee0d051a52m796u5yxlu.jpeg deleted file mode 100644 index cb6d5c61..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/489bd8c24e904f6d93a827ee0d051a52m796u5yxlu.jpeg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/61bf8228d96b4c8c9343bc13b4e6fc67c0jmc2y781.png b/crmeb/crmebimage/crmebimage/public/store/2021/12/25/61bf8228d96b4c8c9343bc13b4e6fc67c0jmc2y781.png deleted file mode 100644 index 4e3ffe7d..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/61bf8228d96b4c8c9343bc13b4e6fc67c0jmc2y781.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/6246abff834b4d2fb1edad2a8927c8a3yes6irrqfw.png b/crmeb/crmebimage/crmebimage/public/store/2021/12/25/6246abff834b4d2fb1edad2a8927c8a3yes6irrqfw.png deleted file mode 100755 index 69022536..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/6246abff834b4d2fb1edad2a8927c8a3yes6irrqfw.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/7b4c8af47e414f62a5d7b26d95504cbafw13ela5i7.png b/crmeb/crmebimage/crmebimage/public/store/2021/12/25/7b4c8af47e414f62a5d7b26d95504cbafw13ela5i7.png deleted file mode 100755 index 46fab269..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/7b4c8af47e414f62a5d7b26d95504cbafw13ela5i7.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/8b665c20edef4d61a508de9395eb40c4ln34d0f3i5.png b/crmeb/crmebimage/crmebimage/public/store/2021/12/25/8b665c20edef4d61a508de9395eb40c4ln34d0f3i5.png deleted file mode 100755 index 6f51a5da..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/8b665c20edef4d61a508de9395eb40c4ln34d0f3i5.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/ae2a9db4d74a4a56bddb971d3df9e60fljwxe9z3lh.png b/crmeb/crmebimage/crmebimage/public/store/2021/12/25/ae2a9db4d74a4a56bddb971d3df9e60fljwxe9z3lh.png deleted file mode 100644 index 3cf5bf52..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/ae2a9db4d74a4a56bddb971d3df9e60fljwxe9z3lh.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/bf8bc87d525844b68ca17ca60c567233hkh2h9c2un.png b/crmeb/crmebimage/crmebimage/public/store/2021/12/25/bf8bc87d525844b68ca17ca60c567233hkh2h9c2un.png deleted file mode 100755 index de1669c4..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/bf8bc87d525844b68ca17ca60c567233hkh2h9c2un.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/d813cbdd98b148c99885652234ad43b1m1aewwn8wd.jpg b/crmeb/crmebimage/crmebimage/public/store/2021/12/25/d813cbdd98b148c99885652234ad43b1m1aewwn8wd.jpg deleted file mode 100755 index 830b4e05..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/d813cbdd98b148c99885652234ad43b1m1aewwn8wd.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/de35d545523448db9f3636e34ca085b29qw11rescg.png b/crmeb/crmebimage/crmebimage/public/store/2021/12/25/de35d545523448db9f3636e34ca085b29qw11rescg.png deleted file mode 100644 index 3c0698a3..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/de35d545523448db9f3636e34ca085b29qw11rescg.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/e7e312556bcb4084acf708f3a5210da7krs1pwq84o.jpg b/crmeb/crmebimage/crmebimage/public/store/2021/12/25/e7e312556bcb4084acf708f3a5210da7krs1pwq84o.jpg deleted file mode 100644 index 34f37ef3..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/e7e312556bcb4084acf708f3a5210da7krs1pwq84o.jpg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/ee26a9207f404a47851538c7dfd777a7ltlxg7tkrm.jpeg b/crmeb/crmebimage/crmebimage/public/store/2021/12/25/ee26a9207f404a47851538c7dfd777a7ltlxg7tkrm.jpeg deleted file mode 100644 index bada2630..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/ee26a9207f404a47851538c7dfd777a7ltlxg7tkrm.jpeg and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/ef98f38ef1cd4083a91fb62b1dd8362cmran1psnmc.png b/crmeb/crmebimage/crmebimage/public/store/2021/12/25/ef98f38ef1cd4083a91fb62b1dd8362cmran1psnmc.png deleted file mode 100755 index 1a30429e..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/ef98f38ef1cd4083a91fb62b1dd8362cmran1psnmc.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/f22830611d324e8fb10129e969f1ec661lcpu7346h.png b/crmeb/crmebimage/crmebimage/public/store/2021/12/25/f22830611d324e8fb10129e969f1ec661lcpu7346h.png deleted file mode 100755 index 96c3bbde..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/f22830611d324e8fb10129e969f1ec661lcpu7346h.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/fbc798bf3c91493f95c97be7d6cbaa5akhcpo5ent3.png b/crmeb/crmebimage/crmebimage/public/store/2021/12/25/fbc798bf3c91493f95c97be7d6cbaa5akhcpo5ent3.png deleted file mode 100755 index bde6950f..00000000 Binary files a/crmeb/crmebimage/crmebimage/public/store/2021/12/25/fbc798bf3c91493f95c97be7d6cbaa5akhcpo5ent3.png and /dev/null differ diff --git a/crmeb/crmebimage/crmebimage/官方社区@2x.jpg b/crmeb/crmebimage/crmebimage/官方社区@2x.jpg deleted file mode 100644 index 8400843d..00000000 Binary files a/crmeb/crmebimage/crmebimage/官方社区@2x.jpg and /dev/null differ diff --git a/crmeb/sql/Crmeb_1.3.4.sql b/crmeb/sql/Crmeb_1.3.4.sql deleted file mode 100644 index f31f95df..00000000 --- a/crmeb/sql/Crmeb_1.3.4.sql +++ /dev/null @@ -1,9031 +0,0 @@ -/** - 默认账号 - 管理端：admin / 123456 - 商城端：18292417675 / crmeb@123456 -*/ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - --- ---------------------------- --- Table structure for eb_article --- ---------------------------- -DROP TABLE IF EXISTS `eb_article`; -CREATE TABLE `eb_article` ( - `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '文章管理ID', - `cid` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '分类id', - `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '文章标题', - `author` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '文章作者', - `image_input` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '文章图片', - `synopsis` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '文章简介', - `share_title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '文章分享标题', - `share_synopsis` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '文章分享简介', - `visit` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '浏览次数', - `sort` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '排序', - `url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '原文链接', - `media_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '微信素材id', - `status` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '状态', - `hide` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否隐藏', - `admin_id` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '管理员id', - `mer_id` int(10) UNSIGNED NULL DEFAULT 0 COMMENT '商户id', - `product_id` int(10) NOT NULL DEFAULT 0 COMMENT '商品关联id', - `is_hot` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否热门(小程序)', - `is_banner` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否轮播图(小程序)', - `content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '文章内容', - `create_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '文章管理表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for eb_category --- ---------------------------- -DROP TABLE IF EXISTS `eb_category`; -CREATE TABLE `eb_category` ( - `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, - `pid` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '父级ID', - `path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '/0/' COMMENT '路径', - `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '分类名称', - `type` smallint(2) NULL DEFAULT 1 COMMENT '类型，1 产品分类，2 附件分类，3 文章分类， 4 设置分类， 5 菜单分类，6 配置分类， 7 秒杀配置', - `url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '地址', - `extra` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '扩展字段 Jsos格式', - `status` tinyint(1) NOT NULL DEFAULT 1 COMMENT '状态, 1正常，0失效', - `sort` int(5) NOT NULL DEFAULT 99999 COMMENT '排序', - `create_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE, - INDEX `status+pid`(`pid`, `status`) USING BTREE, - INDEX `id+status+url`(`path`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 742 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '分类表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of eb_category --- ---------------------------- -INSERT INTO `eb_category` VALUES (42, 0, '/0/', '商品', 5, '/store', 's-goods', 1, 1, '2020-04-28 17:03:34', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (43, 42, '/0/42/', '商品管理', 5, '/store/index', NULL, 1, 1, '2020-04-28 17:04:20', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (44, 42, '/0/42/', '商品分类', 5, '/store/sort', NULL, 1, 1, '2020-04-28 17:04:40', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (45, 0, '/0/', '订单', 5, '/order', 's-order', 1, 1, '2020-04-28 17:04:56', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (46, 45, '/0/45/', '订单', 5, '/order/index', 's-order', 1, 1, '2020-04-28 17:05:17', '2021-02-04 10:12:41'); -INSERT INTO `eb_category` VALUES (47, 0, '/0/', '用户', 5, '/user', 'user-solid', 1, 1, '2020-04-28 17:05:53', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (48, 47, '/0/47/', '用户管理', 5, '/user/index', NULL, 1, 1, '2020-04-28 17:07:13', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (49, 47, '/0/47/', '用户标签', 5, '/user/label', NULL, 1, 1, '2020-04-28 17:42:21', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (51, 0, '/0/', '设置', 5, '/operation', 's-tools', 1, -9, '2020-05-06 09:40:14', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (52, 51, '/0/51/', '管理权限', 5, '/operation/roleManager', NULL, 1, 1, '2020-05-06 09:40:35', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (53, 52, '/0/51/52/', '身份管理', 5, '/operation//roleManager/identityManager', NULL, 1, 1, '2020-05-06 09:40:51', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (54, 52, '/0/51/52/', '管理员列表', 5, '/operation//roleManager/adminList', NULL, 1, 1, '2020-05-06 09:41:11', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (55, 52, '/0/51/52/', '权限规则', 5, '/operation//roleManager/promiseRules', NULL, 1, 1, '2020-05-06 09:41:46', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (56, 0, '/0/', '内容', 5, '/content', 's-management', 1, 1, '2020-05-07 12:00:33', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (57, 56, '/0/56/', '文章管理', 5, '/content/articleManager', NULL, 1, 1, '2020-05-07 12:02:39', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (58, 56, '/0/56/', '文章分类', 5, '/content/classifManager', NULL, 1, 1, '2020-05-07 12:02:46', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (66, 0, '/0/', '维护', 5, '/maintain', 's-open', 1, -10, '2020-05-09 16:02:05', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (67, 66, '/0/66/', '开发配置', 5, '/maintain//devconfiguration', NULL, 1, 0, '2020-05-09 16:06:46', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (68, 67, '/0/66/67/', '配置分类', 5, '/maintain/devconfiguration/configCategory', NULL, 1, 0, '2020-05-09 16:07:09', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (69, 67, '/0/66/67/', '组合数据', 5, '/maintain/devconfiguration/combineddata', NULL, 1, 0, '2020-05-09 16:08:00', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (80, 51, '/0/51/', '系统设置', 5, '/operation/setting', NULL, 1, 9, '2020-05-20 09:44:47', '2020-12-10 11:30:07'); -INSERT INTO `eb_category` VALUES (81, 0, '/0/', 'PC管理后台配置', 6, 'pcAdmin config', '64', 1, 1, '2020-05-20 10:02:57', '2021-08-16 10:05:08'); -INSERT INTO `eb_category` VALUES (93, 81, '/0/81/', '站点配置', 6, '站点配置', '64', 1, 1, '2020-05-21 11:04:20', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (94, 100, '/0/100/', '客服配置', 6, '云智服', '76', 1, 1, '2020-05-21 11:04:37', '2020-09-09 17:09:47'); -INSERT INTO `eb_category` VALUES (95, 0, '/0/', '商城配置', 6, '商城配置', '139', 1, 2, '2020-05-21 11:10:20', '2021-08-19 15:21:48'); -INSERT INTO `eb_category` VALUES (96, 95, '/0/95/', '商城基础配置', 6, '商城基础配置', '77', 1, 1, '2020-05-21 11:10:40', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (99, 95, '/0/95/', '充值配置', 6, '充值配置', '78', 1, 1, '2020-05-21 11:11:28', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (100, 0, '/0/', '应用配置', 6, '应用配置', NULL, 1, 1, '2020-05-21 12:31:49', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (101, 100, '/0/100/', '公众号配置', 6, '公众号配置', '65', 1, 1, '2020-05-21 12:32:07', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (102, 100, '/0/100/', '小程序配置', 6, '小程序配置', '66', 1, 1, '2020-05-21 12:32:18', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (103, 0, '/0/', '支付配置', 6, '支付配置', NULL, 1, 1, '2020-05-21 12:33:36', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (104, 103, '/0/103/', '公众号支付配置', 6, '公众号支付配置', '67', 1, 1, '2020-05-21 12:33:54', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (105, 103, '/0/103/', '小程序支付配置', 6, '小程序支付配置', '68', 1, 1, '2020-05-21 12:34:36', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (107, 103, '/0/103/', '余额支付', 6, '余额支付', '80', 1, 1, '2020-05-21 12:35:01', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (108, 0, '/0/', '文件上传配置', 6, '文件上传配置', NULL, 1, 1, '2020-05-21 12:35:16', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (109, 108, '/0/108/', '基础配置', 6, '基础配置', '108', 1, 1, '2020-05-21 12:35:28', '2020-09-14 10:33:54'); -INSERT INTO `eb_category` VALUES (110, 108, '/0/108/', '阿里云配置', 6, '阿里云配置', '81', 1, 1, '2020-05-21 12:36:01', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (111, 108, '/0/108/', '七牛云配置', 6, '七牛云配置', '82', 1, 1, '2020-05-21 12:36:12', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (112, 108, '/0/108/', '腾讯云配置', 6, '腾讯云配置', '83', 1, 1, '2020-05-21 12:36:22', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (113, 0, '/0/', '应用', 5, '/appSetting', 's-promotion', 1, 1, '2020-05-21 16:12:53', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (114, 113, '/0/113/', '公众号', 5, '/appSetting/publicAccount', NULL, 1, 1, '2020-05-21 16:13:18', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (115, 114, '/0/113/114/', '微信菜单', 5, '/appSetting//publicAccount/wxMenus', NULL, 1, 1, '2020-05-21 16:13:36', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (118, 0, '/0/', '营销', 5, '/marketing', 's-marketing', 1, 1, '2020-05-25 14:39:52', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (119, 118, '/0/118/', '优惠券', 5, '/marketing/coupon', NULL, 1, 1, '2020-05-25 14:40:13', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (123, 118, '/0/118/', '积分', 5, '/marketing/integral', NULL, 1, 1, '2020-05-25 14:41:33', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (127, 42, '/0/42/', '商品规格', 5, '/store/attr', NULL, 1, 1, '2020-05-25 18:12:11', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (128, 42, '/0/42/', '商品评论', 5, '/store/comment', NULL, 1, 1, '2020-05-27 10:16:30', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (139, 113, '/0/113/', '小程序', 5, '/appSetting/publicRoutine', NULL, 1, 1, '2020-06-05 09:56:17', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (140, 139, '/0/113/139/', '我的模板', 5, '/appSetting/publicRoutine/routineTemplate', NULL, 0, 1, '2020-06-05 09:56:58', '2021-03-05 16:07:42'); -INSERT INTO `eb_category` VALUES (141, 114, '/0/113/114/', '自动回复', 5, '/appSetting/publicAccount/wxReply', NULL, 1, 1, '2020-06-15 16:15:32', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (146, 0, '/0/', '分销', 5, '/distribution', 's-check', 1, 1, '2020-07-18 16:31:09', '2020-12-07 09:35:02'); -INSERT INTO `eb_category` VALUES (147, 146, '/0/146/', '分销员管理', 5, '/distribution/index', NULL, 1, 1, '2020-07-18 16:31:49', '2020-12-18 10:22:25'); -INSERT INTO `eb_category` VALUES (148, 146, '/0/146/', '分销配置', 5, '/distribution/distributionconfig', NULL, 1, 1, '2020-07-18 16:32:06', '2020-12-18 10:22:19'); -INSERT INTO `eb_category` VALUES (158, 119, '/0/118/119/', '优惠券', 5, '/marketing/coupon/list', NULL, 1, 1, '2020-07-24 16:13:10', '2020-08-29 10:15:34'); -INSERT INTO `eb_category` VALUES (159, 119, '/0/118/119/', '领取记录', 5, '/marketing/coupon/record', NULL, 1, 1, '2020-07-24 16:13:37', '2021-03-12 16:40:29'); -INSERT INTO `eb_category` VALUES (160, 123, '/0/118/123/', '积分配置', 5, '/marketing/integral/integralconfig', NULL, 1, 1, '2020-07-24 16:14:48', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (161, 123, '/0/118/123/', '积分日志', 5, '/marketing/integral/integrallog', NULL, 1, 1, '2020-07-24 16:15:11', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (162, 47, '/0/47/', '用户等级', 5, '/user/grade', NULL, 1, 1, '2020-07-24 16:21:48', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (164, 47, '/0/47/', '用户分组', 5, '/user/group', NULL, 1, 1, '2020-07-24 16:22:46', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (171, 141, '/0/113/114/141/', '微信关注回复', 5, '/appSetting/publicAccount/wxReply/follow', NULL, 1, 1, '2020-07-24 16:42:52', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (172, 141, '/0/113/114/141/', '关键字回复', 5, '/appSetting/publicAccount/wxReply/keyword', NULL, 1, 1, '2020-07-24 16:43:09', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (173, 141, '/0/113/114/141/', '无效关键词回复', 5, '/appSetting/publicAccount/wxReply/replyIndex', NULL, 1, 1, '2020-07-24 16:43:23', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (174, 114, '/0/113/114/', '微信模板', 5, '/appSetting//publicAccount/template/1', NULL, 1, 1, '2020-07-24 16:43:52', '2021-03-05 16:17:57'); -INSERT INTO `eb_category` VALUES (175, 43, '/0/42/43/', '商品添加', 5, 'api/admin/store/product/save', NULL, 0, 1, '2020-07-24 16:46:04', '2021-03-11 09:20:26'); -INSERT INTO `eb_category` VALUES (176, 43, '/0/42/43/', '商品修改', 5, 'api/admin/store/product/update', NULL, 0, 1, '2020-07-24 16:46:19', '2020-08-31 10:07:24'); -INSERT INTO `eb_category` VALUES (245, 0, '/0/272/', '热门推荐', 1, '', 'crmebimage/public/maintain/2021/12/25/3a395df3d79a40a08cbc938c35e2dc35b84sujo2yn.png', 1, 0, '2020-08-12 11:42:27', '2021-12-25 11:39:37'); -INSERT INTO `eb_category` VALUES (246, 245, '/0/272/245/', '新品上市', 1, 'www', 'crmebimage/public/maintain/2021/12/25/8f9eca84e2b14752ad4afb1ab8d06974xua9ambm9y.jpg', 1, 0, '2020-08-12 11:42:58', '2021-12-25 11:44:38'); -INSERT INTO `eb_category` VALUES (248, 245, '/0/272/245/', '热卖商品', 1, 'www', 'crmebimage/public/maintain/2021/12/25/1618a47e11e745ff90c70f752c204e17qi6vjngrcd.jpg', 1, 0, '2020-08-12 11:50:40', '2021-12-25 11:44:51'); -INSERT INTO `eb_category` VALUES (250, 67, '/0/66/67/', '表单配置', 5, '/maintain/devconfiguration/formConfig', NULL, 1, 0, '2020-08-12 12:09:56', '2020-08-12 12:29:13'); -INSERT INTO `eb_category` VALUES (258, 245, '/0/272/245/', '折扣专区', 1, 'www', 'crmebimage/public/maintain/2021/12/25/73f9c6c1b14445b5bb477e8c05d8a2763sfij1gamk.jpg', 1, 0, '2020-08-12 13:59:31', '2021-12-25 11:45:05'); -INSERT INTO `eb_category` VALUES (267, 0, '/0/', '控制台', 5, '/dashboard', 'menu', 1, 10, '2020-08-13 10:31:07', '2021-02-04 11:04:27'); -INSERT INTO `eb_category` VALUES (272, 0, '/0/', '家用电器', 1, '', 'crmebimage/public/maintain/2021/12/25/37901b98fba74345ad0e8a575999ad09n9d3winw2c.jpg', 1, 0, '2020-08-13 12:03:40', '2021-12-25 11:40:01'); -INSERT INTO `eb_category` VALUES (273, 272, '/0/272/', '电视', 1, '', 'crmebimage/public/maintain/2021/12/25/37901b98fba74345ad0e8a575999ad09n9d3winw2c.jpg', 1, 0, '2020-08-13 12:05:23', '2021-12-25 11:45:43'); -INSERT INTO `eb_category` VALUES (275, 272, '/0/272/', '洗衣机', 1, 'www', 'crmebimage/public/maintain/2021/12/25/62414c551db44169a6429c0dd3d162833o6e82okff.jpg', 1, 0, '2020-08-13 12:07:57', '2021-12-25 11:46:24'); -INSERT INTO `eb_category` VALUES (276, 272, '/0/272/', '生活电器', 1, '', 'crmebimage/public/maintain/2021/12/25/4811fe50a33f48309337e67c3d36318exseuh6qys6.jpg', 1, 0, '2020-08-13 12:11:36', '2021-12-25 11:46:46'); -INSERT INTO `eb_category` VALUES (277, 272, '/0/272/', '厨卫电器', 1, '', 'crmebimage/public/store/2021/12/25/476f2b8a50644f5f80124f831ac14aecct8ewiyvwf.png', 1, 0, '2020-08-13 12:12:38', '2021-12-25 11:49:53'); -INSERT INTO `eb_category` VALUES (279, 272, '/0/272/', '清凉一夏', 1, '', 'crmebimage/public/store/2021/12/25/f22830611d324e8fb10129e969f1ec661lcpu7346h.png', 1, 0, '2020-08-13 12:15:11', '2021-12-25 11:51:13'); -INSERT INTO `eb_category` VALUES (280, 0, '/0/', '家装家具', 1, '', 'crmebimage/public/maintain/2021/12/25/86f83bdc35534eeda2fb4daeb51dbb28pizkxqnzap.jpg', 1, 0, '2020-08-13 12:17:25', '2021-12-25 11:40:17'); -INSERT INTO `eb_category` VALUES (281, 0, '/0/', '户外出行', 1, '', 'crmebimage/public/maintain/2021/12/25/55014ffb17b74d039b5670298e1047fcyw64lmyzlj.jpg', 1, 0, '2020-08-13 12:17:54', '2021-12-25 11:40:54'); -INSERT INTO `eb_category` VALUES (282, 0, '/0/', '美妆个护', 1, '', 'crmebimage/public/maintain/2021/12/25/2eef89b403dd47619e349e3edb057ce4g2clr5d4xn.jpg', 1, 0, '2020-08-13 12:18:04', '2021-12-25 11:41:26'); -INSERT INTO `eb_category` VALUES (283, 0, '/0/', '3C数码', 1, '', 'crmebimage/public/maintain/2021/12/25/432cb941d4f64f4c88d2d3a8b784f282kqlp2cu55l.jpg', 1, 0, '2020-08-13 12:18:14', '2021-12-25 11:41:51'); -INSERT INTO `eb_category` VALUES (284, 0, '/0/283/', '日用文创', 1, '', 'crmebimage/public/store/2021/12/25/d813cbdd98b148c99885652234ad43b1m1aewwn8wd.jpg', 1, 0, '2020-08-13 12:18:30', '2021-12-25 12:11:39'); -INSERT INTO `eb_category` VALUES (285, 280, '/0/280/', '智能门锁', 1, '', 'crmebimage/public/store/2021/12/25/8b665c20edef4d61a508de9395eb40c4ln34d0f3i5.png', 1, 0, '2020-08-13 13:31:48', '2021-12-25 11:53:16'); -INSERT INTO `eb_category` VALUES (286, 280, '/0/280/', '居家照明', 1, '', 'crmebimage/public/store/2021/12/25/24119aa4d48e4c7a95b21ece82a41715uns67350bd.jpg', 1, 0, '2020-08-13 13:33:06', '2021-12-25 11:54:14'); -INSERT INTO `eb_category` VALUES (287, 280, '/0/280/', '家装建材', 1, '', 'crmebimage/public/store/2021/12/25/7b4c8af47e414f62a5d7b26d95504cbafw13ela5i7.png', 1, 0, '2020-08-13 13:34:22', '2021-12-25 11:55:49'); -INSERT INTO `eb_category` VALUES (288, 281, '/0/281/', '健身运动', 1, '', 'crmebimage/public/store/2021/12/25/0f419f2a65844ae5a00c20e22dc9b92env32uvr4dy.png', 1, 0, '2020-08-13 13:35:37', '2021-12-25 11:58:42'); -INSERT INTO `eb_category` VALUES (289, 281, '/0/281/', '户外装备', 1, '', 'crmebimage/public/store/2021/12/25/bf8bc87d525844b68ca17ca60c567233hkh2h9c2un.png', 1, 0, '2020-08-13 13:36:34', '2021-12-25 12:00:59'); -INSERT INTO `eb_category` VALUES (290, 281, '/0/281/', '骑行配件', 1, '', 'crmebimage/public/store/2021/12/25/ef98f38ef1cd4083a91fb62b1dd8362cmran1psnmc.png', 1, 0, '2020-08-13 13:37:23', '2021-12-25 12:02:43'); -INSERT INTO `eb_category` VALUES (291, 282, '/0/282/', '美妆工具', 1, '', 'crmebimage/public/store/2021/12/25/1ccac5f9f62646ba930000ad70f741efpfgagvhrzh.png', 1, 0, '2020-08-13 13:38:32', '2021-12-25 12:07:00'); -INSERT INTO `eb_category` VALUES (292, 282, '/0/282/', '口腔清洁', 1, '', 'crmebimage/public/store/2021/12/25/0705b0fad3884eddb31745e453de6503atuqud1tr3.png', 1, 0, '2020-08-13 13:39:33', '2021-12-25 12:07:10'); -INSERT INTO `eb_category` VALUES (293, 282, '/0/282/', '彩妆香氛', 1, '', 'crmebimage/public/store/2021/12/25/0e13333fdf2841a2a886a9595bebc855q5jgkr8b66.png', 1, 0, '2020-08-13 13:40:34', '2021-12-25 12:07:27'); -INSERT INTO `eb_category` VALUES (294, 282, '/0/282/', '面部护肤', 1, '', 'crmebimage/public/store/2021/12/25/6246abff834b4d2fb1edad2a8927c8a3yes6irrqfw.png', 1, 0, '2020-08-13 13:42:19', '2021-12-25 12:07:40'); -INSERT INTO `eb_category` VALUES (295, 282, '/0/282/', '身体护理', 1, '', 'crmebimage/public/store/2021/12/25/090f2f83e9b343c38c7c7b4ebc860a352r8u8adjsq.png', 1, 0, '2020-08-13 13:43:21', '2021-12-25 12:07:55'); -INSERT INTO `eb_category` VALUES (296, 282, '/0/282/', '其他工具', 1, '', 'crmebimage/public/store/2021/12/25/fbc798bf3c91493f95c97be7d6cbaa5akhcpo5ent3.png', 1, 0, '2020-08-13 13:44:15', '2021-12-25 12:08:10'); -INSERT INTO `eb_category` VALUES (297, 283, '/0/283/', '手机', 1, '', 'crmebimage/public/maintain/2021/12/25/73f9c6c1b14445b5bb477e8c05d8a2763sfij1gamk.jpg', 1, 0, '2020-08-13 13:45:52', '2021-12-25 12:12:07'); -INSERT INTO `eb_category` VALUES (298, 283, '/0/283/', '平板电脑', 1, '', 'crmebimage/public/maintain/2021/12/25/4811fe50a33f48309337e67c3d36318exseuh6qys6.jpg', 1, 0, '2020-08-13 13:46:22', '2021-12-25 12:12:32'); -INSERT INTO `eb_category` VALUES (300, 284, '/0/283/284/', '日用杂货', 1, '', 'crmebimage/public/store/2021/12/25/61bf8228d96b4c8c9343bc13b4e6fc67c0jmc2y781.png', 1, 0, '2020-08-13 13:48:30', '2021-12-25 12:16:19'); -INSERT INTO `eb_category` VALUES (301, 284, '/0/283/284/', '纸品湿巾', 1, '', 'crmebimage/public/store/2021/12/25/ae2a9db4d74a4a56bddb971d3df9e60fljwxe9z3lh.png', 1, 0, '2020-08-13 13:49:30', '2021-12-25 12:16:32'); -INSERT INTO `eb_category` VALUES (302, 284, '/0/283/284/', '办公文具', 1, '', 'crmebimage/public/store/2021/12/25/de35d545523448db9f3636e34ca085b29qw11rescg.png', 1, 0, '2020-08-13 13:50:39', '2021-12-25 12:16:41'); -INSERT INTO `eb_category` VALUES (316, 139, '/0/113/139/', '公共模板', 5, '/appSetting/publicRoutine/publicRoutineTemplate', NULL, 0, 1, '2020-08-27 14:15:41', '2021-03-05 16:07:41'); -INSERT INTO `eb_category` VALUES (317, 452, '/0/452/', '订单核销', 5, '/javaMobile/orderCancellation', NULL, 1, 0, '2020-08-27 14:51:47', '2020-09-12 15:19:51'); -INSERT INTO `eb_category` VALUES (318, 43, '/0/42/43/', '商品删除', 5, 'api/admin/store/product/delete', NULL, 0, 0, '2020-08-28 16:12:53', '2020-08-31 10:07:24'); -INSERT INTO `eb_category` VALUES (319, 43, '/0/42/43/', '商品上架', 5, 'api/admin/store/product/putOnShell', NULL, 0, 0, '2020-08-28 16:14:14', '2020-08-31 10:07:22'); -INSERT INTO `eb_category` VALUES (320, 43, '/0/42/43/', '商品下架', 5, 'api/admin/store/product/offShell', NULL, 0, 0, '2020-08-28 16:14:33', '2020-08-31 10:07:23'); -INSERT INTO `eb_category` VALUES (321, 43, '/0/42/43/', '库存变动', 5, 'api/admin/store/product/stock', NULL, 0, 0, '2020-08-28 16:15:07', '2020-08-31 10:07:21'); -INSERT INTO `eb_category` VALUES (322, 43, '/0/42/43/', '虚拟销量', 5, 'api/admin/store/product/ficti', NULL, 0, 0, '2020-08-28 16:15:59', '2020-08-31 10:07:21'); -INSERT INTO `eb_category` VALUES (323, 127, '/0/42/127/', '规格添加', 5, 'api/admin/store/product/rule/save', NULL, 0, 0, '2020-08-28 16:25:25', '2020-08-28 16:26:44'); -INSERT INTO `eb_category` VALUES (324, 127, '/0/42/127/', '规格修改', 5, 'api/admin/store/product/rule/update', NULL, 0, 0, '2020-08-28 16:25:40', '2021-02-04 12:16:35'); -INSERT INTO `eb_category` VALUES (325, 127, '/0/42/127/', '规格删除', 5, 'api/admin/store/product/rule/delete', NULL, 0, 0, '2020-08-28 16:26:01', '2021-02-04 15:19:41'); -INSERT INTO `eb_category` VALUES (328, 128, '/0/42/128/', '商品评论添加', 5, 'api/admin/store/product/reply/save', NULL, 0, 0, '2020-08-28 16:27:53', '2020-08-28 16:27:53'); -INSERT INTO `eb_category` VALUES (329, 128, '/0/42/128/', '商品评论修改', 5, 'api/admin/store/product/reply/update', NULL, 0, 0, '2020-08-28 16:28:18', '2020-08-28 16:28:18'); -INSERT INTO `eb_category` VALUES (331, 128, '/0/42/128/', '商品评论删除', 5, 'api/admin/store/product/reply/delete', NULL, 0, 0, '2020-08-28 16:29:57', '2020-08-28 16:30:02'); -INSERT INTO `eb_category` VALUES (333, 128, '/0/42/128/', '商品评论回复', 5, 'api/admin/store/product/reply/comment', NULL, 0, 0, '2020-08-28 16:30:38', '2020-08-28 16:30:38'); -INSERT INTO `eb_category` VALUES (335, 46, '/0/45/46/', '订单删除', 5, 'api/admin/store/order/delete', NULL, 0, 0, '2020-08-29 09:33:49', '2021-03-11 09:33:59'); -INSERT INTO `eb_category` VALUES (337, 46, '/0/45/46/', '订单标记', 5, 'api/admin/store/order/mark', NULL, 0, 0, '2020-08-29 09:34:25', '2020-08-29 09:34:25'); -INSERT INTO `eb_category` VALUES (338, 46, '/0/45/46/', '订单退款', 5, 'api/admin/store/order/refund', NULL, 0, 0, '2020-08-29 09:34:38', '2020-08-29 09:34:38'); -INSERT INTO `eb_category` VALUES (339, 46, '/0/45/46/', '订单拒绝退款', 5, 'api/admin/store/order/refund/refuse', NULL, 0, 0, '2020-08-29 09:35:08', '2020-08-29 09:35:08'); -INSERT INTO `eb_category` VALUES (340, 46, '/0/45/46/', '订单发货', 5, 'api/admin/store/order/send', NULL, 0, 0, '2020-08-29 09:35:33', '2021-03-11 09:34:07'); -INSERT INTO `eb_category` VALUES (341, 46, '/0/45/46/', '订单更新', 5, 'api/admin/store/order/update', NULL, 0, 0, '2020-08-29 09:35:44', '2020-08-29 09:35:44'); -INSERT INTO `eb_category` VALUES (345, 48, '/0/47/48/', '用户修改', 5, 'api/admin/user/update', NULL, 0, 0, '2020-08-29 09:39:12', '2020-08-29 09:39:12'); -INSERT INTO `eb_category` VALUES (346, 48, '/0/47/48/', '用户详情', 5, 'api/admin/user/infobycondition', NULL, 0, 0, '2020-08-29 09:39:22', '2020-08-29 09:41:16'); -INSERT INTO `eb_category` VALUES (347, 48, '/0/47/48/', '用户分组', 5, 'api/admin/user/group', NULL, 0, 0, '2020-08-29 09:39:31', '2020-08-29 09:39:31'); -INSERT INTO `eb_category` VALUES (348, 48, '/0/47/48/', '用户删除', 5, 'api/admin/user/delete', NULL, 0, 0, '2020-08-29 09:39:49', '2020-08-29 09:39:49'); -INSERT INTO `eb_category` VALUES (349, 48, '/0/47/48/', '用户打标签', 5, 'api/admin/user/tag', NULL, 0, 0, '2020-08-29 09:40:02', '2020-08-29 09:40:02'); -INSERT INTO `eb_category` VALUES (350, 48, '/0/47/48/', '修改积分余额', 5, 'api/admin/user/operate/founds', NULL, 0, 0, '2020-08-29 09:41:50', '2020-08-29 09:41:50'); -INSERT INTO `eb_category` VALUES (351, 162, '/0/47/162/', '用户等级添加', 5, 'api/admin/system/user/level/save', NULL, 0, 0, '2020-08-29 09:43:32', '2020-08-29 09:44:47'); -INSERT INTO `eb_category` VALUES (352, 162, '/0/47/162/', '用户等级修改', 5, 'api/admin/system/user/level/update', NULL, 0, 0, '2020-08-29 09:46:00', '2020-08-29 09:46:00'); -INSERT INTO `eb_category` VALUES (353, 162, '/0/47/162/', '用户等级删除', 5, 'api/admin/system/user/level/delete', NULL, 0, 0, '2020-08-29 09:46:13', '2020-08-29 09:46:13'); -INSERT INTO `eb_category` VALUES (356, 162, '/0/47/162/', '用户等级是否显示', 5, 'api/admin/system/user/level/use', NULL, 0, 0, '2020-08-29 09:47:41', '2020-08-29 09:47:41'); -INSERT INTO `eb_category` VALUES (357, 49, '/0/47/49/', '用户标签添加', 5, 'api/admin/user/tag/save', NULL, 0, 0, '2020-08-29 09:48:13', '2020-08-29 09:49:20'); -INSERT INTO `eb_category` VALUES (358, 49, '/0/47/49/', '用户标签修改', 5, 'api/admin/user/tag/update', NULL, 0, 0, '2020-08-29 09:48:26', '2020-08-29 09:49:27'); -INSERT INTO `eb_category` VALUES (363, 164, '/0/47/164/', '用户分组修改', 5, 'api/admin/user/group/update', NULL, 0, 0, '2020-08-29 09:52:23', '2020-08-29 09:52:23'); -INSERT INTO `eb_category` VALUES (364, 164, '/0/47/164/', '用户分组删除', 5, 'api/admin/user/group/delete', NULL, 0, 0, '2020-08-29 09:52:35', '2020-08-29 09:52:35'); -INSERT INTO `eb_category` VALUES (366, 164, '/0/47/164/', '用户分组列表', 5, 'api/admin/user/group/list', NULL, 0, 0, '2020-08-29 09:53:09', '2020-08-29 09:53:09'); -INSERT INTO `eb_category` VALUES (367, 57, '/0/56/57/', '文章添加', 5, 'api/admin/article/save', NULL, 0, 0, '2020-08-29 09:54:14', '2020-08-29 09:54:14'); -INSERT INTO `eb_category` VALUES (368, 57, '/0/56/57/', '文章删除', 5, 'api/admin/article/delete', NULL, 0, 0, '2020-08-29 09:55:05', '2020-08-29 09:55:05'); -INSERT INTO `eb_category` VALUES (369, 57, '/0/56/57/', '文章修改', 5, 'api/admin/article/update', NULL, 0, 0, '2020-08-29 09:55:15', '2020-08-29 09:55:15'); -INSERT INTO `eb_category` VALUES (372, 57, '/0/56/57/', '文章绑定产品', 5, 'api/admin/article/bind/product', NULL, 0, 0, '2020-08-29 09:56:40', '2020-08-29 09:56:40'); -INSERT INTO `eb_category` VALUES (373, 115, '/0/113/114/115/', '微信菜单保存', 5, 'api/admin/wechat/menu/public/create', NULL, 0, 0, '2020-08-29 09:59:41', '2020-08-29 09:59:41'); -INSERT INTO `eb_category` VALUES (374, 115, '/0/113/114/115/', '微信菜单删除', 5, 'api/admin/wechat/menu/public/delete', NULL, 0, 0, '2020-08-29 10:00:02', '2020-08-29 10:00:02'); -INSERT INTO `eb_category` VALUES (375, 172, '/0/113/114/141/172/', '关键字添加', 5, 'api/admin/wechat/keywords/reply/save', NULL, 0, 0, '2020-08-29 10:02:20', '2020-08-29 10:02:20'); -INSERT INTO `eb_category` VALUES (376, 172, '/0/113/114/141/172/', '关键字删除', 5, 'api/admin/wechat/keywords/reply/delete', NULL, 0, 0, '2020-08-29 10:02:48', '2020-08-29 10:02:48'); -INSERT INTO `eb_category` VALUES (377, 172, '/0/113/114/141/172/', '关键字修改', 5, 'api/admin/wechat/keywords/reply/update', NULL, 0, 0, '2020-08-29 10:03:00', '2020-08-29 10:03:00'); -INSERT INTO `eb_category` VALUES (381, 174, '/0/113/114/174/', '微信模板添加', 5, 'api/admin/wechat/template/save', NULL, 0, 0, '2020-08-29 10:05:03', '2020-08-29 10:06:14'); -INSERT INTO `eb_category` VALUES (382, 174, '/0/113/114/174/', '微信模板修改', 5, 'api/admin/wechat/template/update', NULL, 0, 0, '2020-08-29 10:05:35', '2020-08-29 10:06:19'); -INSERT INTO `eb_category` VALUES (383, 174, '/0/113/114/174/', '微信模板删除', 5, 'api/admin/wechat/template/delete', NULL, 0, 0, '2020-08-29 10:05:44', '2020-08-29 10:06:24'); -INSERT INTO `eb_category` VALUES (385, 174, '/0/113/114/174/', '微信模板状态更新', 5, 'api/admin/wechat/template/status', NULL, 0, 0, '2020-08-29 10:06:55', '2020-08-29 10:06:55'); -INSERT INTO `eb_category` VALUES (387, 174, '/0/113/114/174/', '微信模板行业信息', 5, 'api/admin/wechat/template/industry', NULL, 0, 0, '2020-08-29 10:07:32', '2020-08-29 10:07:32'); -INSERT INTO `eb_category` VALUES (389, 140, '/0/113/139/140/', '我的模板添加', 5, 'api/admin/wechat/program/my/temp/save', NULL, 0, 0, '2020-08-29 10:08:31', '2020-08-29 10:08:31'); -INSERT INTO `eb_category` VALUES (390, 140, '/0/113/139/140/', '我的模板修改', 5, 'api/admin/wechat/program/my/temp/update', NULL, 0, 0, '2020-08-29 10:08:41', '2020-08-29 10:08:41'); -INSERT INTO `eb_category` VALUES (392, 140, '/0/113/139/140/', '我的模板状态更新', 5, 'api/admin/wechat/program/my/temp/status', NULL, 0, 0, '2020-08-29 10:09:44', '2020-08-29 10:09:44'); -INSERT INTO `eb_category` VALUES (393, 316, '/0/113/139/316/', '公共模板行业信息', 5, 'api/admin/wechat/program/category', NULL, 0, 0, '2020-08-29 10:10:28', '2020-08-29 10:10:28'); -INSERT INTO `eb_category` VALUES (396, 140, '/0/113/139/140/', '根据公共模板获取关键词列表', 5, 'api/admin/wechat/program/getWeChatKeywordsByTid', NULL, 0, 0, '2020-08-29 10:11:56', '2020-08-29 10:11:56'); -INSERT INTO `eb_category` VALUES (397, 158, '/0/118/119/158/', '优惠券添加', 5, 'api/admin/marketing/coupon/save', NULL, 0, 0, '2020-08-29 10:12:37', '2020-08-29 10:16:13'); -INSERT INTO `eb_category` VALUES (398, 158, '/0/118/119/158/', '优惠券状态更新', 5, 'api/admin/marketing/coupon/update/status', NULL, 0, 0, '2020-08-29 10:13:10', '2020-08-29 10:16:20'); -INSERT INTO `eb_category` VALUES (402, 159, '/0/118/119/159/', '领取优惠券', 5, 'api/admin/marketing/coupon/user/receive', NULL, 0, 0, '2020-08-29 10:18:21', '2020-08-29 10:18:48'); -INSERT INTO `eb_category` VALUES (403, 54, '/0/51/52/54/', '管理员添加', 5, 'api/admin/system/admin/save', NULL, 0, 0, '2020-08-29 10:22:43', '2020-08-29 10:26:11'); -INSERT INTO `eb_category` VALUES (404, 54, '/0/51/52/54/', '管理员修改', 5, 'api/admin/system/admin/update', NULL, 0, 0, '2020-08-29 10:23:00', '2020-08-29 10:26:09'); -INSERT INTO `eb_category` VALUES (405, 54, '/0/51/52/54/', '管理员删除', 5, 'api/admin/system/admin/delete', NULL, 0, 0, '2020-08-29 10:23:11', '2020-08-29 10:26:06'); -INSERT INTO `eb_category` VALUES (408, 53, '/0/51/52/53/', '身份添加', 5, 'api/admin/system/role/save', NULL, 0, 0, '2020-08-29 10:26:52', '2020-08-29 10:26:52'); -INSERT INTO `eb_category` VALUES (409, 53, '/0/51/52/53/', '身份删除', 5, 'api/admin/system/role/delete', NULL, 0, 0, '2020-08-29 10:27:07', '2020-08-29 10:27:07'); -INSERT INTO `eb_category` VALUES (410, 53, '/0/51/52/53/', '身份修改', 5, 'api/admin/system/role/update', NULL, 0, 0, '2020-08-29 10:27:27', '2020-08-29 10:27:27'); -INSERT INTO `eb_category` VALUES (432, 69, '/0/66/67/69/', '数据组添加', 5, 'api/admin/system/group/save', NULL, 0, 0, '2020-08-29 10:41:33', '2020-08-29 10:41:33'); -INSERT INTO `eb_category` VALUES (433, 69, '/0/66/67/69/', '数据组修改', 5, 'api/admin/system/group/update', NULL, 0, 0, '2020-08-29 10:41:49', '2020-08-29 10:41:49'); -INSERT INTO `eb_category` VALUES (434, 69, '/0/66/67/69/', '数据组删除', 5, 'api/admin/system/group/delete', NULL, 0, 0, '2020-08-29 10:41:59', '2020-08-29 10:41:59'); -INSERT INTO `eb_category` VALUES (437, 69, '/0/66/67/69/', '组合数据添加', 5, 'api/admin/system/group/data/save', NULL, 0, 0, '2020-08-29 10:43:00', '2020-08-29 10:43:00'); -INSERT INTO `eb_category` VALUES (438, 69, '/0/66/67/69/', '组合数据修改', 5, 'api/admin/system/group/data/update', NULL, 0, 0, '2020-08-29 10:43:16', '2020-08-29 10:43:16'); -INSERT INTO `eb_category` VALUES (439, 69, '/0/66/67/69/', '组合数据删除', 5, 'api/admin/system/group/data/delete', NULL, 0, 0, '2020-08-29 10:43:41', '2020-08-29 10:43:41'); -INSERT INTO `eb_category` VALUES (442, 250, '/0/66/67/250/', '表单添加', 5, 'api/admin/system/form/temp/save', NULL, 0, 0, '2020-08-29 10:45:23', '2020-08-29 10:45:23'); -INSERT INTO `eb_category` VALUES (443, 250, '/0/66/67/250/', '表单删除', 5, 'api/admin/system/form/temp/delete', NULL, 0, 0, '2020-08-29 10:45:40', '2020-08-29 10:45:40'); -INSERT INTO `eb_category` VALUES (444, 250, '/0/66/67/250/', '表单修改', 5, 'api/admin/system/form/temp/update', NULL, 0, 0, '2020-08-29 10:46:06', '2020-08-29 10:46:06'); -INSERT INTO `eb_category` VALUES (450, 452, '/0/452/', '订单统计', 5, '/javaMobile/orderStatistics', NULL, 1, 0, '2020-09-03 10:27:31', '2020-09-12 15:20:13'); -INSERT INTO `eb_category` VALUES (452, 0, '/0/', '移动端管理', 5, '/javaMobile', 'mobile-phone', 1, 0, '2020-09-07 11:21:03', '2020-09-12 15:18:48'); -INSERT INTO `eb_category` VALUES (454, 100, '/0/100/', '99Api', 6, '99Api', '122', 1, 4, '2020-09-08 12:17:36', '2020-09-08 12:18:44'); -INSERT INTO `eb_category` VALUES (459, 118, '/0/118/', '秒杀管理', 5, '/marketing/seckill', NULL, 1, 0, '2020-09-17 10:02:39', '2020-09-17 10:02:39'); -INSERT INTO `eb_category` VALUES (460, 459, '/0/118/459/', '秒杀配置', 5, '/marketing/seckill/config', NULL, 1, 0, '2020-09-17 10:37:42', '2020-09-17 10:41:30'); -INSERT INTO `eb_category` VALUES (461, 459, '/0/118/459/', '秒杀商品', 5, '/marketing/seckill/list', NULL, 1, 0, '2020-09-17 10:38:27', '2020-09-17 10:41:40'); -INSERT INTO `eb_category` VALUES (464, 0, '/0/', '财务', 5, '/financial', 's-finance', 1, 1, '2020-09-17 14:34:44', '2020-09-17 14:34:44'); -INSERT INTO `eb_category` VALUES (465, 464, '/0/464/', '财务操作', 5, '/financial/commission', NULL, 1, 0, '2020-09-17 14:35:37', '2020-09-17 14:35:37'); -INSERT INTO `eb_category` VALUES (466, 465, '/0/464/465/', '申请提现', 5, '/financial/commission/template', NULL, 1, 0, '2020-09-17 14:36:04', '2020-09-17 14:36:04'); -INSERT INTO `eb_category` VALUES (467, 464, '/0/464/', '财务记录', 5, '/financial/record', NULL, 1, 0, '2020-09-17 14:36:40', '2020-09-17 14:36:40'); -INSERT INTO `eb_category` VALUES (468, 467, '/0/464/467/', '充值记录', 5, '/financial/record/charge', NULL, 1, 0, '2020-09-17 14:36:55', '2020-09-17 14:37:22'); -INSERT INTO `eb_category` VALUES (469, 467, '/0/464/467/', '资金监控', 5, '/financial/record/monitor', NULL, 1, 0, '2020-09-17 14:37:35', '2020-09-17 14:37:35'); -INSERT INTO `eb_category` VALUES (470, 464, '/0/464/', '佣金记录', 5, '/financial/brokerage', NULL, 1, 0, '2020-09-17 14:38:16', '2020-09-17 14:38:16'); -INSERT INTO `eb_category` VALUES (477, 477, '/0/477/', '22222', 1, '', 'crmebimage/content/2020/10/19/6c8ba5e093384f589d212ff77e898d39kpfzjv8h3c.png', 1, 999999999, '2020-10-20 14:44:07', '2021-01-25 10:02:25'); -INSERT INTO `eb_category` VALUES (488, 245, '/0/272/245/', '精品首发', 1, '', 'crmebimage/public/maintain/2021/12/25/9dcafbf40f4a43909ef991338583e633qh2zl6rdwi.jpg', 1, 0, '2020-10-21 10:19:17', '2021-12-25 11:45:21'); -INSERT INTO `eb_category` VALUES (492, 118, '/0/118/', '砍价管理', 5, '/marketing/bargain', NULL, 1, 0, '2020-11-16 12:29:25', '2020-11-16 12:29:25'); -INSERT INTO `eb_category` VALUES (493, 492, '/0/118/492/', '砍价商品', 5, '/marketing/bargain/bargainGoods', NULL, 1, 0, '2020-11-16 14:19:46', '2020-11-16 14:19:46'); -INSERT INTO `eb_category` VALUES (494, 492, '/0/118/492/', '砍价列表', 5, '/marketing/bargain/bargainList', NULL, 1, 0, '2020-11-16 14:38:57', '2020-11-16 14:38:57'); -INSERT INTO `eb_category` VALUES (495, 118, '/0/118/', '拼团管理', 5, '/marketing/groupBuy', NULL, 1, 0, '2020-11-19 14:06:51', '2020-11-19 14:06:51'); -INSERT INTO `eb_category` VALUES (496, 495, '/0/118/495/', '拼团商品', 5, '/marketing/groupBuy/groupGoods', NULL, 1, 0, '2020-11-19 14:07:32', '2020-11-19 14:07:32'); -INSERT INTO `eb_category` VALUES (497, 495, '/0/118/495/', '拼团列表', 5, '/marketing/groupBuy/groupList', NULL, 1, 0, '2020-11-19 14:07:57', '2020-11-19 14:07:57'); -INSERT INTO `eb_category` VALUES (500, 0, '/0/', '第三方接口设置', 6, 'short_letter_switch', NULL, 1, 1, '2020-12-10 10:58:25', '2020-12-10 10:59:39'); -INSERT INTO `eb_category` VALUES (501, 500, '/0/500/', '短信配置', 6, 'short_letter_switch', '111', 1, 1, '2020-12-10 10:59:08', '2020-12-10 12:05:54'); -INSERT INTO `eb_category` VALUES (502, 500, '/0/500/', '采集商品配置', 6, 'copy_product', '127', 1, 1, '2020-12-10 11:00:32', '2020-12-10 12:18:38'); -INSERT INTO `eb_category` VALUES (503, 500, '/0/500/', '物流查询', 6, 'logistics_select', '128', 1, 1, '2020-12-10 11:00:51', '2020-12-10 12:18:57'); -INSERT INTO `eb_category` VALUES (504, 500, '/0/500/', '电子面单', 6, 'electronic_sheet', '129', 1, 1, '2020-12-10 11:01:03', '2020-12-10 12:19:02'); -INSERT INTO `eb_category` VALUES (505, 51, '/0/51/', '一号通', 5, '/operation/onePass', NULL, 1, 8, '2020-12-10 11:06:44', '2020-12-10 11:07:46'); -INSERT INTO `eb_category` VALUES (515, 0, '/0/', '每日新品', 1, '', 'crmebimage/public/maintain/2021/12/25/a272fcefed804cf2b1e6785d5662c29ejqjxha0eow.jpg', 1, 10, '2020-12-22 09:16:27', '2021-12-25 11:39:01'); -INSERT INTO `eb_category` VALUES (528, 66, '/0/66/', '素材管理', 5, '/maintain/picture', NULL, 1, 1, '2021-01-23 11:28:28', '2021-01-23 11:29:19'); -INSERT INTO `eb_category` VALUES (534, 515, '/0/515/', '玩偶', 1, '', 'crmebimage/public/maintain/2021/12/25/fb364676ea364297b7441638f9e0f557dckg4t2rds.jpg', 1, 4, '2021-01-30 18:40:49', '2021-12-25 11:43:06'); -INSERT INTO `eb_category` VALUES (540, 54, '/0/51/52/54/', '管理员状态更新', 5, 'api/admin/system/admin/updateStatus', NULL, 0, 0, '2021-02-04 10:59:10', '2021-02-04 10:59:17'); -INSERT INTO `eb_category` VALUES (541, 55, '/0/51/52/55/', '权限列表', 5, 'api/admin/category/list', NULL, 0, 0, '2021-02-04 11:06:43', '2021-02-04 11:06:43'); -INSERT INTO `eb_category` VALUES (542, 55, '/0/51/52/55/', '权限新增', 5, 'api/admin/category/save', NULL, 0, 0, '2021-02-04 11:08:11', '2021-02-04 11:08:11'); -INSERT INTO `eb_category` VALUES (543, 55, '/0/51/52/55/', '权限删除', 5, 'api/admin/category/delete', NULL, 0, 0, '2021-02-04 11:11:16', '2021-02-04 11:11:16'); -INSERT INTO `eb_category` VALUES (544, 55, '/0/51/52/55/', '权限更新', 5, 'api/admin/category/update', NULL, 0, 0, '2021-02-04 11:11:49', '2021-02-04 11:11:49'); -INSERT INTO `eb_category` VALUES (546, 55, '/0/51/52/55/', '更新权限状态', 5, 'api/admin/category/updateStatus', NULL, 0, 0, '2021-02-04 11:14:19', '2021-02-04 11:14:19'); -INSERT INTO `eb_category` VALUES (547, 505, '/0/51/505/', '一号通登录', 5, 'api/admin/pass/login', NULL, 0, 0, '2021-02-04 11:27:13', '2021-02-04 11:27:13'); -INSERT INTO `eb_category` VALUES (548, 505, '/0/51/505/', '一号通注销', 5, 'api/admin/pass/logout', NULL, 0, 0, '2021-02-04 11:28:06', '2021-02-04 11:28:06'); -INSERT INTO `eb_category` VALUES (549, 505, '/0/51/505/', '一号通修改密码', 5, 'api/admin/pass/update/password', NULL, 0, 0, '2021-02-04 11:28:33', '2021-02-04 11:28:33'); -INSERT INTO `eb_category` VALUES (550, 505, '/0/51/505/', '一号通修改手机号码', 5, 'api/admin/pass/update/phone', NULL, 0, 0, '2021-02-04 11:29:02', '2021-02-04 11:29:02'); -INSERT INTO `eb_category` VALUES (551, 505, '/0/51/505/', '一号通获取验证码', 5, 'api/admin/pass/sendUserCode', NULL, 0, 0, '2021-02-04 11:30:38', '2021-02-04 11:30:38'); -INSERT INTO `eb_category` VALUES (552, 80, '/0/51/80/', '系统设置保存', 5, 'api/admin/system/config/save/form', NULL, 0, 0, '2021-02-04 11:37:51', '2021-02-04 11:37:51'); -INSERT INTO `eb_category` VALUES (553, 505, '/0/51/505/', '修改短信签名', 5, 'api/admin/sms/modify/sign', NULL, 0, 0, '2021-02-04 11:43:36', '2021-02-04 11:43:36'); -INSERT INTO `eb_category` VALUES (554, 505, '/0/51/505/', '短信模板', 5, 'api/admin/sms/temps', NULL, 0, 0, '2021-02-04 11:47:24', '2021-02-04 11:47:24'); -INSERT INTO `eb_category` VALUES (555, 505, '/0/51/505/', '申请短信模板', 5, 'api/admin/sms/temp/apply', NULL, 0, 0, '2021-02-04 11:47:52', '2021-02-04 11:47:52'); -INSERT INTO `eb_category` VALUES (556, 505, '/0/51/505/', '模板申请记录', 5, 'api/admin/sms/applys', NULL, 0, 0, '2021-02-04 11:48:41', '2021-02-04 11:48:41'); -INSERT INTO `eb_category` VALUES (559, 49, '/0/47/49/', '用户标签删除', 5, 'api/admin/user/tag/delete', NULL, 0, 0, '2021-02-04 15:37:48', '2021-02-04 15:37:48'); -INSERT INTO `eb_category` VALUES (561, 164, '/0/47/164/', '用户分组新增', 5, 'api/admin/user/group/save', NULL, 0, 0, '2021-02-04 16:16:35', '2021-02-04 16:16:35'); -INSERT INTO `eb_category` VALUES (562, 57, '/0/56/57/', '文章列表', 5, 'api/admin/article/list', NULL, 0, 0, '2021-02-04 16:27:49', '2021-02-04 16:27:49'); -INSERT INTO `eb_category` VALUES (563, 468, '/0/464/467/468/', '充值记录列表', 5, 'api/admin/user/topUpLog/list', NULL, 0, 0, '2021-02-04 17:02:14', '2021-02-04 17:02:14'); -INSERT INTO `eb_category` VALUES (564, 468, '/0/464/467/468/', '充值记录删除', 5, 'api/admin/user/topUpLog/delete', NULL, 0, 0, '2021-02-04 17:03:39', '2021-02-04 17:03:39'); -INSERT INTO `eb_category` VALUES (581, 528, '/0/66/528/', '删除素材', 5, 'api/admin/system/attachment/delete', NULL, 0, 0, '2021-02-04 17:34:29', '2021-02-04 17:35:23'); -INSERT INTO `eb_category` VALUES (582, 66, '/0/66/', '申请授权', 5, '/maintain/authCRMEB', NULL, 1, 0, '2021-02-25 19:04:23', '2021-02-25 19:11:20'); -INSERT INTO `eb_category` VALUES (583, 139, '/0/113/139/', '小程序订阅消息', 5, '/appSetting/publicRoutine/template/0', NULL, 1, 0, '2021-03-05 16:12:51', '2021-03-05 16:18:08'); -INSERT INTO `eb_category` VALUES (598, 118, '/0/118/', '视频号管理', 5, '/marketing/videoChannel', NULL, 1, 0, '2021-05-20 09:27:26', '2021-05-20 09:27:26'); -INSERT INTO `eb_category` VALUES (599, 598, '/0/118/598/', '商品列表', 5, '/marketing/videoChannel/list', NULL, 1, 0, '2021-05-20 09:43:23', '2021-05-21 14:53:08'); -INSERT INTO `eb_category` VALUES (600, 598, '/0/118/598/', '草稿列表', 5, '/marketing/videoChannel/draftList', NULL, 1, 0, '2021-05-21 14:54:28', '2021-05-21 14:54:28'); -INSERT INTO `eb_category` VALUES (601, 0, '/0/', '随笔...', 3, '', 'crmebimage/public/store/2021/12/25/489bd8c24e904f6d93a827ee0d051a52m796u5yxlu.jpeg', 1, 1, '2021-06-09 12:31:34', '2021-12-30 17:34:17'); -INSERT INTO `eb_category` VALUES (603, 51, '/0/51/', '页面管理', 5, '/operation/design', NULL, 1, 0, '2021-06-15 11:01:23', '2021-07-15 13:20:41'); -INSERT INTO `eb_category` VALUES (604, 603, '/0/51/603/', '页面设计', 5, '/operation/design/viewDesign', NULL, 1, 1, '2021-06-15 11:03:29', '2021-07-15 13:21:43'); -INSERT INTO `eb_category` VALUES (621, 603, '/0/51/603/', '一键换色', 5, '/operation/design/theme', '', 1, 2, '2021-07-15 12:00:07', '2021-07-20 11:24:25'); -INSERT INTO `eb_category` VALUES (624, 81, '/0/81/', '物流配置', 6, 'Logistics configuration', '74', 1, 1, '2021-08-13 18:37:38', '2021-08-14 10:09:03'); -INSERT INTO `eb_category` VALUES (625, 51, '/0/51/', '发货设置', 5, '/operation/deliverGoods', NULL, 1, 1, '2021-08-14 09:51:22', '2021-08-14 09:51:22'); -INSERT INTO `eb_category` VALUES (626, 625, '/0/51/625/', '提货设置', 5, '/operation/deliverGoods/takeGoods', NULL, 1, 0, '2021-08-14 09:56:59', '2021-08-14 09:56:59'); -INSERT INTO `eb_category` VALUES (627, 625, '/0/51/625/', '运费模板', 5, '/operation/deliverGoods/freightSet', NULL, 1, 0, '2021-08-14 10:01:23', '2021-08-14 10:59:21'); -INSERT INTO `eb_category` VALUES (628, 626, '/0/51/625/626/', '提货点', 5, '/operation/deliverGoods/takeGoods/deliveryAddress', NULL, 1, 0, '2021-08-14 10:42:16', '2021-08-14 10:57:45'); -INSERT INTO `eb_category` VALUES (629, 626, '/0/51/625/626/', '核销订单', 5, '/operation/deliverGoods/takeGoods/collateOrder', NULL, 1, 0, '2021-08-14 10:43:17', '2021-08-14 10:57:51'); -INSERT INTO `eb_category` VALUES (630, 626, '/0/51/625/626/', '核销员', 5, '/operation/deliverGoods/takeGoods/collateUser', NULL, 1, 0, '2021-08-14 10:43:48', '2021-08-14 10:57:59'); -INSERT INTO `eb_category` VALUES (631, 66, '/0/66/', '物流设置', 5, '/maintain/logistics', NULL, 1, 0, '2021-08-14 11:26:25', '2021-08-14 11:26:25'); -INSERT INTO `eb_category` VALUES (632, 631, '/0/66/631/', '城市数据', 5, '/maintain/logistics/cityList', NULL, 1, 0, '2021-08-14 11:27:10', '2021-08-14 11:30:48'); -INSERT INTO `eb_category` VALUES (633, 631, '/0/66/631/', '物流公司', 5, '/maintain/logistics/companyList', NULL, 1, 0, '2021-08-14 11:27:46', '2021-08-14 11:30:52'); -INSERT INTO `eb_category` VALUES (637, 0, '/0/', '统计管理', 5, '/statistic', 's-data', 1, 0, '2021-08-27 14:43:10', '2021-08-27 14:43:57'); -INSERT INTO `eb_category` VALUES (638, 637, '/0/637/', '商品统计', 5, '/statistic/product', NULL, 1, 0, '2021-08-27 14:44:27', '2021-08-27 14:44:27'); -INSERT INTO `eb_category` VALUES (639, 637, '/0/637/', '用户统计', 5, '/statistic/statuser', NULL, 1, 0, '2021-08-27 14:45:10', '2021-09-15 12:26:41'); -INSERT INTO `eb_category` VALUES (640, 637, '/0/637/', '交易统计', 5, '/statistic/transaction', NULL, 1, 0, '2021-08-27 14:45:45', '2021-08-27 14:45:45'); -INSERT INTO `eb_category` VALUES (641, 638, '/0/637/638/', '统计', 5, '/statistic/product/visualization', NULL, 1, 0, '2021-08-28 10:21:46', '2021-08-28 11:39:49'); -INSERT INTO `eb_category` VALUES (642, 638, '/0/637/638/', '商品排行', 5, '/statistic/product/tableData', NULL, 1, 0, '2021-08-28 10:22:40', '2021-08-28 11:40:00'); -INSERT INTO `eb_category` VALUES (664, 500, '/0/500/', '统计', 6, 'crmeb_tongji', '141', 1, 1, '2021-09-15 15:10:02', '2021-09-15 15:10:15'); -INSERT INTO `eb_category` VALUES (692, 0, '/0/', '散文', 3, '', 'crmebimage/public/store/2021/12/25/ee26a9207f404a47851538c7dfd777a7ltlxg7tkrm.jpeg', 1, 0, '2021-11-25 14:50:08', '2021-12-25 13:11:57'); -INSERT INTO `eb_category` VALUES (693, 500, '/0/500/', '小票打印(易联云)', 6, 'yilianyun', '143', 1, 1, '2021-11-27 16:10:47', '2021-11-27 16:11:09'); -INSERT INTO `eb_category` VALUES (694, 0, '/0/', '站点', 5, '/sites', NULL, 1, 0, '2021-11-29 16:01:24', '2021-11-29 16:01:24'); -INSERT INTO `eb_category` VALUES (695, 694, '/0/694/', '站点列表', 5, '/sites/index', NULL, 1, 0, '2021-11-29 16:01:47', '2021-11-29 16:01:47'); -INSERT INTO `eb_category` VALUES (696, 0, '/0/', ' 推广', 5, '/promotion', NULL, 1, 0, '2021-11-29 16:02:27', '2021-11-29 16:02:27'); -INSERT INTO `eb_category` VALUES (697, 696, '/0/696/', '推广管理', 5, '/promotion/manager', NULL, 1, 0, '2021-11-29 16:03:09', '2021-11-29 16:03:09'); -INSERT INTO `eb_category` VALUES (698, 696, '/0/696/', '推广记录', 5, '/promotion/record', NULL, 1, 0, '2021-11-29 16:03:24', '2021-11-29 16:03:24'); -INSERT INTO `eb_category` VALUES (718, 0, '/0/', '个人中心导航素材', 2, 'url', NULL, 0, 1, '2021-12-25 10:14:18', '2021-12-25 10:14:18'); -INSERT INTO `eb_category` VALUES (719, 0, '/0/', 'LOGO', 2, 'url', NULL, 0, 2, '2021-12-25 10:32:28', '2021-12-25 10:32:28'); -INSERT INTO `eb_category` VALUES (720, 0, '/0/', '金刚区', 2, 'url', NULL, 0, 3, '2021-12-25 10:33:41', '2021-12-25 10:33:47'); -INSERT INTO `eb_category` VALUES (721, 0, '/0/', '分类素材', 2, 'url', NULL, 0, 4, '2021-12-25 10:39:24', '2021-12-25 10:39:24'); -INSERT INTO `eb_category` VALUES (722, 0, '/0/', '五一素材', 2, 'url', NULL, 0, 1, '2021-12-25 10:44:48', '2021-12-25 10:44:48'); -INSERT INTO `eb_category` VALUES (723, 0, '/0/', '等级图标', 2, 'url', NULL, 0, 2, '2021-12-25 10:45:56', '2021-12-25 11:28:41'); -INSERT INTO `eb_category` VALUES (724, 0, '/0/', '国庆', 2, 'url', NULL, 0, 1, '2021-12-25 10:47:15', '2021-12-25 10:47:15'); -INSERT INTO `eb_category` VALUES (725, 724, '/0/724/', '国庆banner', 2, 'url', NULL, 0, 1, '2021-12-25 10:47:29', '2021-12-25 10:47:29'); -INSERT INTO `eb_category` VALUES (726, 724, '/0/724/', '国庆-tabber', 2, 'url', NULL, 0, 1, '2021-12-25 10:47:45', '2021-12-25 10:47:45'); -INSERT INTO `eb_category` VALUES (727, 724, '/0/724/', '国庆-nav', 2, 'url', NULL, 0, 1, '2021-12-25 10:48:02', '2021-12-25 10:48:02'); -INSERT INTO `eb_category` VALUES (728, 727, '/0/724/727/', '国庆-nav1', 2, 'url', NULL, 0, 1, '2021-12-25 10:48:26', '2021-12-25 10:48:26'); -INSERT INTO `eb_category` VALUES (729, 727, '/0/724/727/', '国庆nav2', 2, 'url', NULL, 0, 1, '2021-12-25 10:48:47', '2021-12-25 10:48:47'); -INSERT INTO `eb_category` VALUES (730, 0, '/0/', '双十一素材', 2, 'url', NULL, 0, 1, '2021-12-25 11:12:45', '2021-12-25 11:12:53'); -INSERT INTO `eb_category` VALUES (731, 0, '/0/', '设置素材', 2, 'url', NULL, 0, 2, '2021-12-25 11:28:24', '2021-12-25 11:28:34'); -INSERT INTO `eb_category` VALUES (732, 0, '/0/', 'Banner素材', 2, 'url', NULL, 0, 2, '2021-12-25 11:32:08', '2021-12-25 11:32:14'); -INSERT INTO `eb_category` VALUES (733, 0, '/0/', '教师节素材', 2, 'url', NULL, 0, 1, '2021-12-25 11:52:36', '2021-12-25 11:52:36'); -INSERT INTO `eb_category` VALUES (734, 0, '/0/', '中秋素材', 2, 'url', NULL, 0, 1, '2021-12-25 11:53:41', '2021-12-25 11:53:41'); -INSERT INTO `eb_category` VALUES (735, 0, '/0/', '儿童节素材', 2, 'url', NULL, 0, 1, '2021-12-25 12:00:56', '2021-12-25 12:00:56'); -INSERT INTO `eb_category` VALUES (736, 0, '/0/', '新年图标素材', 2, 'url', NULL, 0, 1, '2021-12-25 12:04:09', '2021-12-25 12:04:09'); -INSERT INTO `eb_category` VALUES (737, 0, '/0/', '商品主图', 2, 'url', NULL, 0, 1, '2021-12-25 12:48:03', '2021-12-25 12:48:03'); -INSERT INTO `eb_category` VALUES (738, 0, '/0/', '文章素材', 2, 'url', NULL, 0, 2, '2021-12-25 13:09:33', '2021-12-25 13:09:33'); -INSERT INTO `eb_category` VALUES (739, 0, '/0/', '推广海报', 2, 'url', NULL, 0, 1, '2021-12-25 13:18:13', '2021-12-25 13:18:13'); -INSERT INTO `eb_category` VALUES (740, 0, '/0/', '订单详情动图', 2, 'url', NULL, 0, 1, '2021-12-25 14:17:46', '2021-12-25 14:17:46'); - --- ---------------------------- --- Table structure for eb_express --- ---------------------------- -DROP TABLE IF EXISTS `eb_express`; -CREATE TABLE `eb_express` ( - `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '快递公司id', - `code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '快递公司简称', - `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '快递公司全称', - `partner_id` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否需要月结账号', - `partner_key` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否需要月结密码', - `net` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否需要取件网店', - `account` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '账号', - `password` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '密码', - `net_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网点名称', - `sort` int(11) NOT NULL DEFAULT 0 COMMENT '排序', - `is_show` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否显示', - `status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否可用', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE, - INDEX `is_show`(`is_show`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1639 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '快递公司表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of eb_express --- ---------------------------- -INSERT INTO `eb_express` VALUES (572, 'yunda', '韵达快递', 1, 1, 0, '1', '1', '', 0, 1, 0); -INSERT INTO `eb_express` VALUES (573, 'yuantong', '圆通速递', 1, 1, 0, '', '', '', 0, 1, 0); -INSERT INTO `eb_express` VALUES (574, 'zhongtong', '中通快递', 1, 1, 0, '', '', '', 0, 1, 0); -INSERT INTO `eb_express` VALUES (575, 'shentong', '申通快递', 1, 1, 1, '', '', '', 0, 1, 0); -INSERT INTO `eb_express` VALUES (576, 'huitongkuaidi', '百世快递', 1, 1, 0, '', '', '', 0, 1, 0); -INSERT INTO `eb_express` VALUES (577, 'jd', '京东物流', 1, 0, 0, '', '', '', 0, 1, 0); -INSERT INTO `eb_express` VALUES (578, 'jtexpress', '极兔速递', 1, 1, 0, '', '', '', 0, 1, 0); -INSERT INTO `eb_express` VALUES (579, 'tiantian', '天天快递', 1, 1, 1, '', '', '', 0, 1, 0); -INSERT INTO `eb_express` VALUES (580, 'debangwuliu', '德邦', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (581, 'debangkuaidi', '德邦快递', 1, 0, 0, '', '', '', 0, 1, 0); -INSERT INTO `eb_express` VALUES (582, 'zhongyouex', '众邮快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (583, 'youshuwuliu', '优速快递', 1, 1, 0, '', '', '', 0, 1, 0); -INSERT INTO `eb_express` VALUES (584, 'zhongtongkuaiyun', '中通快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (585, 'zhaijisong', '宅急送', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (586, 'suning', '苏宁物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (587, 'baishiwuliu', '百世快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (588, 'zhimakaimen', '芝麻开门', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (589, 'yundakuaiyun', '韵达快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (590, 'annengwuliu', '安能快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (591, 'lianhaowuliu', '联昊通', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (592, 'ubonex', '优邦速运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (593, 'kuayue', '跨越速运', 1, 1, 0, '', '', '', 0, 1, 0); -INSERT INTO `eb_express` VALUES (594, 'yuantongkuaiyun', '圆通快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (595, 'zhongyouwuliu', '中邮物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (596, 'annto', '安得物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (597, 'danniao', '丹鸟', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (598, 'suer', '速尔快递', 1, 0, 1, '', '', '', 0, 1, 0); -INSERT INTO `eb_express` VALUES (599, 'chinaicip', '卓志速运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (600, 'zhonghuan', '中环快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (601, 'yimidida', '壹米滴答', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (602, 'shpost', '同城快寄', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (603, 'kuaijiesudi', '快捷速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (604, 'disifang', '递四方', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (605, 'lntjs', '特急送', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (606, 'rrs', '日日顺物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (607, 'sxjdfreight', '顺心捷达', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (608, 'idamalu', '大马鹿', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (609, 'xinfengwuliu', '信丰物流', 1, 1, 0, '', '', '', 0, 1, 0); -INSERT INTO `eb_express` VALUES (610, 'ztky', '中铁快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (611, 'btexpress', '邦泰快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (612, 'tiandihuayu', '天地华宇', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (613, 'lianbangkuaidi', '联邦快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (614, 'banma', '斑马物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (615, 'longbanwuliu', '龙邦速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (616, 'flyway', '程光快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (617, 'subida', '速必达', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (618, 'jinguangsudikuaijian', '京广速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (619, 'weitepai', '微特派', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (620, 'yuxinwuliu', '宇鑫物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (621, 'sdto', '速达通', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (622, 'huisenky', '汇森速运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (623, 'guotongkuaidi', '国通快递', 1, 1, 1, '', '', '', 0, 1, 0); -INSERT INTO `eb_express` VALUES (624, 'bsht', '百事亨通', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (625, 'jiuyescm', '九曳供应链', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (626, 'sunjex', '新杰物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (627, 'zhongtiewuliu', '中铁物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (628, 'adapost', '安达速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (629, 'wanjiawuliu', '万家物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (630, 'shenghuiwuliu', '盛辉物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (631, 'zhengyikuaidi', '鑫正一快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (632, 'savor', '海信物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (633, 'qexpress', '易达通快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (634, 'sanhuwuliu', '叁虎物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (635, 'polarexpress', '极地快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (636, 'rufengda', '如风达', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (637, 'wanxiangwuliu', '万象物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (638, 'zhongtongphone', '中通（带电话）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (639, 'lbex', '龙邦物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (640, 'jinan', '金岸物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (641, 'sxexpress', '三象速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (642, 'jiayunmeiwuliu', '加运美', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (643, 'hac56', '瀚朝物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (644, 'la911', '鼎润物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (645, 'mosuda', '魔速达', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (646, 'suteng', '广东速腾物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (647, 'feiyuanvipshop', '飞远配送', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (648, 'pingandatengfei', '平安达腾飞', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (649, 'guexp', '全联速运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (650, 'hengluwuliu', '恒路物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (651, 'wjkwl', '万家康物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (652, 'xdexpress', '迅达速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (653, 'yw56', '燕文物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (654, 'bflg', '上海缤纷物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (655, 'nebuex', '星云速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (656, 'unitedex', '联合速运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (657, 'jiajiwuliu', '佳吉快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (658, 'beebird', '锋鸟物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (659, 'tzky', '铁中快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (660, 'httx56', '汇通天下物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (661, 'jumstc', '聚盟共建', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (662, 'crazyexpress', '疯狂快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (663, 'sut56', '速通物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (664, 'zengyisudi', '增益速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (665, 'valueway', '美通', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (666, 'jssdt56', '时达通', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (667, 'yuanfeihangwuliu', '原飞航', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (668, 'zhongsukuaidi', '中速快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (669, 'ane66', '安能快递', 1, 0, 0, '', '', '', 0, 1, 0); -INSERT INTO `eb_express` VALUES (670, 'anxl', '安迅物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (671, 'fujisuyun', '富吉速运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (672, 'jiajikuaidi', '佳吉快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (673, 'ndwl', '南方传媒物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (674, 'huangmajia', '黄马甲', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (675, 'hnht56', '鸿泰物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (676, 'shangda', '上大物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (677, 'ytkd', '运通中港快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (678, 'dekuncn', '德坤物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (679, 'quansutong', '全速通', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (680, 'cccc58', '中集冷云', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (681, 'dfwl', '达发物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (682, 'quanfengkuaidi', '全峰快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (683, 'fastgoexpress', '速派快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (684, 'yujtong', '宇捷通', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (685, 'chuangyi', '创一快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (686, 'ganzhongnengda', '能达速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (687, 'yidatong', '易达通', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (688, 'oneexpress', '一速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (689, 'datianwuliu', '大田物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (690, 'quanyikuaidi', '全一快递', 1, 0, 0, '', '', '', 0, 1, 0); -INSERT INTO `eb_express` VALUES (691, 'pjbest', '品骏快递', 1, 1, 0, '', '', '', 0, 1, 0); -INSERT INTO `eb_express` VALUES (692, 'shangqiao56', '商桥物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (693, 'tianma', '天马迅达', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (694, 'yousutongda', '优速通达', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (695, 'yuananda', '源安达', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (696, 'astexpress', '安世通快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (697, 'exfresh', '安鲜达', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (698, 'jialidatong', '嘉里大通', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (699, 'nanjingshengbang', '晟邦物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (700, 'pfcexpress', '皇家物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (701, 'qinyuan', '秦远物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (702, 'runhengfeng', '全时速运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (703, 'dayangwuliu', '大洋物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (704, 'heimao56', '黑猫速运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (705, 'huaxiahuoyun', '华夏货运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (706, 'longfx', 'LUCFLOW EXPRESS', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (707, 'zjstky', '苏通快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (708, 'zlink', '三真驿道', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (709, 'hd', '宏递快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (710, 'hrex', '锦程快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (711, 'sfwl', '盛丰物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (712, 'yuanchengwuliu', '远成物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (713, 'eshunda', '俄顺达', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (714, 'est365', '东方汇', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (715, 'lijisong', '成都立即送', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (716, 'morelink56', 'MoreLink', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (717, 'topspeedex', '中运全速', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (718, 'yunfeng56', '韵丰物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (719, 'express7th', '7号速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (720, 'wherexpess', '威盛快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (721, 'yizhengdasuyun', '一正达速运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (722, 'youyou', '优优速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (723, 'ztong', '智通物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (724, 'chinapostcb', '中邮电商', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (725, 'hlyex', '好来运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (726, 'jgwl', '景光物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (727, 'jiujiuwl', '久久物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (728, 'minghangkuaidi', '民航快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (729, 'quansu', '全速物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (730, 'tywl99', '天翼物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (731, 'wondersyd', '中邮速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (732, 'yafengsudi', '亚风速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (733, 'ytchengnuoda', '承诺达', 1, 1, 0, '', '', '', 0, 1, 0); -INSERT INTO `eb_express` VALUES (734, 'anxindakuaixi', '安信达', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (735, 'chengtong', '城通物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (736, 'eupackage', '易优包裹', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (737, 'ftky365', '丰通快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (738, 'gslhkd', '联合快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (739, 'jiayiwuliu', '佳怡物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (740, 'jieborne', '捷邦物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (741, 'jxfex', '集先锋快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (742, 'luben', '陆本速递 LUBEN EXPRESS', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (743, 'tykd', '天翼快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (744, 'baitengwuliu', '百腾物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (745, 'biaojikuaidi', '彪记快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (746, 'boyol', '贝业物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (747, 'exsuda', 'E速达', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (748, 'feikangda', '飞康达', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (749, 'jiacheng', '佳成快递 ', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (750, 'jingshun', '景顺物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (751, 'mingliangwuliu', '明亮物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (752, 'shunjiefengda', '顺捷丰达', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (753, 'sundarexpress', '顺达快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (754, 'yaofeikuaidi', '耀飞同城快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (755, '1ziton', '一智通', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (756, 'alog', '心怡物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (757, 'bdatong', '八达通', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (758, 'bosind', '堡昕德速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (759, 'buytong', '百通物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (760, 'changyuwuliu', '长宇物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (761, 'chuanxiwuliu', '传喜物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (762, 'chunghwa56', '中骅物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (763, 'cnspeedster', '速舟物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (764, 'didasuyun', '递达速运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (765, 'emswuliu', 'EMS物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (766, 'feibaokuaidi', '飞豹快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (767, 'gda', '安的快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (768, 'gdkjk56', '快捷快物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (769, 'guoeryue', '天天快物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (770, 'hotwms', '皇家云仓', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (771, 'ht22', '海淘物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (772, 'huaqikuaiyun', '华企快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (773, 'jcsuda', '嘉诚速达', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (774, 'longcps', '加拿大龙行速运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (775, 'newsway', '家家通快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (776, 'qbexpress', '秦邦快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (777, 'quanritongkuaidi', '全日通', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (778, 'sanshengco', '三盛快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (779, 'shangcheng', '尚橙物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (780, 'shunfenghk', '顺丰-繁体', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (781, 'spring56', '春风物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (782, 'sxhongmajia', '红马甲物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (783, 'szshihuatong56', '世华通物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (784, 'wto56kj', '臣邦同城', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (785, 'xiangteng', '翔腾物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (786, 'xunsuexpress', '迅速快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (787, 'yongchangwuliu', '永昌物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (788, 'yuanzhijiecheng', '元智捷诚', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (789, 'yuefengwuliu', '越丰物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (790, 'zhongjiwuliu', '中技物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (791, 'zlxdjwl', '中粮鲜到家物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (792, 'adaexpress', '明大快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (793, 'advancing', '安达信', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (794, 'agopost', '全程快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (795, 'ahdf', '德方物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (796, 'ahkbps', '卡邦配送', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (797, 'aliexpress', '无忧物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (798, 'anjiatongcheng', '安家同城快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (799, 'anjie88', '安捷物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (800, 'anjiekuaidi', '青岛安捷快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (801, 'anlexpress', '新干线快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (802, 'apgecommerce', 'apgecommerce', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (803, 'ariesfar', '艾瑞斯远', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (804, 'ausbondexpress', '澳邦国际物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (805, 'auvanda', '中联速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (806, 'baishiyp', '百世云配', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (807, 'bangsongwuliu', '邦送物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (808, 'baotongkd', '宝通快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (809, 'baoxianda', '报通快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (810, 'bazirim', '皮牙子快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (811, 'beckygo', '佰麒快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (812, 'bee001', '蜜蜂速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (813, 'benteng', '奔腾物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (814, 'bjqywl', '青云物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (815, 'bjxsrd', '鑫锐达', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (816, 'bljt56', '佰乐捷通', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (817, 'bmlchina', '标杆物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (818, 'bqcwl', '百千诚物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (819, 'byht', '展勤快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (820, 'canhold', '能装能送', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (821, 'cbo56', '钏博物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (822, 'ccd', '河南次晨达', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (823, 'cdjx56', '捷祥物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (824, 'cdxinchen56', '鑫宸物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (825, 'cex', '城铁速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (826, 'cfss', '银雁专送', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (827, 'chengji', '城际快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (828, 'chengpei', '河北橙配', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (829, 'chinastarlogistics', '华欣物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (830, 'chinatzx', '同舟行物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (831, 'chllog', '嘉荣物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (832, 'cht361', '诚和通', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (833, 'city56', '城市映急', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (834, 'cjkoreaexpress', '大韩通运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (835, 'cneulogistics', '中欧物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (836, 'cpsair', '华中快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (837, 'cqxingcheng', '重庆星程快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (838, 'crossbox', '环旅快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (839, 'csxss', '新时速物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (840, 'czwlyn', '云南诚中物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (841, 'dadaoex', '大道物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (842, 'dande56', '丹递56', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (843, 'dasu', '达速物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (844, 'dechuangwuliu', '深圳德创物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (845, 'decnlh', '德中快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (846, 'dfkuaidi', '东风快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (847, 'dfpost', '达方物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (848, 'di5pll', '递五方云仓', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (849, 'diantongkuaidi', '店通快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (850, 'dianyi', '云南滇驿物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (851, 'dingdong', '叮咚快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (852, 'djy56', '天翔东捷运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (853, 'donghanwl', '东瀚物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (854, 'donghong', '东红物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (855, 'dongjun', '成都东骏物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (856, 'duodao56', 'duodao56', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (857, 'edaeuexpress', '易达快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (858, 'efspost', 'EFSPOST', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (859, 'el56', '易联通达', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (860, 'eusacn', '优莎速运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (861, 'excocotree', '可可树美中速运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (862, 'fanyukuaidi', '凡宇快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (863, 'fastzt', '正途供应链', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (864, 'fbkd', '飞邦快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (865, 'feihukuaidi', '飞狐快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (866, 'feikuaida', '飞快达', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (867, 'fenghuangkuaidi', '凤凰快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (868, 'fengyee', '丰羿', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (869, 'flysman', '飞力士物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (870, 'fsexp', '全速快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (871, 'ftlexpress', '法翔速运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (872, 'fyex', '飞云快递系统', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (873, 'gaotieex', '高铁快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (874, 'gdct56', '广东诚通物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (875, 'gdqwwl', '全网物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (876, 'gdrz58', '容智快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (877, 'gdxp', '新鹏快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (878, 'ghl', '环创物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (879, 'gjwl', '冠捷物流 ', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (880, 'gml', '英脉物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (881, 'goldjet', '高捷快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (882, 'gongsuda', '共速达', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (883, 'gooday365', '日日顺智慧物联', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (884, 'gscq365', '哥士传奇速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (885, 'gswtkd', '万通快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (886, 'gtongsudi', '广通速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (887, 'gttexpress', 'GTT EXPRESS快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (888, 'guangdongtonglu', '广东通路', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (889, 'guosong', '国送快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (890, 'gxwl', '光线速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (891, 'gzxingcheng', '贵州星程快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (892, 'haihongwangsong', '海红网送', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (893, 'haimengsudi', '海盟速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (894, 'haixingqiao', '海星桥快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (895, 'haizhongzhuanyun', '海中转运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (896, 'hanfengjl', '翰丰快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (897, 'hangrui', '上海航瑞货运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (898, 'hangyu', '航宇快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (899, 'haoyoukuai', '好又快物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (900, 'happylink', '开心快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (901, 'hdcexpress', '汇达物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (902, 'hengrui56', '恒瑞物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (903, 'hexinexpress', '合心速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (904, 'hgy56', '环国运物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (905, 'hhair56', '华瀚快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (906, 'hjs', '猴急送', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (907, 'hlkytj', '互联快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (908, 'hlpgyl', '共联配', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (909, 'hltop', '海联快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (910, 'hmus', '华美快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (911, 'hnfy', '飞鹰物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (912, 'hnqst', '河南全速通', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (913, 'hnssd56', '顺时达物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (914, 'hnzqwl', '中强物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (915, 'homexpress', '居家通', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (916, 'hongbeixin', '红背心', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (917, 'hongpinwuliu', '宏品物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (918, 'hongywl', '红远物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (919, 'hrbzykd', '卓烨快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (920, 'hre', '高铁速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (921, 'hsgtsd', '海硕高铁速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (922, 'htongexpress', '华通快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (923, 'htwd', '华通务达物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (924, 'huada', '华达快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (925, 'huandonglg', '环东物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (926, 'huiqiangkuaidi', '汇强快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (927, 'huoban', '兰州伙伴物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (928, 'hutongwuliu', '户通物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (929, 'hyeship', '鸿远物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (930, 'hyytes', '恒宇运通', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (931, 'hzpl', '华航快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (932, 'idada', '大达物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (933, 'jdexpressusa', '骏达快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (934, 'jdpplus', '急递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (935, 'jiajiatong56', '佳家通货运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (936, 'jiajiawl', '加佳物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (937, 'jiazhoumao', '加州猫速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (938, 'jieanda', '捷安达', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (939, 'jinchengwuliu', '锦程物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (940, 'jindawuliu', '金大物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (941, 'jintongkd', '劲通快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (942, 'jinyuekuaidi', '晋越快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (943, 'jisu', '冀速物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (944, 'jiugong', '九宫物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (945, 'jiuyicn', '久易快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (946, 'jixianda', '急先达', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (947, 'jjx888', '佳捷翔物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (948, 'jsexpress', '骏绅物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (949, 'juding', '聚鼎物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (950, 'juwu', '聚物物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (951, 'juzhongda', '聚中大', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (952, 'kejie', '科捷物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (953, 'kerrytj', '嘉里大荣物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (954, 'kfwnet', '快服务', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (955, 'khzto', '柬埔寨中通', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (956, 'koalaexp', '考拉速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (957, 'ksudi', '快速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (958, 'kuai8', '快8速运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (959, 'kuaidawuliu', '快达物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (960, 'kuaitao', '快淘快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (961, 'kuaiyouda', '四川快优达速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (962, 'kxda', '凯信达', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (963, 'lanbiaokuaidi', '蓝镖快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (964, 'lanhukuaidi', '蓝弧快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (965, 'lasy56', '林安物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (966, 'lbbk', '立白宝凯物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (967, 'ledaowuliu', '楽道物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (968, 'ledii', '乐递供应链', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (969, 'letseml', '美联快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (970, 'lianbangkuaidien', '联邦快递-英文', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (971, 'lianyun', '联运快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (972, 'lishi', '丽狮物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (973, 'littlebearbear', '小熊物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (974, 'longlangkuaidi', '隆浪快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (975, 'longvast', '长风物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (976, 'lqht', '恒通快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (977, 'ltexp', '乐天速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (978, 'lutong', '鲁通快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (979, 'mailikuaidi', '麦力快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (980, 'mailongdy', '迈隆递运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (981, 'mangguo', '芒果速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (982, 'mchy', '木春货运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (983, 'meidaexpress', '美达快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (984, 'meitai', '美泰物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (985, 'milkyway', '银河物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (986, 'minbangsudi', '民邦速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (987, 'mjexp', '美龙快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (988, 'mxe56', '中俄速通（淼信）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (989, 'nalexpress', '新亚物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (990, 'nedahm', '红马速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (991, 'nell', '尼尔快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (992, 'niuzaiexpress', '牛仔速运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (993, 'njhaobo', '浩博物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (994, 'nmhuahe', '华赫物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (995, 'nntengda', '腾达速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (996, 'onway', '昂威物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (997, 'overseaex', '波音速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (998, 'peex', '派尔快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (999, 'peisihuoyunkuaidi', '配思货运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1000, 'peixingwuliu', '陪行物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1001, 'pengcheng', '鹏程快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1002, 'pinsuxinda', '品速心达快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1003, 'pinxinkuaidi', '品信快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1004, 'pmt0704be', '龙行天下', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1005, 'polarisexpress', '北极星快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1006, 'pzhjst', '急顺通', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1007, 'qhxykd', '雪域快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1008, 'qhxyyg', '雪域易购', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1009, 'qianli', '千里速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1010, 'qskdyxgs', '千顺快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1011, 'quanchuan56', '全川物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1012, 'quanjitong', '全际通', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1013, 'quantwl', '全通快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1014, 'quanxintong', '全信通快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1015, 'qzx56', '全之鑫物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1016, 'rhtexpress', '睿和泰速运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1017, 'riyuwuliu', '日昱物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1018, 'rokin', '荣庆物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1019, 'rrskx', '日日顺快线', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1020, 'santaisudi', '三态速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1021, 'sccod', '丰程物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1022, 'scsujiada', '速佳达快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1023, 'scxingcheng', '四川星程快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1024, 'sczpds', '速呈', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1025, 'sdsy888', '首达速运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1026, 'sfift', '十方通物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1027, 'sfjhd', '圣飞捷快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1028, 'shanda56', '衫达快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1029, 'shanghaikuaitong', '上海快通', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1030, 'shangtuguoji', '尚途国际货运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1031, 'shaoke', '捎客物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1032, 'shd56', '商海德物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1033, 'shenganwuliu', '圣安物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1034, 'shengtongscm', '盛通快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1035, 'shenjun', '神骏物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1036, 'shenma', '神马快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1037, 'shiningexpress', '阳光快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1038, 'shipbyace', '王牌快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1039, 'shipsoho', '苏豪快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1040, 'shiyunkuaidi', '世运快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1041, 'shunfengtongcheng', '顺丰同城', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1042, 'shunjieda', '顺捷达', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1043, 'shunshid', '顺士达速运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1044, 'signedexpress', '签收快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1045, 'sihaiet', '四海快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1046, 'sihiexpress', '四海捷运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1047, 'sixroad', '易普递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1048, 'sofast56', '嗖一下同城快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1049, 'speeda', '行必达', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1050, 'speedoex', '申必达', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1051, 'staky', '首通快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1052, 'starex', '星速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1053, 'staryvr', '星运快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1054, 'stkd', '顺通快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1055, 'subaoex', '速豹', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1056, 'sucheng', '速呈宅配', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1057, 'sucmj', '特急便物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1058, 'sufengkuaidi', '速风快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1059, 'suijiawuliu', '穗佳物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1060, 'sujievip', '郑州速捷', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1061, 'sunspeedy', '新速航', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1062, 'supinexpress', '速品快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1063, 'szuem', '联运通物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1064, 'taijin', '泰进物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1065, 'taimek', '天美快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1066, 'tianxiang', '天翔快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1067, 'tianzong', '天纵物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1068, 'timedg', '万家通快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1069, 'tlky', '天联快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1070, 'tmg', '株式会社T.M.G', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1071, 'tongdaxing', '通达兴物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1072, 'tonghetianxia', '通和天下', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1073, 'ugoexpress', '邮鸽速运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1074, 'uluckex', '优联吉运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1075, 'vps', '维普恩物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1076, 'wanboex', '万博快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1077, 'wandougongzhu', '豌豆物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1078, 'wanjiatong', '宁夏万家通', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1079, 'wdm', '万达美', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1080, 'westwing', '西翼物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1081, 'wexpress', '威速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1082, 'winit', '万邑通', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1083, 'wlfast', '凡仕特物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1084, 'wowvip', '沃埃家', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1085, 'wtdchina', '威时沛运货运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1086, 'wuliuky', '五六快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1087, 'wuyuansudi', '伍圆速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1088, 'xdshipping', '国晶物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1089, 'xflt56', '蓝天物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1090, 'xianchengliansudi', '西安城联速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1091, 'xiangdawuliu', '湘达物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1092, 'xianglongyuntong', '祥龙运通物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1093, 'xilaikd', '西安喜来快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1094, 'xingyuankuaidi', '新元快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1095, 'xinning', '新宁物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1096, 'xsrd', '鑫世锐达', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1097, 'xtb', '鑫通宝物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1098, 'xyd666', '鑫远东速运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1099, 'yatfai', '一辉物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1100, 'ycgky', '远成快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1101, 'ydglobe', '云达通', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1102, 'ydhex', 'YDH', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1103, 'yhtlogistics', '宇航通物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1104, 'yibangwuliu', '一邦速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1105, 'yidihui', '驿递汇速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1106, 'yiex', '宜送物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1107, 'yifankd', '艺凡快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1108, 'yihangmall', '易航物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1109, 'yilingsuyun', '亿领速运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1110, 'yinjiesudi', '银捷速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1111, 'yiqisong', '一起送', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1112, 'yisong', '宜送', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1113, 'yitongda', '易通达', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1114, 'yiyou', '易邮速运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1115, 'yjhgo', '武汉优进汇', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1116, 'ynztsy', '纵通速运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1117, 'youjia', '友家速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1118, 'youlai', '邮来速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1119, 'ypsd', '壹品速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1120, 'ytky168', '运通快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1121, 'yuandun', '远盾物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1122, 'yue777', '玥玛速运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1123, 'yufeng', '御风速运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1124, 'yujiawl', '宇佳物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1125, 'yuntong', '运通速运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1126, 'yuntongkuaidi', '运通中港', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1127, 'ywexpress', '远为快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1128, 'yyexp', '西安运逸快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1129, 'yyqc56', '一运全成物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1130, 'zf365', '珠峰速运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1131, 'zhdwl', '众辉达物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1132, 'zhitengwuliu', '志腾物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1133, 'zhongtianwanyun', '中天万运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1134, 'zhongxinda', '忠信达', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1135, 'zhpex', '众派速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1136, 'zhuoshikuaiyun', '卓实快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1137, 'zjcy56', '创运物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1138, 'zsda56', '转瞬达集运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1139, 'zsky123', '准实快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1140, 'zsmhwl', '明辉物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1141, 'zy100', '中远快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1142, 'shunfeng', '顺丰速运', 1, 0, 0, '', '', '', 0, 1, 0); -INSERT INTO `eb_express` VALUES (1143, 'youzhengguonei', '邮政快递包裹', 1, 1, 0, '', '', '', 0, 1, 0); -INSERT INTO `eb_express` VALUES (1144, 'ems', 'EMS', 1, 1, 0, '', '', '', 0, 1, 0); -INSERT INTO `eb_express` VALUES (1145, 'youzhengbk', '邮政标准快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1146, 'youzhengguoji', '国际包裹', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1147, 'ups', 'UPS', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1148, 'dhlen', 'DHL-全球件', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1149, 'fedex', 'FedEx-国际件', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1150, 'ewe', 'EWE全球快递', 1, 1, 0, '', '', '', 0, 1, 0); -INSERT INTO `eb_express` VALUES (1151, 'zhongtongguoji', '中通国际', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1152, 'dhl', 'DHL-中国件', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1153, 'emsguoji', 'EMS-国际件', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1154, 'upsen', 'UPS-全球件', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1155, 'rlgaus', '澳洲飞跃物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1156, 'usps', 'USPS', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1157, 'auspost', '澳大利亚(Australia Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1158, 'arkexpress', '方舟速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1159, 'hkems', '云邮跨境快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1160, 'meiquick', '美快国际物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1161, 'auexpress', '澳邮中国快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1162, 'yuantongguoji', '圆通国际', 1, 1, 0, '', '', '', 0, 1, 0); -INSERT INTO `eb_express` VALUES (1163, 'sendtochina', '速递中国', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1164, 'auod', '澳德物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1165, 'bpost', '比利时（Bpost）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1166, 'japanposten', '日本（Japan Post）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1167, 'dhlde', 'DHL-德国件（DHL Deutschland）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1168, 'guangdongyouzhengwuliu', '广东邮政', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1169, 'yangbaoguo', '洋包裹', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1170, 'superb', 'Superb Grace', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1171, 'aramex', 'Aramex', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1172, 'newzealand', '新西兰（New Zealand Post）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1173, 'zhuanyunsifang', '转运四方', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1174, 'austa', 'Austa国际速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1175, 'dpd', 'DPD', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1176, 'fedexcn', 'Fedex-国际件-中文', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1177, 'xlobo', 'Xlobo贝海国际', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1178, 'tntau', 'TNT Australia', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1179, 'uszcn', '转运中国', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1180, 'tnt', 'TNT', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1181, 'changjiang', '长江国际速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1182, 'dpex', 'DPEX', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1183, 'emsbg', 'EMS包裹', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1184, 'aae', 'AAE-中国件', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1185, 'stosolution', '申通国际', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1186, 'nsf', '新顺丰（NSF）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1187, 'epanex', '泛捷国际速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1188, 'ueq', 'UEQ快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1189, 'wlwex', '星空国际', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1190, 'ftd', '富腾达国际货运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1191, 'emsinten', 'EMS-国际件-英文', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1192, 'yuntrack', 'YUN TRACK', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1193, 'baifudongfang', '百福东方', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1194, 'chszhonghuanguoji', 'CHS中环国际快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1195, 'wotu', '渥途国际速运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1196, 'dsukuaidi', 'D速快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1197, 'aotsd', '澳天速运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1198, 'coe', 'COE', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1199, 'dpexen', 'Toll', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1200, 'ucs', '合众速递(UCS）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1201, 'haidaibao', '海带宝', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1202, 'ubuy', '德国优拜物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1203, 'onehcang', '一号仓', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1204, 'tstexp', 'TST速运通', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1205, 'chukou1', '出口易', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1206, 'chnexp', '中翼国际物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1207, 'hkpost', '中国香港(HongKong Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1208, 'canpar', 'Canpar', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1209, 'cnpex', 'CNPEX中邮快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1210, 'euasia', '欧亚专线', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1211, 'sagawa', '佐川急便', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1212, 'doortodoor', 'CJ物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1213, 'fedexus', 'FedEx-美国件', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1214, 'etong', 'E通速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1215, 'ocs', 'OCS', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1216, 'phlpost', '菲律宾（Philippine Postal）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1217, 'shlindao', '林道国际快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1218, 'tnten', 'TNT-全球件', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1219, 'bht', 'BHT', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1220, 'cnausu', '中澳速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1221, 'emsen', 'EMS-英文', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1222, 'deutschepost', '德国(Deutsche Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1223, 'huanqiu', '环球速运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1224, 'postnlcn', '荷兰邮政-中文(PostNL international reg', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1225, 'correosdees', '西班牙(Correos de Espa?a)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1226, 'myhermes', 'MyHermes', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1227, 'parcelforce', '英国大包、EMS（Parcel Force）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1228, 'canpost', '加拿大(Canada Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1229, 'taoplus', '淘布斯国际物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1230, 'farlogistis', '泛远国际物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1231, 'gsm', 'GSM', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1232, 'italiane', '意大利(Poste Italiane)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1233, 'tnjex', '明通国际快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1234, 'transrush', 'TransRush', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1235, 'zhongchuan', '众川国际', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1236, 'csuivi', '法国(La Poste)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1237, 'efs', 'EFS Post（平安快递）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1238, 'lfexpress', '龙枫国际快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1239, 'ajlogistics', '澳捷物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1240, 'colissimo', '法国小包（colissimo）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1241, 'gslexpress', '德尚国际速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1242, 'lineone', '一号线', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1243, 'postnlchina', '荷兰邮政-中国件', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1244, 'synship', 'SYNSHIP快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1245, 'youban', '邮邦国际', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1246, 'bjemstckj', '北京EMS', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1247, 'com1express', '商壹国际物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1248, 'ecmscn', '易客满', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1249, 'gts', 'GTS快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1250, 'meiguokuaidi', '美国快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1251, 'tcat', '黑猫宅急便', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1252, 'trakpak', 'TRAKPAK', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1253, 'wedepot', 'wedepot物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1254, 'zhaijibian', '宅急便', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1255, 'abf', 'ABF', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1256, 'anposten', '爱尔兰(An Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1257, 'bulgarian', '保加利亚（Bulgarian Posts）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1258, 'chronopostport', 'Chronopost Portugal', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1259, 'cnexps', 'CNE', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1260, 'dhlbenelux', 'DHL Benelux', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1261, 'dhlecommerce', 'dhl小包', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1262, 'jiachenexpress', '佳辰国际速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1263, 'lasership', 'LaserShip', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1264, 'skynetmalaysia', 'SkyNet Malaysia', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1265, 'swisspost', '瑞士(Swiss Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1266, 'trackparcel', 'track-parcel', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1267, 'uscbexpress', '易境达国际物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1268, 'xynyc', '新元国际', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1269, 'adp', 'ADP国际快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1270, 'asendiausa', 'Asendia USA', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1271, 'ausexpress', '澳世速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1272, 'cllexpress', '澳通华人物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1273, 'comexpress', '邦通国际', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1274, 'cosco', '中远e环球', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1275, 'gotoubi', 'UBI Australia', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1276, 'hermes', 'Hermes', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1277, 'ibuy8', '爱拜物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1278, 'japanpost', '日本郵便', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1279, 'kcs', 'KCS', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1280, 'lsexpress', '6LS EXPRESS', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1281, 'moldova', '摩尔多瓦(Posta Moldovei)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1282, 'pengyuanexpress', '鹏远国际速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1283, 'postdanmarken', '丹麦(Post Denmark)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1284, 'postnl', '荷兰邮政(PostNL international regist', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1285, 'postnlpacle', '荷兰包裹(PostNL International Parcel', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1286, 'postserv', '台湾（中华邮政）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1287, 'purolator', 'Purolator', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1288, 'saiaodi', '赛澳递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1289, 'shipgce', '飞洋快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1290, 'singpost', '新加坡小包(Singapore Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1291, 'slovenia', '斯洛文尼亚(Slovenia Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1292, 'stoexpress', '美国申通', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1293, 'tollpriority', 'Toll Priority(Toll Online)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1294, 'zhonghuanus', '中环转运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1295, 'a2u', 'A2U速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1296, 'abcglobal', '全球快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1297, 'adiexpress', '安达易国际速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1298, 'adlerlogi', '德国雄鹰速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1299, 'afghan', '阿富汗(Afghan Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1300, 'afl', 'AFL', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1301, 'airgtc', '航空快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1302, 'airpak', 'airpak expresss', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1303, 'ajexpress', '捷记方舟', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1304, 'albania', '阿尔巴尼亚(Posta shqipatre)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1305, 'amazoncnorder', '亚马逊中国订单', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1306, 'amcnorder', 'amazon-国内订单', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1307, 'amusorder', 'amazon-国际订单', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1308, 'aolau', 'AOL澳通速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1309, 'aosu', '澳速物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1310, 'aplus100', '美国汉邦快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1311, 'aplusex', 'Aplus物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1312, 'aruba', '阿鲁巴[荷兰]（Post Aruba）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1313, 'auex', '澳货通', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1314, 'austria', '奥地利(Austrian Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1315, 'auvexpress', 'AUV国际快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1316, 'axexpress', '澳新物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1317, 'azerbaijan', '阿塞拜疆EMS(EMS AzerExpressPost)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1318, 'bahrain', '巴林(Bahrain Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1319, 'bangbangpost', '帮帮发', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1320, 'bangladesh', '孟加拉国(EMS)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1321, 'barbados', '巴巴多斯(Barbados Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1322, 'bcwelt', 'BCWELT', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1323, 'belgiumpost', '比利时(Belgium Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1324, 'belize', '伯利兹(Belize Postal)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1325, 'belpost', '白俄罗斯(Belpochta)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1326, 'benniao', '笨鸟国际', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1327, 'bester', '飛斯特', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1328, 'bluedart', 'BlueDart', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1329, 'bohei', '波黑(JP BH Posta)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1330, 'bolivia', '玻利维亚', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1331, 'borderguru', 'BorderGuru', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1332, 'botspost', '博茨瓦纳', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1333, 'bphchina', '速方(Sufast)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1334, 'bpostinter', '比利时国际(Bpost international)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1335, 'brazilposten', '巴西(Brazil Post/Correios)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1336, 'brunei', '文莱(Brunei Postal)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1337, 'caledonia', '新喀里多尼亚[法国](New Caledonia)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1338, 'cambodia', '柬埔寨(Cambodia Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1339, 'camekong', '到了港', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1340, 'cameroon', '喀麦隆(CAMPOST)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1341, 'campbellsexpress', 'Campbell’s Express', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1342, 'canpostfr', '加拿大邮政', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1343, 'cargolux', '卢森堡航空', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1344, 'cces', 'CCES/国通快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1345, 'cdek', 'CDEK', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1346, 'ceskaposta', '捷克（?eská po?ta）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1347, 'cevalogistics', 'CEVA Logistic', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1348, 'changwooair', '昌宇国际', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1349, 'chengda', '成达国际速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1350, 'chile', '智利(Correos Chile)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1351, 'chinasqk', 'SQK国际速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1352, 'chronopostfra', '法国大包、EMS-法文（Chronopost France）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1353, 'chronopostfren', '法国大包、EMS-英文(Chronopost France)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1354, 'chunfai', '中国香港骏辉物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1355, 'citylink', 'City-Link', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1356, 'citysprint', 'citysprint', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1357, 'ckeex', '城晓国际快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1358, 'cloudexpress', 'CE易欧通国际速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1359, 'clsp', 'CL日中速运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1360, 'cnair', 'CNAIR', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1361, 'cncexp', 'C&C国际速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1362, 'cnup', 'CNUP 中联邮', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1363, 'cnws', '中国翼', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1364, 'colombia', '哥伦比亚(4-72 La Red Postal de Colom', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1365, 'correios', '莫桑比克（Correios de Moçambique）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1366, 'correo', '乌拉圭（Correo Uruguayo）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1367, 'correoargentino', '阿根廷(Correo Argentina)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1368, 'correos', '哥斯达黎加(Correos de Costa Rica)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1369, 'ctoexp', '泰国中通CTO', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1370, 'cypruspost', '塞浦路斯(Cyprus Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1371, 'dcs', 'DCS', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1372, 'deltec', 'Deltec Courier', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1373, 'desworks', '澳行快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1374, 'dhlhk', 'DHL HK', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1375, 'dhlnetherlands', 'DHL-荷兰（DHL Netherlands）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1376, 'dhlpoland', 'DHL-波兰（DHL Poland）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1377, 'dindon', '叮咚澳洲转运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1378, 'directlink', 'Direct Link', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1379, 'disifangau', '递四方澳洲', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1380, 'disifangus', '递四方美国', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1381, 'dpdgermany', 'DPD Germany', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1382, 'dpdpoland', 'DPD Poland', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1383, 'dpduk', 'DPD UK', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1384, 'dtdcindia', 'DTDC India', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1385, 'ealceair', '东方航空物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1386, 'easyexpress', 'EASY EXPRESS', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1387, 'ecallturn', 'E跨通', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1388, 'ecfirstclass', 'EC-Firstclass', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1389, 'ecmsglobal', 'ECMS Express', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1390, 'ecotransite', '东西E全运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1391, 'ecuador', '厄瓜多尔(Correos del Ecuador)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1392, 'edragon', '龙象国际物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1393, 'edtexpress', 'e直运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1394, 'egypt', '埃及（Egypt Post）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1395, 'eiffel', '艾菲尔国际速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1396, 'elta', '希腊包裹（ELTA Hellenic Post）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1397, 'eltahell', '希腊EMS（ELTA Courier）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1398, 'emirates', '阿联酋(Emirates Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1399, 'emms', '澳州顺风快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1400, 'emonitoring', '波兰小包(Poczta Polska)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1401, 'emssouthafrica', '南非EMS', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1402, 'emsukraine', '乌克兰EMS(EMS Ukraine)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1403, 'emsukrainecn', '乌克兰EMS-中文(EMS Ukraine)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1404, 'england', '英国(大包,EMS)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1405, 'epspost', '联众国际', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1406, 'esinotrans', '中外运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1407, 'estafeta', 'Estafeta', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1408, 'estes', 'Estes', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1409, 'eta100', '易达国际速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1410, 'ethiopia', '埃塞俄比亚(Ethiopian postal)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1411, 'eucnrail', '中欧国际物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1412, 'eucpost', '德国 EUC POST', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1413, 'euexpress', 'EU-EXPRESS', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1414, 'euguoji', '易邮国际', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1415, 'europe8', '败欧洲', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1416, 'europeanecom', 'europeanecom', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1417, 'expressplus', '澳洲新干线快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1418, 'ezhuanyuan', '易转运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1419, 'fandaguoji', '颿达国际快递-英文', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1420, 'fardarww', '颿达国际快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1421, 'fastontime', '加拿大联通快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1422, 'fastway', 'Fastway Ireland', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1423, 'fedexuk', 'FedEx-英国件（FedEx UK)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1424, 'fedexukcn', 'FedEx-英国件', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1425, 'fedroad', 'FedRoad 联邦转运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1426, 'fiji', '斐济(Fiji Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1427, 'finland', '芬兰(Itella Posti Oy)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1428, 'flowerkd', '花瓣转运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1429, 'fourpxus', '四方格', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1430, 'fox', 'FOX国际快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1431, 'freakyquick', 'FQ狂派速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1432, 'gaticn', 'Gati-中文', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1433, 'gatien', 'Gati-英文', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1434, 'gatikwe', 'Gati-KWE', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1435, 'ge2d', 'GE2D跨境物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1436, 'georgianpost', '格鲁吉亚(Georgian Pos）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1437, 'ghtexpress', 'GHT物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1438, 'gibraltar', '直布罗陀[英国]( Royal Gibraltar Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1439, 'globaltracktrace', 'globaltracktrace', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1440, 'gls', 'GLS', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1441, 'greenland', '格陵兰[丹麦]（TELE Greenland A/S）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1442, 'grivertek', '潍鸿', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1443, 'gtgogo', 'GT国际快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1444, 'guanting', '冠庭国际物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1445, 'gvpexpress', '宏观国际快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1446, 'haihongmmb', '海红for买卖宝', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1447, 'haiwaihuanqiu', '海外环球', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1448, 'handboy', '汉邦国际速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1449, 'haypost', '亚美尼亚(Haypost-Armenian Postal)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1450, 'highsince', 'Highsince', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1451, 'hitaoe', 'Hi淘易快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1452, 'hkposten', '中国香港(HongKong Post)英文', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1453, 'homecourier', '如家国际快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1454, 'hongjie', '宏捷国际物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1455, 'hqtd', '环球通达 ', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1456, 'hrvatska', '克罗地亚（Hrvatska Posta）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1457, 'huanqiuabc', '中国香港环球快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1458, 'humpline', '驼峰国际', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1459, 'hungary', '匈牙利（Magyar Posta）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1460, 'hyk', '上海昊宏国际货物', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1461, 'iceland', '冰岛(Iceland Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1462, 'iexpress', 'iExpress', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1463, 'ilogen', 'logen路坚', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1464, 'ilyang', 'ILYANG', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1465, 'imlb2c', '艾姆勒', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1466, 'india', '印度(India Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1467, 'indonesia', '印度尼西亚EMS(Pos Indonesia-EMS)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1468, 'inposdom', '多米尼加（INPOSDOM – Instituto Postal', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1469, 'interlink', 'Interlink Express', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1470, 'iparcel', 'UPS i-parcel', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1471, 'iran', '伊朗（Iran Post）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1472, 'israelpost', '以色列(Israel Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1473, 'italysad', 'Italy SDA', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1474, 'iyoungspeed', '驿扬国际速运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1475, 'jamaicapost', '牙买加（Jamaica Post）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1476, 'jcex', 'jcex', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1477, 'jdiex', 'JDIEX', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1478, 'jerseypost', '泽西岛', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1479, 'jetexpressgroup', '澳速通国际速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1480, 'jiguang', '极光转运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1481, 'jixiangyouau', '吉祥邮（澳洲）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1482, 'jordan', '约旦(Jordan Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1483, 'junfengguoji', '骏丰国际速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1484, 'kaolaexpress', '考拉国际速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1485, 'kazpost', '哈萨克斯坦(Kazpost)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1486, 'kenya', '肯尼亚(POSTA KENYA)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1487, 'keypon', '启邦国际物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1488, 'kingfreight', '货运皇', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1489, 'kjde', '跨境直邮通', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1490, 'koali', '番薯国际货运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1491, 'koreapost', '韩国（Korea Post）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1492, 'koreapostcn', '韩国邮政', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1493, 'koreapostkr', '韩国邮政韩文', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1494, 'krtao', '淘韩国际快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1495, 'kyrgyzpost', '吉尔吉斯斯坦(Kyrgyz Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1496, 'kyue', '跨跃国际', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1497, 'landmarkglobal', 'Landmark Global', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1498, 'lao', '老挝(Lao Express) ', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1499, 'laposte', '塞内加尔', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1500, 'latvia', '拉脱维亚(Latvijas Pasts)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1501, 'ldxpres', '林道国际快递-英文', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1502, 'leopard', '云豹国际货运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1503, 'lesotho', '莱索托(Lesotho Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1504, 'lgs', 'lazada', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1505, 'libanpost', '黎巴嫩(Liban Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1506, 'linex', 'Linex', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1507, 'lithuania', '立陶宛（Lietuvos pa?tas）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1508, 'lmfex', '良藤国际速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1509, 'logistics', '華信物流WTO', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1510, 'ltparcel', '联通快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1511, 'luckyfastex', '吉捷国际速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1512, 'lundao', '论道国际物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1513, 'luxembourg', '卢森堡(Luxembourg Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1514, 'lwe', 'LWE', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1515, 'macao', '中国澳门(Macau Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1516, 'macedonia', '马其顿(Macedonian Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1517, 'malaysiaems', '马来西亚大包、EMS（Malaysia Post(parcel,', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1518, 'malaysiapost', '马来西亚小包（Malaysia Post(Registered)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1519, 'maldives', '马尔代夫(Maldives Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1520, 'malta', '马耳他（Malta Post）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1521, 'mapleexpress', '今枫国际快运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1522, 'mauritius', '毛里求斯(Mauritius Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1523, 'maxeedexpress', '澳洲迈速快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1524, 'meibang', '美邦国际快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1525, 'meixi', '美西快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1526, 'mexico', '墨西哥（Correos de Mexico）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1527, 'mexicodenda', 'Mexico Senda Express', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1528, 'mmlogi', '猛犸速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1529, 'mongolpost', '蒙古国(Mongol Post) ', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1530, 'montenegro', '黑山(Posta Crne Gore)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1531, 'morocco', '摩洛哥 ( Morocco Post )', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1532, 'mrw', 'MRW', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1533, 'multipack', 'Mexico Multipack', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1534, 'namibia', '纳米比亚(NamPost)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1535, 'nederlandpost', '荷兰速递(Nederland Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1536, 'nepalpost', '尼泊尔（Nepal Postal Services）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1537, 'newgistics', 'Newgistics', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1538, 'nigerianpost', '尼日利亚(Nigerian Postal)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1539, 'nle', 'NLE', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1540, 'nlebv', '亚欧专线', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1541, 'novaposhta', 'Nova Poshta', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1542, 'nuoer', '诺尔国际物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1543, 'nuoyaao', '偌亚奥国际快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1544, 'nzzto', '新西兰中通', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1545, 'ocaargen', 'OCA Argentina', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1546, 'oman', '阿曼(Oman Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1547, 'omniva', '爱沙尼亚(Eesti Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1548, 'ontrac', 'OnTrac', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1549, 'opek', 'OPEK', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1550, 'pakistan', '巴基斯坦(Pakistan Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1551, 'paraguay', '巴拉圭(Correo Paraguayo)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1552, 'parcelchina', '诚一物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1553, 'parcelforcecn', '英国邮政大包EMS', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1554, 'pcaexpress', 'PCA Express', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1555, 'pdstow', '全球速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1556, 'peru', '秘鲁(SERPOST)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1557, 'pioneer', '先锋国际快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1558, 'pochta', '俄罗斯邮政(Russian Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1559, 'portugalctt', '葡萄牙（Portugal CTT）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1560, 'portugalseur', 'Portugal Seur', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1561, 'posta', '坦桑尼亚（Tanzania Posts Corporation）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1562, 'postelbe', 'PostElbe', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1563, 'postenab', 'PostNord(Posten AB)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1564, 'postennorge', '挪威（Posten Norge）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1565, 'postpng', '巴布亚新几内亚(PNG Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1566, 'ptt', '土耳其', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1567, 'qdants', 'ANTS EXPRESS', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1568, 'qesd', '7E速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1569, 'qichen', '启辰国际速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1570, 'qpost', '卡塔尔（Qatar Post）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1571, 'quantium', 'Quantium', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1572, 'redexpress', 'Red Express', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1573, 'republic', '叙利亚(Syrian Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1574, 'romanian', '罗马尼亚（Posta Romanian）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1575, 'rpx', 'rpx', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1576, 'rrthk', '日日通国际', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1577, 'ruidianyouzheng', '瑞典（Sweden Post）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1578, 'rwanda', '卢旺达(Rwanda i-posita)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1579, 's2c', 'S2C', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1580, 'safexpress', 'Safexpress', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1581, 'saiaodimmb', '赛澳递for买卖宝', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1582, 'samoa', '萨摩亚(Samoa Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1583, 'saudipost', '沙特阿拉伯(Saudi Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1584, 'scic', '中加国际快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1585, 'sd138', '泰国138国际物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1586, 'selektvracht', 'Selektvracht', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1587, 'serbia', '塞尔维亚(PE Post of Serbia)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1588, 'seur', 'International Seur', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1589, 'sfau', '澳丰速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1590, 'sfpost', '曹操到', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1591, 'shanghaiwujiangmmb', '上海无疆for买卖宝', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1592, 'shlexp', 'SHL畅灵国际物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1593, 'shpostwish', 'wish邮', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1594, 'shunbang', '顺邦国际物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1595, 'sinoairinex', '中外运空运', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1596, 'sinoex', '中外运速递-中文', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1597, 'siodemka', 'Siodemka', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1598, 'skynet', 'skynet', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1599, 'skynetworldwide', 'skynetworldwide', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1600, 'skypost', '荷兰Sky Post', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1601, 'slovak', '斯洛伐克(Slovenská Posta)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1602, 'slpost', '斯里兰卡(Sri Lanka Post)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1603, 'southafrican', '南非（South African Post Office）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1604, 'speedpost', '新加坡EMS、大包(Singapore Speedpost)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1605, 'sudapost', '苏丹（Sudapost）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1606, 'superoz', '速配欧翼', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1607, 'swisspostcn', '瑞士邮政', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1608, 'szdpex', '深圳DPEX', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1609, 'szyouzheng', '深圳邮政', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1610, 'tanzania', '坦桑尼亚(Tanzania Posts)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1611, 'tcixps', 'TCI XPS', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1612, 'tcxbthai', 'TCXB国际物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1613, 'tdcargo', 'TD Cargo', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1614, 'thailand', '泰国（Thailand Thai Post）', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1615, 'thaizto', '泰国中通ZTO', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1616, 'thunderexpress', '加拿大雷霆快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1617, 'tmwexpress', '明达国际速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1618, 'tntitaly', 'TNT Italy', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1619, 'tntpostcn', 'TNT Post', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1620, 'tntuk', 'TNT UK', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1621, 'tny', 'TNY物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1622, 'topshey', '顶世国际物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1623, 'ttkeurope', '天天欧洲物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1624, 'tunisia', '突尼斯EMS(Rapid-Poste)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1625, 'turtle', '海龟国际快递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1626, 'uex', 'UEX国际物流', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1627, 'uexiex', '欧洲UEX', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1628, 'uganda', '乌干达(Posta Uganda)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1629, 'uhi', '优海国际速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1630, 'ukraine', '乌克兰小包、大包(UkrPoshta)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1631, 'ukrpost', '乌克兰小包、大包(UkrPost)', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1632, 'ukrpostcn', '乌克兰邮政包裹', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1633, 'upsfreight', 'UPS Freight', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1634, 'upsmailinno', 'UPS Mail Innovations', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1635, 'uschuaxia', '华夏国际速递', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1636, 'uspscn', 'USPSCN', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1637, 'utaoscm', 'UTAO优到', 0, 0, 0, '', '', '', 0, 1, 1); -INSERT INTO `eb_express` VALUES (1638, 'uzbekistan', '乌兹别克斯坦(Post of Uzbekistan)', 0, 0, 0, '', '', '', 0, 1, 0); - --- ---------------------------- --- Table structure for eb_shipping_templates --- ---------------------------- -DROP TABLE IF EXISTS `eb_shipping_templates`; -CREATE TABLE `eb_shipping_templates` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '编号', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '模板名称', - `type` tinyint(1) NOT NULL DEFAULT 1 COMMENT '计费方式', - `appoint` tinyint(1) NOT NULL DEFAULT 0 COMMENT '指定包邮', - `sort` int(11) NOT NULL DEFAULT 0 COMMENT '排序', - `create_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '运费模板' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of eb_shipping_templates --- ---------------------------- -INSERT INTO `eb_shipping_templates` VALUES (1, '全国包邮', 1, 0, 99, '2021-03-08 11:06:55', '2021-12-25 12:16:22'); - --- ---------------------------- --- Table structure for eb_shipping_templates_free --- ---------------------------- -DROP TABLE IF EXISTS `eb_shipping_templates_free`; -CREATE TABLE `eb_shipping_templates_free` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '编号', - `temp_id` int(11) NOT NULL DEFAULT 0 COMMENT '模板ID', - `city_id` int(11) NOT NULL DEFAULT 0 COMMENT '城市ID', - `title` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '描述', - `number` decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '包邮件数', - `price` decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '包邮金额', - `type` tinyint(1) NOT NULL DEFAULT 1 COMMENT '计费方式', - `uniqid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '分组唯一值', - `status` tinyint(1) NULL DEFAULT 0 COMMENT '是否无效', - `create_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 131 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '运费模板包邮' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of eb_shipping_templates_free --- ---------------------------- -INSERT INTO `eb_shipping_templates_free` VALUES (99, 1, 7363, '[[7362,7363,7364],[7362,7363,7434],[7362,7363,7607],[7362,7363,7763],[7362,7363,7954],[7362,7363,8079],[7362,7363,8298],[7362,7363,8563],[7362,7363,8835],[7362,7363,9102],[7362,7363,9378],[7362,7363,10143],[7362,7363,10983],[7362,7363,11454],[7362,7363,11795],[7362,7363,12251]]', 1.00, 1.00, 1, 'cd025ce4eefaa69c772e068d8b5f8866', 1, '2021-12-16 14:53:27', '2021-12-16 14:53:27'); -INSERT INTO `eb_shipping_templates_free` VALUES (100, 1, 7364, '[[7362,7363,7364],[7362,7363,7434],[7362,7363,7607],[7362,7363,7763],[7362,7363,7954],[7362,7363,8079],[7362,7363,8298],[7362,7363,8563],[7362,7363,8835],[7362,7363,9102],[7362,7363,9378],[7362,7363,10143],[7362,7363,10983],[7362,7363,11454],[7362,7363,11795],[7362,7363,12251]]', 1.00, 1.00, 1, 'cd025ce4eefaa69c772e068d8b5f8866', 1, '2021-12-16 14:53:27', '2021-12-16 14:53:27'); -INSERT INTO `eb_shipping_templates_free` VALUES (101, 1, 7363, '[[7362,7363,7364],[7362,7363,7434],[7362,7363,7607],[7362,7363,7763],[7362,7363,7954],[7362,7363,8079],[7362,7363,8298],[7362,7363,8563],[7362,7363,8835],[7362,7363,9102],[7362,7363,9378],[7362,7363,10143],[7362,7363,10983],[7362,7363,11454],[7362,7363,11795],[7362,7363,12251]]', 1.00, 1.00, 1, 'cd025ce4eefaa69c772e068d8b5f8866', 1, '2021-12-16 14:53:27', '2021-12-16 14:53:27'); -INSERT INTO `eb_shipping_templates_free` VALUES (102, 1, 7434, '[[7362,7363,7364],[7362,7363,7434],[7362,7363,7607],[7362,7363,7763],[7362,7363,7954],[7362,7363,8079],[7362,7363,8298],[7362,7363,8563],[7362,7363,8835],[7362,7363,9102],[7362,7363,9378],[7362,7363,10143],[7362,7363,10983],[7362,7363,11454],[7362,7363,11795],[7362,7363,12251]]', 1.00, 1.00, 1, 'cd025ce4eefaa69c772e068d8b5f8866', 1, '2021-12-16 14:53:27', '2021-12-16 14:53:27'); -INSERT INTO `eb_shipping_templates_free` VALUES (103, 1, 7363, '[[7362,7363,7364],[7362,7363,7434],[7362,7363,7607],[7362,7363,7763],[7362,7363,7954],[7362,7363,8079],[7362,7363,8298],[7362,7363,8563],[7362,7363,8835],[7362,7363,9102],[7362,7363,9378],[7362,7363,10143],[7362,7363,10983],[7362,7363,11454],[7362,7363,11795],[7362,7363,12251]]', 1.00, 1.00, 1, 'cd025ce4eefaa69c772e068d8b5f8866', 1, '2021-12-16 14:53:27', '2021-12-16 14:53:27'); -INSERT INTO `eb_shipping_templates_free` VALUES (104, 1, 7607, '[[7362,7363,7364],[7362,7363,7434],[7362,7363,7607],[7362,7363,7763],[7362,7363,7954],[7362,7363,8079],[7362,7363,8298],[7362,7363,8563],[7362,7363,8835],[7362,7363,9102],[7362,7363,9378],[7362,7363,10143],[7362,7363,10983],[7362,7363,11454],[7362,7363,11795],[7362,7363,12251]]', 1.00, 1.00, 1, 'cd025ce4eefaa69c772e068d8b5f8866', 1, '2021-12-16 14:53:27', '2021-12-16 14:53:27'); -INSERT INTO `eb_shipping_templates_free` VALUES (105, 1, 7363, '[[7362,7363,7364],[7362,7363,7434],[7362,7363,7607],[7362,7363,7763],[7362,7363,7954],[7362,7363,8079],[7362,7363,8298],[7362,7363,8563],[7362,7363,8835],[7362,7363,9102],[7362,7363,9378],[7362,7363,10143],[7362,7363,10983],[7362,7363,11454],[7362,7363,11795],[7362,7363,12251]]', 1.00, 1.00, 1, 'cd025ce4eefaa69c772e068d8b5f8866', 1, '2021-12-16 14:53:27', '2021-12-16 14:53:27'); -INSERT INTO `eb_shipping_templates_free` VALUES (106, 1, 7763, '[[7362,7363,7364],[7362,7363,7434],[7362,7363,7607],[7362,7363,7763],[7362,7363,7954],[7362,7363,8079],[7362,7363,8298],[7362,7363,8563],[7362,7363,8835],[7362,7363,9102],[7362,7363,9378],[7362,7363,10143],[7362,7363,10983],[7362,7363,11454],[7362,7363,11795],[7362,7363,12251]]', 1.00, 1.00, 1, 'cd025ce4eefaa69c772e068d8b5f8866', 1, '2021-12-16 14:53:27', '2021-12-16 14:53:27'); -INSERT INTO `eb_shipping_templates_free` VALUES (107, 1, 7363, '[[7362,7363,7364],[7362,7363,7434],[7362,7363,7607],[7362,7363,7763],[7362,7363,7954],[7362,7363,8079],[7362,7363,8298],[7362,7363,8563],[7362,7363,8835],[7362,7363,9102],[7362,7363,9378],[7362,7363,10143],[7362,7363,10983],[7362,7363,11454],[7362,7363,11795],[7362,7363,12251]]', 1.00, 1.00, 1, 'cd025ce4eefaa69c772e068d8b5f8866', 1, '2021-12-16 14:53:27', '2021-12-16 14:53:27'); -INSERT INTO `eb_shipping_templates_free` VALUES (108, 1, 7954, '[[7362,7363,7364],[7362,7363,7434],[7362,7363,7607],[7362,7363,7763],[7362,7363,7954],[7362,7363,8079],[7362,7363,8298],[7362,7363,8563],[7362,7363,8835],[7362,7363,9102],[7362,7363,9378],[7362,7363,10143],[7362,7363,10983],[7362,7363,11454],[7362,7363,11795],[7362,7363,12251]]', 1.00, 1.00, 1, 'cd025ce4eefaa69c772e068d8b5f8866', 1, '2021-12-16 14:53:27', '2021-12-16 14:53:27'); -INSERT INTO `eb_shipping_templates_free` VALUES (109, 1, 7363, '[[7362,7363,7364],[7362,7363,7434],[7362,7363,7607],[7362,7363,7763],[7362,7363,7954],[7362,7363,8079],[7362,7363,8298],[7362,7363,8563],[7362,7363,8835],[7362,7363,9102],[7362,7363,9378],[7362,7363,10143],[7362,7363,10983],[7362,7363,11454],[7362,7363,11795],[7362,7363,12251]]', 1.00, 1.00, 1, 'cd025ce4eefaa69c772e068d8b5f8866', 1, '2021-12-16 14:53:27', '2021-12-16 14:53:27'); -INSERT INTO `eb_shipping_templates_free` VALUES (110, 1, 8079, '[[7362,7363,7364],[7362,7363,7434],[7362,7363,7607],[7362,7363,7763],[7362,7363,7954],[7362,7363,8079],[7362,7363,8298],[7362,7363,8563],[7362,7363,8835],[7362,7363,9102],[7362,7363,9378],[7362,7363,10143],[7362,7363,10983],[7362,7363,11454],[7362,7363,11795],[7362,7363,12251]]', 1.00, 1.00, 1, 'cd025ce4eefaa69c772e068d8b5f8866', 1, '2021-12-16 14:53:27', '2021-12-16 14:53:27'); -INSERT INTO `eb_shipping_templates_free` VALUES (111, 1, 7363, '[[7362,7363,7364],[7362,7363,7434],[7362,7363,7607],[7362,7363,7763],[7362,7363,7954],[7362,7363,8079],[7362,7363,8298],[7362,7363,8563],[7362,7363,8835],[7362,7363,9102],[7362,7363,9378],[7362,7363,10143],[7362,7363,10983],[7362,7363,11454],[7362,7363,11795],[7362,7363,12251]]', 1.00, 1.00, 1, 'cd025ce4eefaa69c772e068d8b5f8866', 1, '2021-12-16 14:53:27', '2021-12-16 14:53:27'); -INSERT INTO `eb_shipping_templates_free` VALUES (112, 1, 8298, '[[7362,7363,7364],[7362,7363,7434],[7362,7363,7607],[7362,7363,7763],[7362,7363,7954],[7362,7363,8079],[7362,7363,8298],[7362,7363,8563],[7362,7363,8835],[7362,7363,9102],[7362,7363,9378],[7362,7363,10143],[7362,7363,10983],[7362,7363,11454],[7362,7363,11795],[7362,7363,12251]]', 1.00, 1.00, 1, 'cd025ce4eefaa69c772e068d8b5f8866', 1, '2021-12-16 14:53:27', '2021-12-16 14:53:27'); -INSERT INTO `eb_shipping_templates_free` VALUES (113, 1, 7363, '[[7362,7363,7364],[7362,7363,7434],[7362,7363,7607],[7362,7363,7763],[7362,7363,7954],[7362,7363,8079],[7362,7363,8298],[7362,7363,8563],[7362,7363,8835],[7362,7363,9102],[7362,7363,9378],[7362,7363,10143],[7362,7363,10983],[7362,7363,11454],[7362,7363,11795],[7362,7363,12251]]', 1.00, 1.00, 1, 'cd025ce4eefaa69c772e068d8b5f8866', 1, '2021-12-16 14:53:27', '2021-12-16 14:53:27'); -INSERT INTO `eb_shipping_templates_free` VALUES (114, 1, 8563, '[[7362,7363,7364],[7362,7363,7434],[7362,7363,7607],[7362,7363,7763],[7362,7363,7954],[7362,7363,8079],[7362,7363,8298],[7362,7363,8563],[7362,7363,8835],[7362,7363,9102],[7362,7363,9378],[7362,7363,10143],[7362,7363,10983],[7362,7363,11454],[7362,7363,11795],[7362,7363,12251]]', 1.00, 1.00, 1, 'cd025ce4eefaa69c772e068d8b5f8866', 1, '2021-12-16 14:53:27', '2021-12-16 14:53:27'); -INSERT INTO `eb_shipping_templates_free` VALUES (115, 1, 7363, '[[7362,7363,7364],[7362,7363,7434],[7362,7363,7607],[7362,7363,7763],[7362,7363,7954],[7362,7363,8079],[7362,7363,8298],[7362,7363,8563],[7362,7363,8835],[7362,7363,9102],[7362,7363,9378],[7362,7363,10143],[7362,7363,10983],[7362,7363,11454],[7362,7363,11795],[7362,7363,12251]]', 1.00, 1.00, 1, 'cd025ce4eefaa69c772e068d8b5f8866', 1, '2021-12-16 14:53:28', '2021-12-16 14:53:28'); -INSERT INTO `eb_shipping_templates_free` VALUES (116, 1, 8835, '[[7362,7363,7364],[7362,7363,7434],[7362,7363,7607],[7362,7363,7763],[7362,7363,7954],[7362,7363,8079],[7362,7363,8298],[7362,7363,8563],[7362,7363,8835],[7362,7363,9102],[7362,7363,9378],[7362,7363,10143],[7362,7363,10983],[7362,7363,11454],[7362,7363,11795],[7362,7363,12251]]', 1.00, 1.00, 1, 'cd025ce4eefaa69c772e068d8b5f8866', 1, '2021-12-16 14:53:28', '2021-12-16 14:53:28'); -INSERT INTO `eb_shipping_templates_free` VALUES (117, 1, 7363, '[[7362,7363,7364],[7362,7363,7434],[7362,7363,7607],[7362,7363,7763],[7362,7363,7954],[7362,7363,8079],[7362,7363,8298],[7362,7363,8563],[7362,7363,8835],[7362,7363,9102],[7362,7363,9378],[7362,7363,10143],[7362,7363,10983],[7362,7363,11454],[7362,7363,11795],[7362,7363,12251]]', 1.00, 1.00, 1, 'cd025ce4eefaa69c772e068d8b5f8866', 1, '2021-12-16 14:53:28', '2021-12-16 14:53:28'); -INSERT INTO `eb_shipping_templates_free` VALUES (118, 1, 9102, '[[7362,7363,7364],[7362,7363,7434],[7362,7363,7607],[7362,7363,7763],[7362,7363,7954],[7362,7363,8079],[7362,7363,8298],[7362,7363,8563],[7362,7363,8835],[7362,7363,9102],[7362,7363,9378],[7362,7363,10143],[7362,7363,10983],[7362,7363,11454],[7362,7363,11795],[7362,7363,12251]]', 1.00, 1.00, 1, 'cd025ce4eefaa69c772e068d8b5f8866', 1, '2021-12-16 14:53:28', '2021-12-16 14:53:28'); -INSERT INTO `eb_shipping_templates_free` VALUES (119, 1, 7363, '[[7362,7363,7364],[7362,7363,7434],[7362,7363,7607],[7362,7363,7763],[7362,7363,7954],[7362,7363,8079],[7362,7363,8298],[7362,7363,8563],[7362,7363,8835],[7362,7363,9102],[7362,7363,9378],[7362,7363,10143],[7362,7363,10983],[7362,7363,11454],[7362,7363,11795],[7362,7363,12251]]', 1.00, 1.00, 1, 'cd025ce4eefaa69c772e068d8b5f8866', 1, '2021-12-16 14:53:28', '2021-12-16 14:53:28'); -INSERT INTO `eb_shipping_templates_free` VALUES (120, 1, 9378, '[[7362,7363,7364],[7362,7363,7434],[7362,7363,7607],[7362,7363,7763],[7362,7363,7954],[7362,7363,8079],[7362,7363,8298],[7362,7363,8563],[7362,7363,8835],[7362,7363,9102],[7362,7363,9378],[7362,7363,10143],[7362,7363,10983],[7362,7363,11454],[7362,7363,11795],[7362,7363,12251]]', 1.00, 1.00, 1, 'cd025ce4eefaa69c772e068d8b5f8866', 1, '2021-12-16 14:53:28', '2021-12-16 14:53:28'); -INSERT INTO `eb_shipping_templates_free` VALUES (121, 1, 7363, '[[7362,7363,7364],[7362,7363,7434],[7362,7363,7607],[7362,7363,7763],[7362,7363,7954],[7362,7363,8079],[7362,7363,8298],[7362,7363,8563],[7362,7363,8835],[7362,7363,9102],[7362,7363,9378],[7362,7363,10143],[7362,7363,10983],[7362,7363,11454],[7362,7363,11795],[7362,7363,12251]]', 1.00, 1.00, 1, 'cd025ce4eefaa69c772e068d8b5f8866', 1, '2021-12-16 14:53:28', '2021-12-16 14:53:28'); -INSERT INTO `eb_shipping_templates_free` VALUES (122, 1, 10143, '[[7362,7363,7364],[7362,7363,7434],[7362,7363,7607],[7362,7363,7763],[7362,7363,7954],[7362,7363,8079],[7362,7363,8298],[7362,7363,8563],[7362,7363,8835],[7362,7363,9102],[7362,7363,9378],[7362,7363,10143],[7362,7363,10983],[7362,7363,11454],[7362,7363,11795],[7362,7363,12251]]', 1.00, 1.00, 1, 'cd025ce4eefaa69c772e068d8b5f8866', 1, '2021-12-16 14:53:28', '2021-12-16 14:53:28'); -INSERT INTO `eb_shipping_templates_free` VALUES (123, 1, 7363, '[[7362,7363,7364],[7362,7363,7434],[7362,7363,7607],[7362,7363,7763],[7362,7363,7954],[7362,7363,8079],[7362,7363,8298],[7362,7363,8563],[7362,7363,8835],[7362,7363,9102],[7362,7363,9378],[7362,7363,10143],[7362,7363,10983],[7362,7363,11454],[7362,7363,11795],[7362,7363,12251]]', 1.00, 1.00, 1, 'cd025ce4eefaa69c772e068d8b5f8866', 1, '2021-12-16 14:53:28', '2021-12-16 14:53:28'); -INSERT INTO `eb_shipping_templates_free` VALUES (124, 1, 10983, '[[7362,7363,7364],[7362,7363,7434],[7362,7363,7607],[7362,7363,7763],[7362,7363,7954],[7362,7363,8079],[7362,7363,8298],[7362,7363,8563],[7362,7363,8835],[7362,7363,9102],[7362,7363,9378],[7362,7363,10143],[7362,7363,10983],[7362,7363,11454],[7362,7363,11795],[7362,7363,12251]]', 1.00, 1.00, 1, 'cd025ce4eefaa69c772e068d8b5f8866', 1, '2021-12-16 14:53:28', '2021-12-16 14:53:28'); -INSERT INTO `eb_shipping_templates_free` VALUES (125, 1, 7363, '[[7362,7363,7364],[7362,7363,7434],[7362,7363,7607],[7362,7363,7763],[7362,7363,7954],[7362,7363,8079],[7362,7363,8298],[7362,7363,8563],[7362,7363,8835],[7362,7363,9102],[7362,7363,9378],[7362,7363,10143],[7362,7363,10983],[7362,7363,11454],[7362,7363,11795],[7362,7363,12251]]', 1.00, 1.00, 1, 'cd025ce4eefaa69c772e068d8b5f8866', 1, '2021-12-16 14:53:28', '2021-12-16 14:53:28'); -INSERT INTO `eb_shipping_templates_free` VALUES (126, 1, 11454, '[[7362,7363,7364],[7362,7363,7434],[7362,7363,7607],[7362,7363,7763],[7362,7363,7954],[7362,7363,8079],[7362,7363,8298],[7362,7363,8563],[7362,7363,8835],[7362,7363,9102],[7362,7363,9378],[7362,7363,10143],[7362,7363,10983],[7362,7363,11454],[7362,7363,11795],[7362,7363,12251]]', 1.00, 1.00, 1, 'cd025ce4eefaa69c772e068d8b5f8866', 1, '2021-12-16 14:53:28', '2021-12-16 14:53:28'); -INSERT INTO `eb_shipping_templates_free` VALUES (127, 1, 7363, '[[7362,7363,7364],[7362,7363,7434],[7362,7363,7607],[7362,7363,7763],[7362,7363,7954],[7362,7363,8079],[7362,7363,8298],[7362,7363,8563],[7362,7363,8835],[7362,7363,9102],[7362,7363,9378],[7362,7363,10143],[7362,7363,10983],[7362,7363,11454],[7362,7363,11795],[7362,7363,12251]]', 1.00, 1.00, 1, 'cd025ce4eefaa69c772e068d8b5f8866', 1, '2021-12-16 14:53:28', '2021-12-16 14:53:28'); -INSERT INTO `eb_shipping_templates_free` VALUES (128, 1, 11795, '[[7362,7363,7364],[7362,7363,7434],[7362,7363,7607],[7362,7363,7763],[7362,7363,7954],[7362,7363,8079],[7362,7363,8298],[7362,7363,8563],[7362,7363,8835],[7362,7363,9102],[7362,7363,9378],[7362,7363,10143],[7362,7363,10983],[7362,7363,11454],[7362,7363,11795],[7362,7363,12251]]', 1.00, 1.00, 1, 'cd025ce4eefaa69c772e068d8b5f8866', 1, '2021-12-16 14:53:28', '2021-12-16 14:53:28'); -INSERT INTO `eb_shipping_templates_free` VALUES (129, 1, 7363, '[[7362,7363,7364],[7362,7363,7434],[7362,7363,7607],[7362,7363,7763],[7362,7363,7954],[7362,7363,8079],[7362,7363,8298],[7362,7363,8563],[7362,7363,8835],[7362,7363,9102],[7362,7363,9378],[7362,7363,10143],[7362,7363,10983],[7362,7363,11454],[7362,7363,11795],[7362,7363,12251]]', 1.00, 1.00, 1, 'cd025ce4eefaa69c772e068d8b5f8866', 1, '2021-12-16 14:53:28', '2021-12-16 14:53:28'); -INSERT INTO `eb_shipping_templates_free` VALUES (130, 1, 12251, '[[7362,7363,7364],[7362,7363,7434],[7362,7363,7607],[7362,7363,7763],[7362,7363,7954],[7362,7363,8079],[7362,7363,8298],[7362,7363,8563],[7362,7363,8835],[7362,7363,9102],[7362,7363,9378],[7362,7363,10143],[7362,7363,10983],[7362,7363,11454],[7362,7363,11795],[7362,7363,12251]]', 1.00, 1.00, 1, 'cd025ce4eefaa69c772e068d8b5f8866', 1, '2021-12-16 14:53:28', '2021-12-16 14:53:28'); - --- ---------------------------- --- Table structure for eb_shipping_templates_region --- ---------------------------- -DROP TABLE IF EXISTS `eb_shipping_templates_region`; -CREATE TABLE `eb_shipping_templates_region` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '编号', - `temp_id` int(11) NOT NULL DEFAULT 0 COMMENT '模板ID', - `city_id` int(11) NOT NULL DEFAULT 0 COMMENT '城市ID', - `title` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '描述', - `first` decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '首件', - `first_price` decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '首件运费', - `renewal` decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '续件', - `renewal_price` decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '续件运费', - `type` tinyint(1) NOT NULL DEFAULT 1 COMMENT '计费方式 1按件数 2按重量 3按体积', - `uniqid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '分组唯一值', - `status` tinyint(1) NULL DEFAULT 0 COMMENT '是否无效', - `create_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 10954 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '运费模板指定区域费用' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of eb_shipping_templates_region --- ---------------------------- -INSERT INTO `eb_shipping_templates_region` VALUES (10585, 1, 2, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:22', '2021-12-25 12:16:22'); -INSERT INTO `eb_shipping_templates_region` VALUES (10586, 1, 7363, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:22', '2021-12-25 12:16:22'); -INSERT INTO `eb_shipping_templates_region` VALUES (10587, 1, 13268, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:22', '2021-12-25 12:16:22'); -INSERT INTO `eb_shipping_templates_region` VALUES (10588, 1, 18128, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:22', '2021-12-25 12:16:22'); -INSERT INTO `eb_shipping_templates_region` VALUES (10589, 1, 24371, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:22', '2021-12-25 12:16:22'); -INSERT INTO `eb_shipping_templates_region` VALUES (10590, 1, 26779, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:22', '2021-12-25 12:16:22'); -INSERT INTO `eb_shipping_templates_region` VALUES (10591, 1, 32688, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:22', '2021-12-25 12:16:22'); -INSERT INTO `eb_shipping_templates_region` VALUES (10592, 1, 38160, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10593, 1, 44570, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10594, 1, 49190, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10595, 1, 52018, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10596, 1, 58247, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10597, 1, 61804, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10598, 1, 66813, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10599, 1, 67748, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10600, 1, 69390, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10601, 1, 71850, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10602, 1, 72975, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10603, 1, 76726, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10604, 1, 79163, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10605, 1, 81000, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10606, 1, 84092, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10607, 1, 87613, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10608, 1, 92738, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10609, 1, 96064, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10610, 1, 99538, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10611, 1, 100904, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10612, 1, 101772, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10613, 1, 101884, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10614, 1, 104457, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10615, 1, 107065, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10616, 1, 108166, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10617, 1, 109847, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10618, 1, 110889, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10619, 1, 112552, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10620, 1, 113777, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10621, 1, 114940, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10622, 1, 115225, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10623, 1, 117932, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10624, 1, 119789, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10625, 1, 121081, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10626, 1, 122142, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10627, 1, 122730, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10628, 1, 123698, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10629, 1, 125249, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10630, 1, 126156, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10631, 1, 127070, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10632, 1, 127834, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10633, 1, 128421, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10634, 1, 129977, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10635, 1, 131738, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10636, 1, 133209, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10637, 1, 135392, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10638, 1, 137206, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10639, 1, 138721, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10640, 1, 139340, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10641, 1, 140601, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10642, 1, 141361, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10643, 1, 142786, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10644, 1, 143990, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10645, 1, 145666, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10646, 1, 149079, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10647, 1, 150915, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10648, 1, 151830, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10649, 1, 152413, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10650, 1, 153313, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10651, 1, 154201, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10652, 1, 155076, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10653, 1, 156713, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10654, 1, 157130, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10655, 1, 158623, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10656, 1, 159769, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10657, 1, 161651, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10658, 1, 161793, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10659, 1, 167905, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10660, 1, 169375, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10661, 1, 170724, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10662, 1, 173635, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10663, 1, 174764, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10664, 1, 176920, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10665, 1, 178999, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10666, 1, 180743, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10667, 1, 182538, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10668, 1, 185201, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10669, 1, 186657, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10670, 1, 187441, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10671, 1, 189402, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10672, 1, 191020, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10673, 1, 194395, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10674, 1, 197850, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10675, 1, 203852, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10676, 1, 205101, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10677, 1, 206438, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10678, 1, 209250, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10679, 1, 214260, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10680, 1, 215955, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10681, 1, 216449, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:23', '2021-12-25 12:16:23'); -INSERT INTO `eb_shipping_templates_region` VALUES (10682, 1, 221610, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10683, 1, 224650, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10684, 1, 226469, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10685, 1, 227482, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10686, 1, 228630, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10687, 1, 229844, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10688, 1, 230476, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10689, 1, 230981, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10690, 1, 231499, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10691, 1, 233236, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10692, 1, 234109, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10693, 1, 235483, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10694, 1, 237607, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10695, 1, 239084, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10696, 1, 241180, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10697, 1, 242634, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10698, 1, 243399, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10699, 1, 244378, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10700, 1, 247478, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10701, 1, 248059, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10702, 1, 249098, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10703, 1, 251197, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10704, 1, 253905, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10705, 1, 256112, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10706, 1, 258160, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10707, 1, 260230, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10708, 1, 262699, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10709, 1, 264862, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10710, 1, 265677, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10711, 1, 266521, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10712, 1, 269107, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10713, 1, 269654, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10714, 1, 270222, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10715, 1, 274444, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10716, 1, 277615, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10717, 1, 280562, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10718, 1, 282841, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10719, 1, 285861, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10720, 1, 291235, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10721, 1, 298025, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10722, 1, 301711, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10723, 1, 304309, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10724, 1, 306339, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10725, 1, 313063, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10726, 1, 320179, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10727, 1, 326706, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10728, 1, 330547, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10729, 1, 333140, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10730, 1, 336050, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10731, 1, 337144, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10732, 1, 344133, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10733, 1, 349382, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10734, 1, 355972, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10735, 1, 361375, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10736, 1, 367396, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10737, 1, 370304, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10738, 1, 372971, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10739, 1, 376365, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10740, 1, 379245, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10741, 1, 382878, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10742, 1, 383890, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10743, 1, 387707, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10744, 1, 389719, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10745, 1, 392737, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10746, 1, 395254, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10747, 1, 396611, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10748, 1, 398169, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10749, 1, 403311, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10750, 1, 408287, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10751, 1, 411925, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10752, 1, 417174, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10753, 1, 420258, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10754, 1, 420825, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10755, 1, 424449, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10756, 1, 425508, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10757, 1, 427710, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10758, 1, 429501, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10759, 1, 432415, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10760, 1, 432829, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10761, 1, 434548, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10762, 1, 437779, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10763, 1, 440639, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10764, 1, 445040, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10765, 1, 446212, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10766, 1, 447268, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10767, 1, 449865, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10768, 1, 452124, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10769, 1, 453799, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10770, 1, 455283, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10771, 1, 456303, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10772, 1, 459251, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:24', '2021-12-25 12:16:24'); -INSERT INTO `eb_shipping_templates_region` VALUES (10773, 1, 463141, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10774, 1, 465105, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10775, 1, 467562, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10776, 1, 468660, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10777, 1, 470123, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10778, 1, 472709, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10779, 1, 476148, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10780, 1, 479103, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10781, 1, 481319, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10782, 1, 483251, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10783, 1, 486129, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10784, 1, 487721, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10785, 1, 488589, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10786, 1, 488954, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10787, 1, 490106, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10788, 1, 490919, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10789, 1, 492341, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10790, 1, 494394, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10791, 1, 496438, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10792, 1, 498104, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10793, 1, 499489, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10794, 1, 501867, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10795, 1, 502828, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10796, 1, 504366, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10797, 1, 505298, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10798, 1, 506616, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10799, 1, 507255, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10800, 1, 507557, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10801, 1, 508648, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10802, 1, 510408, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10803, 1, 511463, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10804, 1, 513434, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10805, 1, 514790, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10806, 1, 516858, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10807, 1, 517933, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10808, 1, 518407, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10809, 1, 518808, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10810, 1, 519929, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10811, 1, 521166, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10812, 1, 522786, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10813, 1, 524814, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10814, 1, 525638, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10815, 1, 527443, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10816, 1, 528339, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10817, 1, 529345, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10818, 1, 529878, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10819, 1, 530060, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10820, 1, 530070, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10821, 1, 530468, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10822, 1, 533329, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10823, 1, 540700, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10824, 1, 545533, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10825, 1, 550275, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10826, 1, 551809, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10827, 1, 552358, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10828, 1, 554142, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10829, 1, 556077, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10830, 1, 560191, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10831, 1, 563242, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10832, 1, 565735, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10833, 1, 568202, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10834, 1, 570733, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10835, 1, 576992, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10836, 1, 578485, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10837, 1, 581870, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10838, 1, 585049, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10839, 1, 588538, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10840, 1, 589779, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10841, 1, 592598, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10842, 1, 594864, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10843, 1, 596525, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10844, 1, 599659, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10845, 1, 604132, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10846, 1, 605834, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10847, 1, 607029, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10848, 1, 609309, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10849, 1, 610607, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10850, 1, 614530, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10851, 1, 617670, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10852, 1, 619017, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10853, 1, 622734, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10854, 1, 624373, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10855, 1, 626181, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10856, 1, 627981, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10857, 1, 628776, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10858, 1, 629781, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10859, 1, 631276, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10860, 1, 631811, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10861, 1, 632971, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10862, 1, 634006, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:25', '2021-12-25 12:16:25'); -INSERT INTO `eb_shipping_templates_region` VALUES (10863, 1, 635219, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10864, 1, 636688, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10865, 1, 637778, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10866, 1, 638092, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10867, 1, 639368, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10868, 1, 639802, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10869, 1, 640107, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10870, 1, 640333, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10871, 1, 640675, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10872, 1, 642571, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10873, 1, 643863, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10874, 1, 644423, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10875, 1, 645076, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10876, 1, 646392, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10877, 1, 646579, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10878, 1, 649979, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10879, 1, 650575, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10880, 1, 652581, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10881, 1, 655295, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10882, 1, 657848, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10883, 1, 660643, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10884, 1, 663046, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10885, 1, 667681, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10886, 1, 669707, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10887, 1, 671120, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10888, 1, 672330, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10889, 1, 672385, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10890, 1, 672577, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10891, 1, 673463, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10892, 1, 676215, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10893, 1, 677568, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10894, 1, 678560, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10895, 1, 680191, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10896, 1, 680815, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10897, 1, 682322, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10898, 1, 684415, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10899, 1, 687916, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10900, 1, 689265, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10901, 1, 690095, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10902, 1, 691278, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10903, 1, 693040, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10904, 1, 693342, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10905, 1, 693672, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10906, 1, 694220, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10907, 1, 694478, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10908, 1, 694846, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10909, 1, 695260, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10910, 1, 695883, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10911, 1, 696252, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10912, 1, 696928, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10913, 1, 697887, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10914, 1, 698441, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10915, 1, 699583, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10916, 1, 699773, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10917, 1, 700070, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10918, 1, 700489, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10919, 1, 701559, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10920, 1, 702104, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10921, 1, 703119, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10922, 1, 704779, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10923, 1, 705145, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10924, 1, 708117, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10925, 1, 709792, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10926, 1, 711218, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10927, 1, 712893, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10928, 1, 713697, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10929, 1, 714402, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10930, 1, 717531, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10931, 1, 719868, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10932, 1, 720118, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10933, 1, 722024, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10934, 1, 725488, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10935, 1, 727730, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10936, 1, 729928, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10937, 1, 730843, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10938, 1, 734179, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10939, 1, 736051, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10940, 1, 737856, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10941, 1, 737861, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10942, 1, 739957, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10943, 1, 740510, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10944, 1, 742126, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10945, 1, 742636, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10946, 1, 743938, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10947, 1, 745674, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10948, 1, 748553, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10949, 1, 749571, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10950, 1, 749930, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:26', '2021-12-25 12:16:26'); -INSERT INTO `eb_shipping_templates_region` VALUES (10951, 1, 749957, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:27', '2021-12-25 12:16:27'); -INSERT INTO `eb_shipping_templates_region` VALUES (10952, 1, 752150, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:27', '2021-12-25 12:16:27'); -INSERT INTO `eb_shipping_templates_region` VALUES (10953, 1, 752169, '[[0,0]]', 1.00, 0.00, 1.00, 0.00, 1, '0f6dc38b1e1261c3baf2831a4a36cf4e', 1, '2021-12-25 12:16:27', '2021-12-25 12:16:27'); - --- ---------------------------- --- Table structure for eb_sms_record --- ---------------------------- -DROP TABLE IF EXISTS `eb_sms_record`; -CREATE TABLE `eb_sms_record` ( - `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '短信发送记录编号', - `uid` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '短信平台账号', - `phone` char(11) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '接受短信的手机号', - `content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '短信内容', - `add_ip` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '添加记录ip', - `create_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `template` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '短信模板ID', - `resultcode` int(6) UNSIGNED NULL DEFAULT NULL COMMENT '状态码 100=成功,130=失败,131=空号,132=停机,133=关机,134=无状态', - `record_id` int(11) UNSIGNED NULL DEFAULT NULL COMMENT '发送记录id', - `memo` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '短信平台返回信息', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '短信发送记录表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for eb_sms_template --- ---------------------------- -DROP TABLE IF EXISTS `eb_sms_template`; -CREATE TABLE `eb_sms_template` ( - `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT 'id', - `temp_id` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '短信模板id', - `temp_type` tinyint(2) NOT NULL DEFAULT 1 COMMENT '模板类型', - `title` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '模板说明', - `type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '类型', - `temp_key` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '模板编号', - `status` tinyint(2) NOT NULL DEFAULT 1 COMMENT '状态', - `content` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '短息内容', - `create_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 573 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '短信模板表' ROW_FORMAT = Compact; - --- ---------------------------- --- Records of eb_sms_template --- ---------------------------- -INSERT INTO `eb_sms_template` VALUES (559, '440396', 2, '订单支付成功', '通知', '', 1, '【CRMEB】您购买的商品已支付成功，支付金额{$pay_price}元，订单号{$order_id},感谢您的光临！', '2021-12-09 19:31:13'); -INSERT INTO `eb_sms_template` VALUES (561, '440405', 2, '管理员下单提醒', '通知', '', 1, '【CRMEB】{$admin_name}管理员，您有一笔已支付的订单待处理，订单号为{$order_id}！', '2021-12-09 20:49:44'); -INSERT INTO `eb_sms_template` VALUES (562, '440406', 2, '管理员支付成功通知', '通知', '', 1, '【CRMEB】{$admin_name}管理员,您有一笔支付成功的订单待处理，订单号{$order_id}!', '2021-12-09 19:33:38'); -INSERT INTO `eb_sms_template` VALUES (563, '440407', 2, '管理员退款通知', '通知', '', 1, '【CRMEB】{$admin_name}管理员,您有一笔退款订单待处理，订单号{$order_id}!', '2021-12-09 21:07:49'); -INSERT INTO `eb_sms_template` VALUES (564, '440408', 2, '管理员确认收货通知', '通知', '', 1, '【CRMEB】{$admin_name}管理员,您有一笔订单已经确认收货，订单号{$order_id}!', '2021-12-09 20:33:31'); -INSERT INTO `eb_sms_template` VALUES (566, '440410', 2, '订单改价提醒', '通知', '', 1, '【CRMEB】您的订单{$order_id}，实际支付金额已被修改为{$pay_price}。', '2021-12-09 21:12:05'); -INSERT INTO `eb_sms_template` VALUES (572, '441596', 2, '订单发货通知', '通知', '', 1, '【CRMEB】亲爱的用户{$nickname}您的商品{$store_name}，订单号{$order_id}已发货，请注意查收！', '2021-12-09 20:03:34'); - --- ---------------------------- --- Table structure for eb_store_bargain --- ---------------------------- -DROP TABLE IF EXISTS `eb_store_bargain`; -CREATE TABLE `eb_store_bargain` ( - `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '砍价商品ID', - `product_id` int(11) UNSIGNED NOT NULL COMMENT '关联商品ID', - `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '砍价活动名称', - `image` varchar(150) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '砍价活动图片', - `unit_name` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '单位名称', - `stock` int(11) UNSIGNED NULL DEFAULT NULL COMMENT '库存', - `sales` int(11) UNSIGNED NULL DEFAULT NULL COMMENT '销量', - `images` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '砍价商品轮播图', - `start_time` bigint(14) UNSIGNED NOT NULL COMMENT '砍价开启时间', - `stop_time` bigint(14) UNSIGNED NOT NULL COMMENT '砍价结束时间', - `store_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '砍价商品名称', - `price` decimal(8, 2) UNSIGNED NULL DEFAULT NULL COMMENT '砍价金额', - `min_price` decimal(8, 2) UNSIGNED NULL DEFAULT NULL COMMENT '砍价商品最低价', - `num` int(11) UNSIGNED NULL DEFAULT NULL COMMENT '购买数量限制——单个活动每个用户发起砍价次数限制', - `bargain_max_price` decimal(8, 2) UNSIGNED NULL DEFAULT NULL COMMENT '用户每次砍价的最大金额', - `bargain_min_price` decimal(8, 2) UNSIGNED NULL DEFAULT NULL COMMENT '用户每次砍价的最小金额', - `bargain_num` int(11) UNSIGNED NOT NULL DEFAULT 1 COMMENT '帮砍次数——单个商品用户可以帮砍的次数', - `status` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '砍价状态 0(到砍价时间不自动开启) 1(到砍价时间自动开启时间)', - `give_integral` int(11) NULL DEFAULT 0 COMMENT '反多少积分', - `info` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '砍价活动简介', - `cost` decimal(8, 2) UNSIGNED NULL DEFAULT NULL COMMENT '成本价', - `sort` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '排序', - `is_hot` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否推荐0不推荐1推荐', - `is_del` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否删除 0未删除 1删除', - `add_time` bigint(14) UNSIGNED NULL DEFAULT NULL COMMENT '添加时间', - `is_postage` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '是否包邮 0不包邮 1包邮', - `postage` decimal(10, 2) UNSIGNED NULL DEFAULT NULL COMMENT '邮费', - `rule` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '砍价规则', - `look` int(11) UNSIGNED NULL DEFAULT 0 COMMENT '砍价商品浏览量', - `share` int(11) UNSIGNED NULL DEFAULT 0 COMMENT '砍价商品分享量', - `temp_id` int(11) NULL DEFAULT NULL COMMENT '运费模板ID', - `weight` decimal(8, 2) NULL DEFAULT 0.00 COMMENT '重量', - `volume` decimal(8, 2) NULL DEFAULT 0.00 COMMENT '体积', - `quota` int(10) NOT NULL DEFAULT 0 COMMENT '限购总数', - `quota_show` int(10) NOT NULL DEFAULT 0 COMMENT '限量总数显示', - `people_num` int(11) NULL DEFAULT NULL COMMENT '砍价人数——需要多少人砍价成功', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '砍价表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of eb_store_bargain --- ---------------------------- -INSERT INTO `eb_store_bargain` VALUES (1, 3, '万事利秋冬新品时尚百搭经典真丝绒厚款围巾 格物致知蓝咖', 'crmebimage/public/maintain/2021/12/25/5486775d8cad4fd8adfc254d2e93857cn0wu5hq8f4.jpg', '件', 78, 0, '[\"crmebimage/public/maintain/2021/12/25/5486775d8cad4fd8adfc254d2e93857cn0wu5hq8f4.jpg\"]', 1640361600000, 1646063999999, '万事利秋冬新品时尚百搭经典真丝绒厚款围巾 格物致知蓝咖', 374.00, 324.00, 2, NULL, NULL, 2, 1, 0, NULL, 89.00, 0, 0, 0, 1640409149614, 1, NULL, NULL, 0, 0, 1, 0.00, 0.00, 66, 66, 2); -INSERT INTO `eb_store_bargain` VALUES (2, 1, 'LOFREE洛斐 奶茶无线蓝牙键鼠套装', 'crmebimage/public/maintain/2021/12/25/63969148b6c4447d918124fd810c1da5m2h9aiylly.jpg', '个', 345, 0, '[\"crmebimage/public/maintain/2021/12/25/63969148b6c4447d918124fd810c1da5m2h9aiylly.jpg\"]', 1640361600000, 1646063999999, 'LOFREE洛斐 奶茶无线蓝牙键鼠套装', 268.00, 226.00, 1, NULL, NULL, 2, 1, 0, NULL, 40.00, 0, 0, 0, 1640409242804, 1, NULL, NULL, 0, 0, 1, 0.00, 0.00, 69, 69, 2); - --- ---------------------------- --- Table structure for eb_store_bargain_user --- ---------------------------- -DROP TABLE IF EXISTS `eb_store_bargain_user`; -CREATE TABLE `eb_store_bargain_user` ( - `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '用户参与砍价表ID', - `uid` int(11) UNSIGNED NULL DEFAULT NULL COMMENT '用户ID', - `bargain_id` int(11) UNSIGNED NULL DEFAULT NULL COMMENT '砍价商品id', - `bargain_price_min` decimal(8, 2) UNSIGNED NULL DEFAULT NULL COMMENT '砍价的最低价', - `bargain_price` decimal(8, 2) NULL DEFAULT NULL COMMENT '砍价金额', - `price` decimal(8, 2) UNSIGNED NULL DEFAULT NULL COMMENT '砍掉的价格', - `status` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '状态 1参与中 2 活动结束参与失败 3活动结束参与成功', - `add_time` bigint(14) UNSIGNED NULL DEFAULT NULL COMMENT '参与时间', - `is_del` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否取消', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户参与砍价表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for eb_store_bargain_user_help --- ---------------------------- -DROP TABLE IF EXISTS `eb_store_bargain_user_help`; -CREATE TABLE `eb_store_bargain_user_help` ( - `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '砍价用户帮助表ID', - `uid` int(11) UNSIGNED NULL DEFAULT NULL COMMENT '帮助的用户id', - `bargain_id` int(11) UNSIGNED NULL DEFAULT NULL COMMENT '砍价商品ID', - `bargain_user_id` int(11) UNSIGNED NULL DEFAULT NULL COMMENT '用户参与砍价表id', - `price` decimal(8, 2) UNSIGNED NULL DEFAULT NULL COMMENT '帮助砍价多少金额', - `add_time` bigint(14) UNSIGNED NULL DEFAULT NULL COMMENT '添加时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '砍价用户帮助表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for eb_store_cart --- ---------------------------- -DROP TABLE IF EXISTS `eb_store_cart`; -CREATE TABLE `eb_store_cart` ( - `id` bigint(8) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '购物车表ID', - `uid` int(10) UNSIGNED NOT NULL COMMENT '用户ID', - `type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '类型', - `product_id` int(10) UNSIGNED NOT NULL COMMENT '商品ID', - `product_attr_unique` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '商品属性', - `cart_num` smallint(5) UNSIGNED NOT NULL DEFAULT 0 COMMENT '商品数量', - `is_new` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否为立即购买', - `combination_id` int(11) UNSIGNED NULL DEFAULT 0 COMMENT '拼团id', - `seckill_id` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '秒杀商品ID', - `bargain_id` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '砍价id', - `create_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间', - `update_time` timestamp(0) NULL DEFAULT NULL COMMENT 'g', - `status` tinyint(1) NOT NULL DEFAULT 1 COMMENT '购物车状态', - PRIMARY KEY (`id`) USING BTREE, - INDEX `user_id`(`uid`) USING BTREE, - INDEX `goods_id`(`product_id`) USING BTREE, - INDEX `uid`(`uid`) USING BTREE, - INDEX `uid_2`(`uid`) USING BTREE, - INDEX `uid_3`(`uid`, `is_new`) USING BTREE, - INDEX `type`(`type`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '购物车表' ROW_FORMAT = Compact; - --- ---------------------------- --- Table structure for eb_store_combination --- ---------------------------- -DROP TABLE IF EXISTS `eb_store_combination`; -CREATE TABLE `eb_store_combination` ( - `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '拼团商品ID', - `product_id` int(10) UNSIGNED NOT NULL COMMENT '商品id', - `mer_id` int(10) UNSIGNED NULL DEFAULT 0 COMMENT '商户id', - `image` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '推荐图', - `images` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '轮播图', - `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动标题', - `attr` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '活动属性', - `people` int(2) UNSIGNED NOT NULL COMMENT '参团人数', - `info` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '简介', - `price` decimal(10, 2) UNSIGNED NOT NULL COMMENT '价格', - `sort` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '排序', - `sales` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '销量', - `stock` int(10) UNSIGNED NOT NULL COMMENT '库存', - `add_time` bigint(14) NOT NULL COMMENT '添加时间', - `is_host` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '推荐', - `is_show` tinyint(1) UNSIGNED NOT NULL COMMENT '商品状态', - `is_del` tinyint(1) UNSIGNED NOT NULL DEFAULT 0, - `combination` tinyint(1) UNSIGNED NULL DEFAULT 1, - `mer_use` tinyint(1) UNSIGNED NULL DEFAULT NULL COMMENT '商户是否可用1可用0不可用', - `is_postage` tinyint(1) UNSIGNED NULL DEFAULT NULL COMMENT '是否包邮1是0否', - `postage` decimal(10, 2) UNSIGNED NULL DEFAULT NULL COMMENT '邮费', - `start_time` bigint(14) UNSIGNED NOT NULL COMMENT '拼团开始时间', - `stop_time` bigint(14) UNSIGNED NOT NULL COMMENT '拼团结束时间', - `effective_time` int(11) NOT NULL DEFAULT 0 COMMENT '拼团订单有效时间(小时)', - `cost` decimal(10, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '拼图商品成本', - `browse` int(11) NULL DEFAULT 0 COMMENT '浏览量', - `unit_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '单位名', - `temp_id` int(11) NOT NULL COMMENT '运费模板ID', - `weight` decimal(8, 2) NULL DEFAULT 0.00 COMMENT '重量', - `volume` decimal(8, 2) NULL DEFAULT 0.00 COMMENT '体积', - `num` int(11) NULL DEFAULT NULL COMMENT '单次购买数量', - `quota` int(10) NOT NULL DEFAULT 0 COMMENT '限购总数', - `quota_show` int(10) NOT NULL DEFAULT 0 COMMENT '限量总数显示', - `ot_price` decimal(10, 2) NOT NULL COMMENT '原价', - `once_num` int(11) NOT NULL DEFAULT 0 COMMENT '每个订单可购买数量', - `virtual_ration` int(11) NOT NULL DEFAULT 100 COMMENT '虚拟成团百分比', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '拼团商品表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of eb_store_combination --- ---------------------------- -INSERT INTO `eb_store_combination` VALUES (1, 7, 0, 'crmebimage/public/maintain/2021/12/25/37382cca048b4011bdbacd3cbbe0814daw1o5x0tco.jpg', '[\"crmebimage/public/maintain/2021/12/25/37382cca048b4011bdbacd3cbbe0814daw1o5x0tco.jpg\"]', '车载小鹿首饰架摆件鹿角树形耳钉首饰展示架耳环架手链饰品收纳首饰挂件 白色', NULL, 2, '车载小鹿首饰架摆件鹿角树形耳钉首饰展示架耳环架手链饰品收纳首饰挂件 白色', 13.00, 0, 0, 666, 1640409319713, 0, 0, 1, 1, NULL, NULL, NULL, 1640361600000, 1646063999999, 1, 5.00, 0, '个', 1, 0.00, 0.00, 2, 66, 66, 18.00, 1, 0); -INSERT INTO `eb_store_combination` VALUES (2, 6, 0, 'crmebimage/public/maintain/2021/12/25/fef1aee22a04466d93693f5791d44bfd2rsm469mcr.jpg', '[\"crmebimage/public/maintain/2021/12/25/fef1aee22a04466d93693f5791d44bfd2rsm469mcr.jpg\"]', '第一江南 西湖龙井茶叶礼盒 明前特级龙井绿茶【至臻献礼200g】礼盒装', NULL, 2, '第一江南 西湖龙井茶叶礼盒 明前特级龙井绿茶【至臻献礼200g】礼盒装', 1288.00, 0, 0, 999, 1640409356986, 0, 0, 1, 1, NULL, NULL, NULL, 1640361600000, 1646063999999, 1, 300.00, 0, '件', 1, 0.00, 0.00, 1, 99, 99, 1688.00, 1, 0); -INSERT INTO `eb_store_combination` VALUES (3, 7, 0, 'crmebimage/public/maintain/2021/12/25/37382cca048b4011bdbacd3cbbe0814daw1o5x0tco.jpg', '[\"crmebimage/public/maintain/2021/12/25/37382cca048b4011bdbacd3cbbe0814daw1o5x0tco.jpg\"]', '车载小鹿首饰架摆件鹿角树形耳钉首饰展示架耳环架手链饰品收纳首饰挂件 白色', NULL, 2, '车载小鹿首饰架摆件鹿角树形耳钉首饰展示架耳环架手链饰品收纳首饰挂件 白色', 8.00, 0, 0, 1533, 1640749674852, 0, 1, 0, 1, NULL, NULL, NULL, 1640707200000, 1643644799999, 1, 5.00, 0, '个', 1, 0.00, 0.00, 1, 151, 151, 18.00, 1, 0); -INSERT INTO `eb_store_combination` VALUES (4, 3, 0, 'crmebimage/public/maintain/2021/12/25/5486775d8cad4fd8adfc254d2e93857cn0wu5hq8f4.jpg', '[\"crmebimage/public/maintain/2021/12/25/5486775d8cad4fd8adfc254d2e93857cn0wu5hq8f4.jpg\"]', '万事利秋冬新品时尚百搭经典真丝绒厚款围巾 格物致知蓝咖', NULL, 2, '万事利秋冬新品时尚百搭经典真丝绒厚款围巾 格物致知蓝咖', 324.00, 0, 1, 1865, 1640749726595, 0, 1, 0, 1, NULL, NULL, NULL, 1640707200000, 1643644799999, 1, 100.00, 0, '件', 1, 0.00, 0.00, 1, 183, 184, 412.00, 1, 0); - --- ---------------------------- --- Table structure for eb_store_coupon --- ---------------------------- -DROP TABLE IF EXISTS `eb_store_coupon`; -CREATE TABLE `eb_store_coupon` ( - `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '优惠券表ID', - `name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '优惠券名称', - `money` decimal(8, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '兑换的优惠券面值', - `is_limited` tinyint(1) NULL DEFAULT 0 COMMENT '是否限量, 默认0 不限量， 1限量', - `total` int(11) NOT NULL DEFAULT 0 COMMENT '发放总数', - `last_total` int(11) NULL DEFAULT 0 COMMENT '剩余数量', - `use_type` tinyint(2) NOT NULL DEFAULT 1 COMMENT '使用类型 1 全场通用, 2 商品券, 3 品类券', - `primary_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '所属商品id / 分类id', - `min_price` decimal(8, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '最低消费，0代表不限制', - `receive_start_time` timestamp(0) NOT NULL COMMENT '可领取开始时间', - `receive_end_time` timestamp(0) NULL DEFAULT NULL COMMENT '可领取结束时间', - `is_fixed_time` tinyint(1) NULL DEFAULT 0 COMMENT '是否固定使用时间, 默认0 否， 1是', - `use_start_time` timestamp(0) NULL DEFAULT NULL COMMENT '可使用时间范围 开始时间', - `use_end_time` timestamp(0) NULL DEFAULT NULL COMMENT '可使用时间范围 结束时间', - `day` int(4) NULL DEFAULT 0 COMMENT '天数', - `type` tinyint(2) NOT NULL DEFAULT 1 COMMENT '优惠券类型 1 手动领取, 2 新人券, 3 赠送券', - `sort` int(11) UNSIGNED NOT NULL DEFAULT 1 COMMENT '排序', - `status` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '状态（0：关闭，1：开启）', - `is_del` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否删除 状态（0：否，1：是）', - `create_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE, - INDEX `state`(`status`) USING BTREE, - INDEX `is_del`(`is_del`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '优惠券表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of eb_store_coupon --- ---------------------------- -INSERT INTO `eb_store_coupon` VALUES (1, '冬天快乐', 5.00, 1, 20, 16, 1, '', 0.00, '2021-12-25 00:00:00', '2022-01-07 00:00:00', 0, '2021-12-30 17:19:57', '2022-01-06 17:19:57', 7, 1, 0, 1, 0, '2021-12-25 14:35:42', '2021-12-25 14:35:42'); -INSERT INTO `eb_store_coupon` VALUES (2, '圣诞快乐', 10.00, 1, 30, 26, 1, '', 0.00, '2021-12-25 00:00:00', '2022-01-12 00:00:00', 0, '2021-12-30 17:19:44', '2022-01-19 17:19:44', 20, 1, 0, 1, 0, '2021-12-25 14:36:30', '2021-12-30 16:56:36'); - --- ---------------------------- --- Table structure for eb_store_coupon_user --- ---------------------------- -DROP TABLE IF EXISTS `eb_store_coupon_user`; -CREATE TABLE `eb_store_coupon_user` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'id', - `coupon_id` int(10) NOT NULL COMMENT '优惠券发布id', - `cid` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '兑换的项目id', - `uid` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '领取人id', - `name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '优惠券名称', - `money` decimal(8, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '优惠券的面值', - `min_price` decimal(8, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '最低消费多少金额可用优惠券', - `type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'send' COMMENT '获取方式，send后台发放, 用户领取 get', - `status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '状态（0：未使用，1：已使用, 2:已失效）', - `create_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - `start_time` timestamp(0) NULL DEFAULT NULL COMMENT '开始使用时间', - `end_time` timestamp(0) NULL DEFAULT NULL COMMENT '过期时间', - `use_time` timestamp(0) NULL DEFAULT NULL COMMENT '使用时间', - `use_type` tinyint(1) NULL DEFAULT 1 COMMENT '使用类型 1 全场通用, 2 商品券, 3 品类券', - `primary_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属商品id / 分类id', - PRIMARY KEY (`id`) USING BTREE, - INDEX `cid`(`cid`) USING BTREE, - INDEX `uid`(`uid`) USING BTREE, - INDEX `end_time`(`end_time`) USING BTREE, - INDEX `status`(`status`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '优惠券记录表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for eb_store_order --- ---------------------------- -DROP TABLE IF EXISTS `eb_store_order`; -CREATE TABLE `eb_store_order` ( - `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '订单ID', - `order_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '订单号', - `uid` int(11) UNSIGNED NOT NULL COMMENT '用户id', - `real_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户姓名', - `user_phone` varchar(18) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户电话', - `user_address` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '详细地址', - `freight_price` decimal(8, 2) NOT NULL DEFAULT 0.00 COMMENT '运费金额', - `total_num` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '订单商品总数', - `total_price` decimal(8, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '订单总价', - `total_postage` decimal(8, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '邮费', - `pay_price` decimal(8, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '实际支付金额', - `pay_postage` decimal(8, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '支付邮费', - `deduction_price` decimal(8, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '抵扣金额', - `coupon_id` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '优惠券id', - `coupon_price` decimal(8, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '优惠券金额', - `paid` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '支付状态', - `pay_time` timestamp(0) NULL DEFAULT NULL COMMENT '支付时间', - `pay_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '支付方式', - `create_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '订单状态（0：待发货；1：待收货；2：已收货，待评价；3：已完成；）', - `refund_status` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '0 未退款 1 申请中 2 已退款 3 退款中', - `refund_reason_wap_img` varchar(5000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '退款图片', - `refund_reason_wap_explain` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '退款用户说明', - `refund_reason_wap` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '前台退款原因', - `refund_reason` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '不退款的理由', - `refund_reason_time` timestamp(0) NULL DEFAULT NULL COMMENT '退款时间', - `refund_price` decimal(8, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '退款金额', - `delivery_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '快递名称/送货人姓名', - `delivery_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发货类型', - `delivery_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '快递单号/手机号', - `gain_integral` int(11) NULL DEFAULT 0 COMMENT '消费赚取积分', - `use_integral` int(11) NULL DEFAULT 0 COMMENT '使用积分', - `back_integral` int(11) NULL DEFAULT 0 COMMENT '给用户退了多少积分', - `mark` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '备注', - `is_del` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否删除', - `remark` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '管理员备注', - `mer_id` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '商户ID', - `is_mer_check` tinyint(3) UNSIGNED NOT NULL DEFAULT 0, - `combination_id` int(11) UNSIGNED NULL DEFAULT 0 COMMENT '拼团商品id0一般商品', - `pink_id` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '拼团id 0没有拼团', - `cost` decimal(8, 2) UNSIGNED NOT NULL COMMENT '成本价', - `seckill_id` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '秒杀商品ID', - `bargain_id` int(11) UNSIGNED NULL DEFAULT 0 COMMENT '砍价id', - `verify_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '核销码', - `store_id` int(11) NOT NULL DEFAULT 0 COMMENT '门店id', - `shipping_type` tinyint(1) NOT NULL DEFAULT 1 COMMENT '配送方式 1=快递 ，2=门店自提', - `clerk_id` int(11) NOT NULL DEFAULT 0 COMMENT '店员id/核销员id', - `is_channel` tinyint(1) UNSIGNED NULL DEFAULT 0 COMMENT '支付渠道(0微信公众号1微信小程序2余额)', - `is_remind` tinyint(1) UNSIGNED NULL DEFAULT 0 COMMENT '消息提醒', - `is_system_del` tinyint(1) NULL DEFAULT 0 COMMENT '后台是否删除', - `update_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - `delivery_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '快递公司简称', - `bargain_user_id` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '用户拼团活动id 0没有', - `type` int(3) NOT NULL DEFAULT 0 COMMENT '订单类型:0-普通订单，1-视频号订单', - `pro_total_price` decimal(8, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '商品总价', - `before_pay_price` decimal(8, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '改价前支付金额', - `is_alter_price` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否改价,0-否，1-是', - `out_trade_no` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商户系统内部的订单号,32个字符内、可包含字母, 其他说明见商户订单号', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `order_id_2`(`order_id`, `uid`) USING BTREE, - INDEX `uid`(`uid`) USING BTREE, - INDEX `add_time`(`create_time`) USING BTREE, - INDEX `pay_price`(`pay_price`) USING BTREE, - INDEX `paid`(`paid`) USING BTREE, - INDEX `pay_time`(`pay_time`) USING BTREE, - INDEX `pay_type`(`pay_type`) USING BTREE, - INDEX `status`(`status`) USING BTREE, - INDEX `is_del`(`is_del`) USING BTREE, - INDEX `coupon_id`(`coupon_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '订单表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for eb_store_order_info --- ---------------------------- -DROP TABLE IF EXISTS `eb_store_order_info`; -CREATE TABLE `eb_store_order_info` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', - `order_id` int(11) UNSIGNED NOT NULL COMMENT '订单id', - `product_id` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '商品ID', - `info` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '购买东西的详细信息', - `unique` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '唯一id', - `create_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间', - `order_no` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '订单号', - `product_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品名称', - `attr_value_id` int(11) UNSIGNED NULL DEFAULT NULL COMMENT '规格属性值id', - `image` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品图片', - `sku` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品sku', - `price` decimal(8, 2) UNSIGNED NOT NULL COMMENT '商品价格', - `pay_num` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '购买数量', - `weight` decimal(8, 2) UNSIGNED NOT NULL COMMENT '重量', - `volume` decimal(8, 2) UNSIGNED NOT NULL COMMENT '体积', - `give_integral` int(11) UNSIGNED NOT NULL COMMENT '赠送积分', - `is_reply` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否评价，0-未评价，1-已评价', - `is_sub` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否单独分佣,0-否，1-是', - `vip_price` decimal(8, 2) UNSIGNED NOT NULL COMMENT '会员价', - `product_type` int(2) NOT NULL DEFAULT 0 COMMENT '商品类型:0-普通，1-秒杀，2-砍价，3-拼团，4-视频号', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `oid`(`order_id`, `unique`) USING BTREE, - INDEX `product_id`(`product_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '订单购物详情表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for eb_store_order_status --- ---------------------------- -DROP TABLE IF EXISTS `eb_store_order_status`; -CREATE TABLE `eb_store_order_status` ( - `oid` int(10) UNSIGNED NOT NULL COMMENT '订单id', - `change_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '操作类型', - `change_message` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '操作备注', - `create_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '操作时间', - INDEX `oid`(`oid`) USING BTREE, - INDEX `change_type`(`change_type`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '订单操作记录表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for eb_store_pink --- ---------------------------- -DROP TABLE IF EXISTS `eb_store_pink`; -CREATE TABLE `eb_store_pink` ( - `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '拼团ID', - `uid` int(10) UNSIGNED NOT NULL COMMENT '用户id', - `order_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '订单id 生成', - `order_id_key` int(10) UNSIGNED NOT NULL COMMENT '订单id 数据库', - `total_num` int(10) UNSIGNED NOT NULL COMMENT '购买商品个数', - `total_price` decimal(10, 2) UNSIGNED NOT NULL COMMENT '购买总金额', - `cid` int(10) UNSIGNED NOT NULL COMMENT '拼团商品id', - `pid` int(10) UNSIGNED NOT NULL COMMENT '商品id', - `people` int(10) UNSIGNED NOT NULL COMMENT '拼图总人数', - `price` decimal(10, 2) UNSIGNED NOT NULL COMMENT '拼团商品单价', - `add_time` bigint(14) NOT NULL COMMENT '开始时间', - `stop_time` bigint(14) NOT NULL COMMENT '结束时间', - `k_id` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '团长id 0为团长', - `is_tpl` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否发送模板消息0未发送1已发送', - `is_refund` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否退款 0未退款 1已退款', - `status` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '状态1进行中2已完成3未完成', - `is_virtual` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否虚拟拼团', - `nickname` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户昵称', - `avatar` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户头像', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '拼团表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for eb_store_product --- ---------------------------- -DROP TABLE IF EXISTS `eb_store_product`; -CREATE TABLE `eb_store_product` ( - `id` mediumint(11) NOT NULL AUTO_INCREMENT COMMENT '商品id', - `mer_id` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '商户Id(0为总后台管理员创建,不为0的时候是商户后台创建)', - `image` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品图片', - `slider_image` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '轮播图', - `store_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品名称', - `store_info` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品简介', - `keyword` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '关键字', - `bar_code` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '商品条码（一维码）', - `cate_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '分类id', - `price` decimal(8, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '商品价格', - `vip_price` decimal(8, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '会员价格', - `ot_price` decimal(8, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '市场价', - `postage` decimal(8, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '邮费', - `unit_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单位名', - `sort` smallint(11) NOT NULL DEFAULT 0 COMMENT '排序', - `sales` mediumint(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '销量', - `stock` mediumint(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '库存', - `is_show` tinyint(1) NOT NULL DEFAULT 1 COMMENT '状态（0：未上架，1：上架）', - `is_hot` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否热卖', - `is_benefit` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否优惠', - `is_best` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否精品', - `is_new` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否新品', - `add_time` int(11) UNSIGNED NOT NULL COMMENT '添加时间', - `is_postage` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否包邮', - `is_del` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否删除', - `mer_use` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '商户是否代理 0不可代理1可代理', - `give_integral` int(11) NULL DEFAULT 0 COMMENT '获得积分', - `cost` decimal(8, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '成本价', - `is_seckill` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '秒杀状态 0 未开启 1已开启', - `is_bargain` tinyint(1) UNSIGNED NULL DEFAULT NULL COMMENT '砍价状态 0未开启 1开启', - `is_good` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否优品推荐', - `is_sub` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否单独分佣', - `ficti` mediumint(11) NULL DEFAULT 100 COMMENT '虚拟销量', - `browse` int(11) NULL DEFAULT 0 COMMENT '浏览量', - `code_path` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '商品二维码地址(用户小程序海报)', - `soure_link` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '淘宝京东1688类型', - `video_link` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '主图视频链接', - `temp_id` int(11) NOT NULL DEFAULT 1 COMMENT '运费模板ID', - `spec_type` tinyint(1) NOT NULL DEFAULT 0 COMMENT '规格 0单 1多', - `activity` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '活动显示排序0=默认, 1=秒杀，2=砍价，3=拼团', - `flat_pattern` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '展示图', - `is_recycle` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否回收站', - PRIMARY KEY (`id`) USING BTREE, - INDEX `cate_id`(`cate_id`) USING BTREE, - INDEX `is_hot`(`is_hot`) USING BTREE, - INDEX `is_benefit`(`is_benefit`) USING BTREE, - INDEX `is_best`(`is_best`) USING BTREE, - INDEX `is_new`(`is_new`) USING BTREE, - INDEX `toggle_on_sale, is_del`(`is_del`) USING BTREE, - INDEX `price`(`price`) USING BTREE, - INDEX `is_show`(`is_show`) USING BTREE, - INDEX `sort`(`sort`) USING BTREE, - INDEX `sales`(`sales`) USING BTREE, - INDEX `add_time`(`add_time`) USING BTREE, - INDEX `is_postage`(`is_postage`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 9 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商品表' ROW_FORMAT = Compact; - --- ---------------------------- --- Records of eb_store_product --- ---------------------------- -INSERT INTO `eb_store_product` VALUES (1, 0, 'crmebimage/public/maintain/2021/12/25/63969148b6c4447d918124fd810c1da5m2h9aiylly.jpg', '[\"crmebimage/public/maintain/2021/12/25/63969148b6c4447d918124fd810c1da5m2h9aiylly.jpg\"]', 'LOFREE洛斐 奶茶无线蓝牙键鼠套装', 'LOFREE洛斐 奶茶无线蓝牙键鼠套装', '无线蓝牙 键鼠 套装', '', '246,248,258,488', 268.00, 0.00, 188.00, 0.00, '个', 0, 0, 345, 1, 1, 1, 1, 1, 1640407859, 0, 0, 0, 0, 40.00, 0, NULL, 0, 0, 66, 2, '', '', '', 1, 0, '0,1,2,3', '', 0); -INSERT INTO `eb_store_product` VALUES (2, 0, 'crmebimage/public/maintain/2021/12/25/49ae68efce4848a185a8ddcb4e5c95a2zl2dlwi77v.jpg', '[\"crmebimage/public/maintain/2021/12/25/49ae68efce4848a185a8ddcb4e5c95a2zl2dlwi77v.jpg\"]', '欧普照明（OPPLE）LED卧室床头壁灯 温馨浪漫美式风格墙壁灯', '欧普照明（OPPLE）LED卧室床头壁灯 温馨浪漫美式风格墙壁灯', '温馨浪漫美式风格墙壁灯', '', '276', 99.00, 0.00, 129.00, 0.00, '件', 0, 0, 88, 1, 0, 0, 1, 1, 1640408014, 0, 0, 0, 0, 20.00, 0, NULL, 0, 0, 88, 0, '', '', '', 1, 0, '0,1,2,3', '', 0); -INSERT INTO `eb_store_product` VALUES (3, 0, 'crmebimage/public/maintain/2021/12/25/5486775d8cad4fd8adfc254d2e93857cn0wu5hq8f4.jpg', '[\"crmebimage/public/maintain/2021/12/25/5486775d8cad4fd8adfc254d2e93857cn0wu5hq8f4.jpg\"]', '万事利秋冬新品时尚百搭经典真丝绒厚款围巾 格物致知蓝咖', '万事利秋冬新品时尚百搭经典真丝绒厚款围巾 格物致知蓝咖', '万事利秋冬新品时尚百搭经典真丝绒厚款围巾 格物致知蓝咖', '', '246,248,258,488,289', 374.00, 0.00, 412.00, 0.00, '件', 0, 1, 1865, 1, 1, 1, 1, 1, 1640408162, 0, 0, 0, 0, 100.00, 0, NULL, 0, 0, 68, 3, '', '', '', 1, 1, '0,1,2,3', '', 0); -INSERT INTO `eb_store_product` VALUES (4, 0, 'crmebimage/public/maintain/2021/12/25/3ed152917e3f4f7faa9414050b6cab49vuadulntb8.jpg', '[\"crmebimage/public/maintain/2021/12/25/3ed152917e3f4f7faa9414050b6cab49vuadulntb8.jpg\"]', 'CAMILA&KORALI品牌包包女包斜挎单肩小包女式', 'CAMILA&KORALI品牌包包女包斜挎单肩小包女式', 'CAMILA&KORALI品牌包包女包斜挎单肩小包女式', '', '534,289,290,300,302', 116.00, 0.00, 156.00, 0.00, '件', 0, 0, 289, 1, 1, 1, 1, 1, 1640408296, 0, 0, 0, 0, 26.00, 0, NULL, 0, 0, 86, 1, '', '', '', 1, 0, '0,1,2,3', '', 0); -INSERT INTO `eb_store_product` VALUES (5, 0, 'crmebimage/public/maintain/2021/12/25/f65ef5469f3a479497a710fb288d115cvl5imkvpo8.jpg', '[\"crmebimage/public/maintain/2021/12/25/f65ef5469f3a479497a710fb288d115cvl5imkvpo8.jpg\"]', 'LAORENTOU包包女包牛皮单肩女士包包奢侈品蓝色【礼盒装】', 'LAORENTOU包包女包牛皮单肩女士包包奢侈品蓝色【礼盒装】', 'LAORENTOU包包女包牛皮单肩女士包包奢侈品蓝色【礼盒装】', '', '246,248,258,488,288,289,300,302', 115.00, 0.00, 145.00, 0.00, '件', 0, 1, 998, 1, 1, 1, 1, 1, 1640408403, 0, 0, 0, 0, 15.00, 0, NULL, 0, 0, 99, 0, '', '', '', 1, 0, '0,1,2,3', '', 0); -INSERT INTO `eb_store_product` VALUES (6, 0, 'crmebimage/public/maintain/2021/12/25/fef1aee22a04466d93693f5791d44bfd2rsm469mcr.jpg', '[\"crmebimage/public/maintain/2021/12/25/fef1aee22a04466d93693f5791d44bfd2rsm469mcr.jpg\"]', '第一江南 西湖龙井茶叶礼盒 明前特级龙井绿茶【至臻献礼200g】礼盒装', '第一江南 西湖龙井茶叶礼盒 明前特级龙井绿茶【至臻献礼200g】礼盒装', '第一江南 西湖龙井茶叶礼盒 明前特级龙井绿茶【至臻献礼200g】礼盒装', '', '246,248,258,488', 1588.00, 0.00, 1688.00, 0.00, '件', 0, 0, 999, 1, 1, 1, 1, 1, 1640408500, 0, 0, 0, 0, 300.00, 0, NULL, 0, 0, 666, 15, '', '', '', 1, 0, '0,1,2,3', '', 0); -INSERT INTO `eb_store_product` VALUES (7, 0, 'crmebimage/public/maintain/2021/12/25/37382cca048b4011bdbacd3cbbe0814daw1o5x0tco.jpg', '[\"crmebimage/public/maintain/2021/12/25/37382cca048b4011bdbacd3cbbe0814daw1o5x0tco.jpg\"]', '车载小鹿首饰架摆件鹿角树形耳钉首饰展示架耳环架手链饰品收纳首饰挂件 白色', '车载小鹿首饰架摆件鹿角树形耳钉首饰展示架耳环架手链饰品收纳首饰挂件 白色', '车载小鹿首饰架摆件鹿角树形耳钉首饰展示架耳环架手链饰品收纳首饰挂件 白色', '', '534,290,300,302', 13.00, 0.00, 18.00, 0.00, '个', 0, 0, 1533, 1, 1, 1, 1, 1, 1640408617, 0, 0, 0, 0, 5.00, 0, NULL, 0, 0, 46, 22, '', '', '', 1, 1, '0,1,2,3', '', 0); -INSERT INTO `eb_store_product` VALUES (8, 0, 'crmebimage/public/maintain/2021/12/25/7a6475bba07c47bb98e5db0e0d21c8ebq5sw2kijlc.jpg', '[\"crmebimage/public/maintain/2021/12/25/7a6475bba07c47bb98e5db0e0d21c8ebq5sw2kijlc.jpg\"]', '兰蔻（LANCOME）口红196 全新菁纯丝绒雾面唇膏 化妆品礼盒', '兰蔻（LANCOME）口红196 全新菁纯丝绒雾面唇膏 化妆品礼盒', '兰蔻（LANCOME）口红196 全新菁纯丝绒雾面唇膏 化妆品礼盒', '', '246,248,258,488,291,292,293,294,295,296', 787.00, 0.00, 197.00, 0.00, '件', 0, 0, 689, 1, 1, 1, 1, 1, 1640408735, 0, 0, 0, 0, 212.00, 0, NULL, 0, 0, 66, 3, '', '', '', 1, 0, '0,1,2,3', '', 0); - --- ---------------------------- --- Table structure for eb_store_product_attr --- ---------------------------- -DROP TABLE IF EXISTS `eb_store_product_attr`; -CREATE TABLE `eb_store_product_attr` ( - `id` mediumint(11) NOT NULL AUTO_INCREMENT COMMENT '主键', - `product_id` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '商品ID', - `attr_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '属性名', - `attr_values` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '属性值', - `type` tinyint(1) NULL DEFAULT 0 COMMENT '活动类型 0=商品，1=秒杀，2=砍价，3=拼团', - `is_del` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除,0-否，1-是', - PRIMARY KEY (`id`) USING BTREE, - INDEX `store_id`(`product_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 25 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商品属性表' ROW_FORMAT = Compact; - --- ---------------------------- --- Records of eb_store_product_attr --- ---------------------------- -INSERT INTO `eb_store_product_attr` VALUES (1, 1, '规格', '默认', 0, 0); -INSERT INTO `eb_store_product_attr` VALUES (2, 2, '规格', '默认', 0, 0); -INSERT INTO `eb_store_product_attr` VALUES (3, 3, '规格', '默认', 0, 1); -INSERT INTO `eb_store_product_attr` VALUES (4, 4, '规格', '默认', 0, 0); -INSERT INTO `eb_store_product_attr` VALUES (5, 5, '规格', '默认', 0, 0); -INSERT INTO `eb_store_product_attr` VALUES (6, 6, '规格', '默认', 0, 0); -INSERT INTO `eb_store_product_attr` VALUES (7, 7, '规格', '默认', 0, 1); -INSERT INTO `eb_store_product_attr` VALUES (8, 8, '规格', '默认', 0, 0); -INSERT INTO `eb_store_product_attr` VALUES (9, 1, '规格', '默认', 1, 0); -INSERT INTO `eb_store_product_attr` VALUES (10, 2, '规格', '默认', 1, 0); -INSERT INTO `eb_store_product_attr` VALUES (11, 1, '规格', '默认', 2, 0); -INSERT INTO `eb_store_product_attr` VALUES (12, 2, '规格', '默认', 2, 0); -INSERT INTO `eb_store_product_attr` VALUES (13, 1, '规格', '默认', 3, 0); -INSERT INTO `eb_store_product_attr` VALUES (14, 2, '规格', '默认', 3, 0); -INSERT INTO `eb_store_product_attr` VALUES (15, 7, '颜色', '白色,黑色,粉色,红色', 0, 0); -INSERT INTO `eb_store_product_attr` VALUES (16, 3, '颜色', '格物致知蓝咖,格物致知红色', 0, 0); -INSERT INTO `eb_store_product_attr` VALUES (17, 3, '尺码', '200*27cm,240*30', 0, 0); -INSERT INTO `eb_store_product_attr` VALUES (18, 3, '颜色', '格物致知蓝咖,格物致知红色', 1, 0); -INSERT INTO `eb_store_product_attr` VALUES (19, 3, '尺码', '200*27cm,240*30', 1, 0); -INSERT INTO `eb_store_product_attr` VALUES (20, 4, '颜色', '格物致知蓝咖,格物致知红色', 1, 0); -INSERT INTO `eb_store_product_attr` VALUES (21, 4, '尺码', '200*27cm,240*30', 1, 0); -INSERT INTO `eb_store_product_attr` VALUES (22, 3, '颜色', '白色,黑色,粉色,红色', 3, 0); -INSERT INTO `eb_store_product_attr` VALUES (23, 4, '颜色', '格物致知蓝咖,格物致知红色', 3, 0); -INSERT INTO `eb_store_product_attr` VALUES (24, 4, '尺码', '200*27cm,240*30', 3, 0); - --- ---------------------------- --- Table structure for eb_store_product_attr_result --- ---------------------------- -DROP TABLE IF EXISTS `eb_store_product_attr_result`; -CREATE TABLE `eb_store_product_attr_result` ( - `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '主键', - `product_id` int(10) UNSIGNED NOT NULL COMMENT '商品ID', - `result` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品属性参数', - `change_time` int(10) UNSIGNED NOT NULL COMMENT '上次修改时间', - `type` tinyint(1) NULL DEFAULT 0 COMMENT '活动类型 0=商品，1=秒杀，2=砍价，3=拼团', - PRIMARY KEY (`id`) USING BTREE, - INDEX `product_id`(`product_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商品属性详情表' ROW_FORMAT = Compact; - --- ---------------------------- --- Table structure for eb_store_product_attr_value --- ---------------------------- -DROP TABLE IF EXISTS `eb_store_product_attr_value`; -CREATE TABLE `eb_store_product_attr_value` ( - `id` mediumint(11) NOT NULL AUTO_INCREMENT COMMENT '主键', - `product_id` int(10) UNSIGNED NOT NULL COMMENT '商品ID', - `suk` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品属性索引值 (attr_value|attr_value[|....])', - `stock` int(10) UNSIGNED NOT NULL COMMENT '属性对应的库存', - `sales` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '销量', - `price` decimal(8, 2) UNSIGNED NOT NULL COMMENT '属性金额', - `image` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '图片', - `unique` char(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '唯一值', - `cost` decimal(8, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '成本价', - `bar_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '商品条码', - `ot_price` decimal(8, 2) NOT NULL DEFAULT 0.00 COMMENT '原价', - `weight` decimal(8, 2) NOT NULL DEFAULT 0.00 COMMENT '重量', - `volume` decimal(8, 2) NOT NULL DEFAULT 0.00 COMMENT '体积', - `brokerage` decimal(8, 2) NOT NULL DEFAULT 0.00 COMMENT '一级返佣', - `brokerage_two` decimal(8, 2) NOT NULL DEFAULT 0.00 COMMENT '二级返佣', - `type` tinyint(1) NULL DEFAULT 0 COMMENT '活动类型 0=商品，1=秒杀，2=砍价，3=拼团', - `quota` int(11) NULL DEFAULT NULL COMMENT '活动限购数量', - `quota_show` int(11) NULL DEFAULT NULL COMMENT '活动限购数量显示', - `attr_value` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'attr_values 创建更新时的属性对应', - `is_del` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除,0-否，1-是', - PRIMARY KEY (`id`) USING BTREE, - INDEX `unique`(`unique`, `suk`) USING BTREE, - INDEX `store_id`(`product_id`, `suk`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 39 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商品属性值表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of eb_store_product_attr_value --- ---------------------------- -INSERT INTO `eb_store_product_attr_value` VALUES (1, 1, '默认', 345, 0, 268.00, 'crmebimage/public/maintain/2021/12/25/63969148b6c4447d918124fd810c1da5m2h9aiylly.jpg', '', 40.00, '', 188.00, 1.00, 0.00, 0.00, 0.00, 0, 0, 0, '{\"规格\":\"默认\"}', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (2, 2, '默认', 88, 0, 99.00, 'crmebimage/public/maintain/2021/12/25/49ae68efce4848a185a8ddcb4e5c95a2zl2dlwi77v.jpg', '', 20.00, '', 129.00, 2.00, 0.00, 0.00, 0.00, 0, 0, 0, '{\"规格\":\"默认\"}', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (3, 3, '默认', 78, 0, 374.00, 'crmebimage/public/maintain/2021/12/25/5486775d8cad4fd8adfc254d2e93857cn0wu5hq8f4.jpg', '', 89.00, '', 394.00, 0.50, 0.00, 0.00, 0.00, 0, 0, 0, '{\"规格\":\"默认\"}', 1); -INSERT INTO `eb_store_product_attr_value` VALUES (4, 4, '默认', 289, 0, 116.00, 'crmebimage/public/maintain/2021/12/25/3ed152917e3f4f7faa9414050b6cab49vuadulntb8.jpg', '', 26.00, '', 156.00, 1.00, 0.00, 0.00, 0.00, 0, 0, 0, '{\"规格\":\"默认\"}', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (5, 5, '默认', 998, 1, 115.00, 'crmebimage/public/maintain/2021/12/25/f65ef5469f3a479497a710fb288d115cvl5imkvpo8.jpg', '', 15.00, '', 145.00, 0.50, 0.00, 0.00, 0.00, 0, 0, 0, '{\"规格\":\"默认\"}', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (6, 6, '默认', 999, 0, 1588.00, 'crmebimage/public/maintain/2021/12/25/fef1aee22a04466d93693f5791d44bfd2rsm469mcr.jpg', '', 300.00, '', 1688.00, 2.00, 0.00, 0.00, 0.00, 0, 0, 0, '{\"规格\":\"默认\"}', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (7, 7, '默认', 666, 0, 13.00, 'crmebimage/public/maintain/2021/12/25/37382cca048b4011bdbacd3cbbe0814daw1o5x0tco.jpg', '', 5.00, '', 18.00, 0.50, 0.00, 0.00, 0.00, 0, 0, 0, '{\"规格\":\"默认\"}', 1); -INSERT INTO `eb_store_product_attr_value` VALUES (8, 8, '默认', 689, 0, 787.00, 'crmebimage/public/maintain/2021/12/25/7a6475bba07c47bb98e5db0e0d21c8ebq5sw2kijlc.jpg', '', 212.00, '', 197.00, 0.50, 0.00, 0.00, 0.00, 0, 0, 0, '{\"规格\":\"默认\"}', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (9, 1, '默认', 689, 0, 720.00, 'crmebimage/public/maintain/2021/12/25/7a6475bba07c47bb98e5db0e0d21c8ebq5sw2kijlc.jpg', '', 212.00, '', 197.00, 0.50, 0.00, 0.00, 0.00, 1, 99, 99, '\"\\\"{\\\\\\\"规格\\\\\\\":\\\\\\\"默认\\\\\\\"}\\\"\"', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (10, 2, '默认', 998, 1, 95.00, 'crmebimage/public/maintain/2021/12/25/f65ef5469f3a479497a710fb288d115cvl5imkvpo8.jpg', '', 15.00, '', 145.00, 0.50, 0.00, 0.00, 0.00, 1, 98, 99, '\"\\\"{\\\\\\\"规格\\\\\\\":\\\\\\\"默认\\\\\\\"}\\\"\"', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (11, 1, '默认', 78, 0, 374.00, 'crmebimage/public/maintain/2021/12/25/5486775d8cad4fd8adfc254d2e93857cn0wu5hq8f4.jpg', '', 89.00, '', 394.00, 0.50, 0.00, 0.00, 0.00, 2, 66, 0, '{\"规格\":\"默认\"}', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (12, 2, '默认', 345, 0, 268.00, 'crmebimage/public/maintain/2021/12/25/63969148b6c4447d918124fd810c1da5m2h9aiylly.jpg', '', 40.00, '', 188.00, 1.00, 0.00, 0.00, 0.00, 2, 69, 0, '{\"规格\":\"默认\"}', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (13, 1, '默认', 666, 0, 13.00, 'crmebimage/public/maintain/2021/12/25/37382cca048b4011bdbacd3cbbe0814daw1o5x0tco.jpg', '', 5.00, '', 18.00, 0.50, 0.00, 0.00, 0.00, 3, 66, 66, '\"{\\\"规格\\\":\\\"默认\\\"}\"', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (14, 2, '默认', 999, 0, 1288.00, 'crmebimage/public/maintain/2021/12/25/fef1aee22a04466d93693f5791d44bfd2rsm469mcr.jpg', '', 300.00, '', 1688.00, 2.00, 0.00, 0.00, 0.00, 3, 99, 99, '\"{\\\"规格\\\":\\\"默认\\\"}\"', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (15, 7, '白色', 365, 0, 13.00, 'crmebimage/public/maintain/2021/12/25/37382cca048b4011bdbacd3cbbe0814daw1o5x0tco.jpg', '', 5.00, '', 18.00, 1.00, 0.00, 0.00, 0.00, 0, 0, 0, '{\"颜色\":\"白色\"}', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (16, 7, '黑色', 211, 0, 13.00, 'crmebimage/public/maintain/2021/12/25/37382cca048b4011bdbacd3cbbe0814daw1o5x0tco.jpg', '', 5.00, '', 18.00, 1.00, 0.00, 0.00, 0.00, 0, 0, 0, '{\"颜色\":\"黑色\"}', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (17, 7, '粉色', 568, 0, 13.00, 'crmebimage/public/maintain/2021/12/25/37382cca048b4011bdbacd3cbbe0814daw1o5x0tco.jpg', '', 5.00, '', 18.00, 1.00, 0.00, 0.00, 0.00, 0, 0, 0, '{\"颜色\":\"粉色\"}', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (18, 7, '红色', 389, 0, 13.00, 'crmebimage/public/maintain/2021/12/25/37382cca048b4011bdbacd3cbbe0814daw1o5x0tco.jpg', '', 5.00, '', 18.00, 1.00, 0.00, 0.00, 0.00, 0, 0, 0, '{\"颜色\":\"红色\"}', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (19, 3, '格物致知蓝咖,200*27cm', 698, 0, 374.00, 'crmebimage/public/maintain/2021/12/25/5486775d8cad4fd8adfc254d2e93857cn0wu5hq8f4.jpg', '', 100.00, '', 412.00, 0.50, 0.00, 0.00, 0.00, 0, 0, 0, '{\"颜色\":\"格物致知蓝咖\",\"尺码\":\"200*27cm\"}', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (20, 3, '格物致知蓝咖,240*30', 366, 0, 374.00, 'crmebimage/public/maintain/2021/12/25/5486775d8cad4fd8adfc254d2e93857cn0wu5hq8f4.jpg', '', 100.00, '', 412.00, 0.50, 0.00, 0.00, 0.00, 0, 0, 0, '{\"颜色\":\"格物致知蓝咖\",\"尺码\":\"240*30\"}', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (21, 3, '格物致知红色,200*27cm', 124, 0, 374.00, 'crmebimage/public/maintain/2021/12/25/5486775d8cad4fd8adfc254d2e93857cn0wu5hq8f4.jpg', '', 100.00, '', 412.00, 0.50, 0.00, 0.00, 0.00, 0, 0, 0, '{\"颜色\":\"格物致知红色\",\"尺码\":\"200*27cm\"}', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (22, 3, '格物致知红色,240*30', 677, 1, 374.00, 'crmebimage/public/maintain/2021/12/25/5486775d8cad4fd8adfc254d2e93857cn0wu5hq8f4.jpg', '', 100.00, '', 412.00, 0.50, 0.00, 0.00, 0.00, 0, 0, 0, '{\"颜色\":\"格物致知红色\",\"尺码\":\"240*30\"}', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (23, 3, '格物致知红色,200*27cm', 124, 0, 374.00, 'crmebimage/public/maintain/2021/12/25/5486775d8cad4fd8adfc254d2e93857cn0wu5hq8f4.jpg', '', 100.00, '', 412.00, 0.50, 0.00, 0.00, 0.00, 1, 124, 124, '{\"颜色\":\"格物致知红色\",\"尺码\":\"200*27cm\"}', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (24, 3, '格物致知红色,240*30', 678, 0, 374.00, 'crmebimage/public/maintain/2021/12/25/5486775d8cad4fd8adfc254d2e93857cn0wu5hq8f4.jpg', '', 100.00, '', 412.00, 0.50, 0.00, 0.00, 0.00, 1, 678, 678, '{\"颜色\":\"格物致知红色\",\"尺码\":\"240*30\"}', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (25, 3, '格物致知蓝咖,200*27cm', 698, 0, 374.00, 'crmebimage/public/maintain/2021/12/25/5486775d8cad4fd8adfc254d2e93857cn0wu5hq8f4.jpg', '', 100.00, '', 412.00, 0.50, 0.00, 0.00, 0.00, 1, 698, 698, '{\"颜色\":\"格物致知蓝咖\",\"尺码\":\"200*27cm\"}', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (26, 3, '格物致知蓝咖,240*30', 366, 0, 374.00, 'crmebimage/public/maintain/2021/12/25/5486775d8cad4fd8adfc254d2e93857cn0wu5hq8f4.jpg', '', 100.00, '', 412.00, 0.50, 0.00, 0.00, 0.00, 1, 366, 366, '{\"颜色\":\"格物致知蓝咖\",\"尺码\":\"240*30\"}', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (27, 4, '格物致知红色,200*27cm', 124, 0, 374.00, 'crmebimage/public/maintain/2021/12/25/5486775d8cad4fd8adfc254d2e93857cn0wu5hq8f4.jpg', '', 100.00, '', 412.00, 0.50, 0.00, 0.00, 0.00, 1, 124, 124, '\"{\\\"颜色\\\":\\\"格物致知红色\\\",\\\"尺码\\\":\\\"200*27cm\\\"}\"', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (28, 4, '格物致知红色,240*30', 678, 0, 374.00, 'crmebimage/public/maintain/2021/12/25/5486775d8cad4fd8adfc254d2e93857cn0wu5hq8f4.jpg', '', 100.00, '', 412.00, 0.50, 0.00, 0.00, 0.00, 1, 678, 678, '\"{\\\"颜色\\\":\\\"格物致知红色\\\",\\\"尺码\\\":\\\"240*30\\\"}\"', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (29, 4, '格物致知蓝咖,200*27cm', 698, 0, 374.00, 'crmebimage/public/maintain/2021/12/25/5486775d8cad4fd8adfc254d2e93857cn0wu5hq8f4.jpg', '', 100.00, '', 412.00, 0.50, 0.00, 0.00, 0.00, 1, 698, 698, '\"{\\\"颜色\\\":\\\"格物致知蓝咖\\\",\\\"尺码\\\":\\\"200*27cm\\\"}\"', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (30, 4, '格物致知蓝咖,240*30', 366, 0, 374.00, 'crmebimage/public/maintain/2021/12/25/5486775d8cad4fd8adfc254d2e93857cn0wu5hq8f4.jpg', '', 100.00, '', 412.00, 0.50, 0.00, 0.00, 0.00, 1, 366, 366, '\"{\\\"颜色\\\":\\\"格物致知蓝咖\\\",\\\"尺码\\\":\\\"240*30\\\"}\"', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (31, 3, '白色', 365, 0, 8.00, 'crmebimage/public/maintain/2021/12/25/37382cca048b4011bdbacd3cbbe0814daw1o5x0tco.jpg', '', 5.00, '', 18.00, 1.00, 0.00, 0.00, 0.00, 3, 36, 36, '{\"颜色\":\"白色\"}', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (32, 3, '粉色', 568, 0, 8.00, 'crmebimage/public/maintain/2021/12/25/37382cca048b4011bdbacd3cbbe0814daw1o5x0tco.jpg', '', 5.00, '', 18.00, 1.00, 0.00, 0.00, 0.00, 3, 56, 56, '{\"颜色\":\"粉色\"}', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (33, 3, '红色', 389, 0, 8.00, 'crmebimage/public/maintain/2021/12/25/37382cca048b4011bdbacd3cbbe0814daw1o5x0tco.jpg', '', 5.00, '', 18.00, 1.00, 0.00, 0.00, 0.00, 3, 38, 38, '{\"颜色\":\"红色\"}', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (34, 3, '黑色', 211, 0, 8.00, 'crmebimage/public/maintain/2021/12/25/37382cca048b4011bdbacd3cbbe0814daw1o5x0tco.jpg', '', 5.00, '', 18.00, 1.00, 0.00, 0.00, 0.00, 3, 21, 21, '{\"颜色\":\"黑色\"}', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (35, 4, '格物致知红色,200*27cm', 124, 0, 324.00, 'crmebimage/public/maintain/2021/12/25/5486775d8cad4fd8adfc254d2e93857cn0wu5hq8f4.jpg', '', 100.00, '', 412.00, 0.50, 0.00, 0.00, 0.00, 3, 12, 12, '{\"颜色\":\"格物致知红色\",\"尺码\":\"200*27cm\"}', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (36, 4, '格物致知红色,240*30', 677, 1, 324.00, 'crmebimage/public/maintain/2021/12/25/5486775d8cad4fd8adfc254d2e93857cn0wu5hq8f4.jpg', '', 100.00, '', 412.00, 0.50, 0.00, 0.00, 0.00, 3, 66, 67, '{\"颜色\":\"格物致知红色\",\"尺码\":\"240*30\"}', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (37, 4, '格物致知蓝咖,200*27cm', 698, 0, 324.00, 'crmebimage/public/maintain/2021/12/25/5486775d8cad4fd8adfc254d2e93857cn0wu5hq8f4.jpg', '', 100.00, '', 412.00, 0.50, 0.00, 0.00, 0.00, 3, 69, 69, '{\"颜色\":\"格物致知蓝咖\",\"尺码\":\"200*27cm\"}', 0); -INSERT INTO `eb_store_product_attr_value` VALUES (38, 4, '格物致知蓝咖,240*30', 366, 0, 324.00, 'crmebimage/public/maintain/2021/12/25/5486775d8cad4fd8adfc254d2e93857cn0wu5hq8f4.jpg', '', 100.00, '', 412.00, 0.50, 0.00, 0.00, 0.00, 3, 36, 36, '{\"颜色\":\"格物致知蓝咖\",\"尺码\":\"240*30\"}', 0); - --- ---------------------------- --- Table structure for eb_store_product_cate --- ---------------------------- -DROP TABLE IF EXISTS `eb_store_product_cate`; -CREATE TABLE `eb_store_product_cate` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `product_id` int(11) NOT NULL DEFAULT 0 COMMENT '商品id', - `cate_id` int(11) NOT NULL DEFAULT 0 COMMENT '分类id', - `add_time` int(11) NOT NULL DEFAULT 0 COMMENT '添加时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商品分类辅助表' ROW_FORMAT = Compact; - --- ---------------------------- --- Table structure for eb_store_product_coupon --- ---------------------------- -DROP TABLE IF EXISTS `eb_store_product_coupon`; -CREATE TABLE `eb_store_product_coupon` ( - `id` int(10) NOT NULL AUTO_INCREMENT, - `product_id` int(10) NOT NULL DEFAULT 0 COMMENT '商品id', - `issue_coupon_id` int(10) NOT NULL DEFAULT 0 COMMENT '优惠劵id', - `add_time` int(10) NOT NULL DEFAULT 0 COMMENT '添加时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商品优惠券表' ROW_FORMAT = Compact; - --- ---------------------------- --- Table structure for eb_store_product_description --- ---------------------------- -DROP TABLE IF EXISTS `eb_store_product_description`; -CREATE TABLE `eb_store_product_description` ( - `product_id` int(11) NOT NULL DEFAULT 0 COMMENT '商品ID', - `description` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品详情', - `type` tinyint(1) NOT NULL DEFAULT 0 COMMENT '商品类型', - `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT, - PRIMARY KEY (`id`) USING BTREE, - INDEX `product_id`(`product_id`, `type`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 24 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商品描述表' ROW_FORMAT = Compact; - --- ---------------------------- --- Records of eb_store_product_description --- ---------------------------- -INSERT INTO `eb_store_product_description` VALUES (1, '

', 0, 1); -INSERT INTO `eb_store_product_description` VALUES (2, '

', 0, 2); -INSERT INTO `eb_store_product_description` VALUES (4, '

', 0, 4); -INSERT INTO `eb_store_product_description` VALUES (5, '

', 0, 5); -INSERT INTO `eb_store_product_description` VALUES (6, '

', 0, 6); -INSERT INTO `eb_store_product_description` VALUES (8, '

', 0, 8); -INSERT INTO `eb_store_product_description` VALUES (1, '

', 1, 10); -INSERT INTO `eb_store_product_description` VALUES (2, '

', 1, 12); -INSERT INTO `eb_store_product_description` VALUES (1, '

', 2, 14); -INSERT INTO `eb_store_product_description` VALUES (2, '

', 2, 15); -INSERT INTO `eb_store_product_description` VALUES (1, '

', 3, 16); -INSERT INTO `eb_store_product_description` VALUES (2, '

', 3, 17); -INSERT INTO `eb_store_product_description` VALUES (7, '

', 0, 18); -INSERT INTO `eb_store_product_description` VALUES (3, '

', 0, 19); -INSERT INTO `eb_store_product_description` VALUES (3, '

', 1, 20); -INSERT INTO `eb_store_product_description` VALUES (4, '

', 1, 21); -INSERT INTO `eb_store_product_description` VALUES (3, '

', 3, 22); -INSERT INTO `eb_store_product_description` VALUES (4, '

', 3, 23); - --- ---------------------------- --- Table structure for eb_store_product_log --- ---------------------------- -DROP TABLE IF EXISTS `eb_store_product_log`; -CREATE TABLE `eb_store_product_log` ( - `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '统计ID', - `type` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '类型visit,cart,order,pay,collect,refund', - `product_id` int(11) NOT NULL DEFAULT 0 COMMENT '商品ID', - `uid` int(11) NOT NULL DEFAULT 0 COMMENT '用户ID', - `visit_num` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否浏览', - `cart_num` int(11) NOT NULL DEFAULT 0 COMMENT '加入购物车数量', - `order_num` int(11) NOT NULL DEFAULT 0 COMMENT '下单数量', - `pay_num` int(11) NOT NULL DEFAULT 0 COMMENT '支付数量', - `pay_price` decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '支付金额', - `cost_price` decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '商品成本价', - `pay_uid` int(11) NOT NULL DEFAULT 0 COMMENT '支付用户ID', - `refund_num` int(11) NOT NULL DEFAULT 0 COMMENT '退款数量', - `refund_price` decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '退款金额', - `collect_num` tinyint(1) NOT NULL DEFAULT 0 COMMENT '收藏', - `add_time` bigint(14) NOT NULL DEFAULT 0 COMMENT '添加时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商品日志表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for eb_store_product_relation --- ---------------------------- -DROP TABLE IF EXISTS `eb_store_product_relation`; -CREATE TABLE `eb_store_product_relation` ( - `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT 'id', - `uid` int(10) UNSIGNED NOT NULL COMMENT '用户ID', - `product_id` int(10) UNSIGNED NOT NULL COMMENT '商品ID', - `type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '类型(收藏(collect）、点赞(like))', - `category` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '某种类型的商品(普通商品、秒杀商品)', - `create_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `uid`(`uid`, `product_id`, `type`, `category`) USING BTREE, - INDEX `type`(`type`) USING BTREE, - INDEX `category`(`category`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商品点赞和收藏表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for eb_store_product_reply --- ---------------------------- -DROP TABLE IF EXISTS `eb_store_product_reply`; -CREATE TABLE `eb_store_product_reply` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '评论ID', - `uid` int(11) NOT NULL DEFAULT 0 COMMENT '用户ID', - `oid` int(11) NOT NULL DEFAULT 0 COMMENT '订单ID', - `unique` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品唯一id', - `product_id` int(11) NOT NULL COMMENT '商品id', - `reply_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'product' COMMENT '某种商品类型(普通商品、秒杀商品）', - `product_score` tinyint(1) NOT NULL COMMENT '商品分数', - `service_score` tinyint(1) NOT NULL COMMENT '服务分数', - `comment` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '评论内容', - `pics` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '评论图片', - `merchant_reply_content` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '管理员回复内容', - `merchant_reply_time` int(11) NULL DEFAULT NULL COMMENT '管理员回复时间', - `is_del` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '0未删除1已删除', - `is_reply` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0未回复1已回复', - `nickname` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户名称', - `avatar` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户头像', - `create_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - `sku` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '商品规格属性值,多个,号隔开', - PRIMARY KEY (`id`) USING BTREE, - INDEX `parent_id`(`reply_type`) USING BTREE, - INDEX `is_del`(`is_del`) USING BTREE, - INDEX `product_score`(`product_score`) USING BTREE, - INDEX `service_score`(`service_score`) USING BTREE, - INDEX `uid+oid`(`uid`, `oid`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '评论表' ROW_FORMAT = Compact; - --- ---------------------------- --- Table structure for eb_store_product_rule --- ---------------------------- -DROP TABLE IF EXISTS `eb_store_product_rule`; -CREATE TABLE `eb_store_product_rule` ( - `id` int(10) NOT NULL AUTO_INCREMENT, - `rule_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '规格名称', - `rule_value` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '规格值', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商品规则值(规格)表' ROW_FORMAT = Compact; - --- ---------------------------- --- Records of eb_store_product_rule --- ---------------------------- -INSERT INTO `eb_store_product_rule` VALUES (1, '颜色', '[{\"value\":\"颜色\",\"detail\":[\"白色\",\"黑色\",\"粉色\",\"红色\"],\"inputVisible\":false}]'); -INSERT INTO `eb_store_product_rule` VALUES (2, '围巾', '[{\"value\":\"颜色\",\"detail\":[\"格物致知蓝咖\",\"格物致知红色\"],\"inputVisible\":false},{\"value\":\"尺码\",\"detail\":[\"200*27cm\",\"240*30\"],\"inputVisible\":false}]'); - --- ---------------------------- --- Table structure for eb_store_seckill --- ---------------------------- -DROP TABLE IF EXISTS `eb_store_seckill`; -CREATE TABLE `eb_store_seckill` ( - `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '商品秒杀产品表id', - `product_id` int(10) UNSIGNED NOT NULL COMMENT '商品id', - `image` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '推荐图', - `images` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '轮播图', - `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动标题', - `info` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '简介', - `price` decimal(10, 2) UNSIGNED NOT NULL COMMENT '价格', - `cost` decimal(8, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '成本', - `ot_price` decimal(10, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '原价', - `give_integral` decimal(10, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '返多少积分', - `sort` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '排序', - `stock` int(10) UNSIGNED NOT NULL COMMENT '库存', - `sales` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '销量', - `unit_name` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单位名', - `postage` decimal(8, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '邮费', - `description` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '内容', - `start_time` datetime(0) NOT NULL COMMENT '开始时间', - `stop_time` datetime(0) NOT NULL COMMENT '结束时间', - `create_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间', - `status` tinyint(3) UNSIGNED NOT NULL COMMENT '秒杀状态 0=关闭 1=开启', - `is_postage` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否包邮', - `is_del` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '删除 0未删除1已删除', - `num` int(11) UNSIGNED NOT NULL COMMENT '当天参与活动次数', - `is_show` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '显示', - `time_id` int(11) NULL DEFAULT NULL COMMENT '时间段ID', - `temp_id` int(11) NOT NULL DEFAULT 0 COMMENT '运费模板ID', - `weight` decimal(8, 2) NOT NULL DEFAULT 0.00 COMMENT '重量', - `volume` decimal(8, 2) NOT NULL DEFAULT 0.00 COMMENT '体积', - `quota` int(10) NOT NULL DEFAULT 0 COMMENT '限购总数,随减', - `quota_show` int(10) NOT NULL DEFAULT 0 COMMENT '限购总数显示.不变', - `spec_type` tinyint(1) NOT NULL DEFAULT 0 COMMENT '规格 0=单 1=多', - PRIMARY KEY (`id`) USING BTREE, - INDEX `product_id`(`product_id`) USING BTREE, - INDEX `start_time`(`start_time`, `stop_time`) USING BTREE, - INDEX `is_del`(`is_del`) USING BTREE, - INDEX `is_show`(`status`) USING BTREE, - INDEX `add_time`(`create_time`) USING BTREE, - INDEX `sort`(`sort`) USING BTREE, - INDEX `is_postage`(`is_postage`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商品秒杀产品表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of eb_store_seckill --- ---------------------------- -INSERT INTO `eb_store_seckill` VALUES (1, 8, 'crmebimage/public/maintain/2021/12/25/7a6475bba07c47bb98e5db0e0d21c8ebq5sw2kijlc.jpg', '[\"crmebimage/public/maintain/2021/12/25/7a6475bba07c47bb98e5db0e0d21c8ebq5sw2kijlc.jpg\"]', '兰蔻（LANCOME）口红196 全新菁纯丝绒雾面唇膏 化妆品礼盒', '兰蔻（LANCOME）口红196 全新菁纯丝绒雾面唇膏 化妆品礼盒', 720.00, 212.00, 197.00, 0.00, 0, 99, 0, '件', 0.00, NULL, '2021-12-25 00:00:00', '2022-02-28 00:00:00', '2021-12-25 13:08:50', 1, 0, 0, 1, 1, 2, 1, 0.00, 0.00, 99, 99, 0); -INSERT INTO `eb_store_seckill` VALUES (2, 5, 'crmebimage/public/maintain/2021/12/25/f65ef5469f3a479497a710fb288d115cvl5imkvpo8.jpg', '[\"crmebimage/public/maintain/2021/12/25/f65ef5469f3a479497a710fb288d115cvl5imkvpo8.jpg\"]', 'LAORENTOU包包女包牛皮单肩女士包包奢侈品蓝色【礼盒装】', 'LAORENTOU包包女包牛皮单肩女士包包奢侈品蓝色【礼盒装】', 95.00, 15.00, 145.00, 0.00, 0, 98, 1, '件', 0.00, NULL, '2021-12-25 00:00:00', '2022-02-28 00:00:00', '2021-12-25 13:10:53', 1, 0, 0, 1, 1, 2, 1, 0.00, 0.00, 98, 99, 0); -INSERT INTO `eb_store_seckill` VALUES (3, 3, 'crmebimage/public/maintain/2021/12/25/5486775d8cad4fd8adfc254d2e93857cn0wu5hq8f4.jpg', '[\"crmebimage/public/maintain/2021/12/25/5486775d8cad4fd8adfc254d2e93857cn0wu5hq8f4.jpg\"]', '万事利秋冬新品时尚百搭经典真丝绒厚款围巾 格物致知蓝咖', '万事利秋冬新品时尚百搭经典真丝绒厚款围巾 格物致知蓝咖', 374.00, 100.00, 412.00, 0.00, 0, 1866, 0, '件', 0.00, NULL, '2021-12-29 00:00:00', '2022-01-31 00:00:00', '2021-12-29 11:46:20', 1, 0, 0, 1, 1, 1, 1, 0.00, 0.00, 1866, 1866, 1); -INSERT INTO `eb_store_seckill` VALUES (4, 3, 'crmebimage/public/maintain/2021/12/25/5486775d8cad4fd8adfc254d2e93857cn0wu5hq8f4.jpg', '[\"crmebimage/public/maintain/2021/12/25/5486775d8cad4fd8adfc254d2e93857cn0wu5hq8f4.jpg\"]', '万事利秋冬新品时尚百搭经典真丝绒厚款围巾', '万事利秋冬新品时尚百搭经典真丝绒厚款围巾 格物致知蓝咖', 374.00, 100.00, 412.00, 0.00, 0, 1866, 0, '件', 0.00, NULL, '2021-12-29 00:00:00', '2022-01-31 00:00:00', '2021-12-29 11:47:03', 1, 0, 0, 1, 1, 2, 1, 0.00, 0.00, 1866, 1866, 1); - --- ---------------------------- --- Table structure for eb_store_seckill_manger --- ---------------------------- -DROP TABLE IF EXISTS `eb_store_seckill_manger`; -CREATE TABLE `eb_store_seckill_manger` ( - `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '秒杀名称', - `start_time` int(11) NULL DEFAULT NULL COMMENT '秒杀开始时间段', - `end_time` int(11) NULL DEFAULT NULL COMMENT '秒杀结束时间段', - `img` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '主图', - `silder_imgs` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '轮播图', - `sort` int(11) NULL DEFAULT NULL COMMENT '排序', - `status` int(11) NULL DEFAULT NULL COMMENT '状态 0=关闭 1=开启', - `create_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` datetime(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - `is_del` int(11) NOT NULL DEFAULT 0 COMMENT '删除标记 0=为删除 1=删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of eb_store_seckill_manger --- ---------------------------- -INSERT INTO `eb_store_seckill_manger` VALUES (1, '白领', 10, 13, NULL, '[{\"attId\":192,\"name\":\"eab9cdc74c4e4673acab70b801ee4612wnxgu98i0l.jpg\",\"attDir\":\"\",\"sattDir\":\"crmebimage/public/maintain/2021/12/25/e91ccd7e37294221bfdb7b43a42d8ed5hghg7nw0qb.jpg\",\"attSize\":\"118260\",\"attType\":\"jpeg\",\"pid\":0,\"imageType\":1,\"createTime\":\"2021-12-25 11:57:38\",\"updateTime\":\"2021-12-25 11:57:38\",\"isSelect\":true,\"num\":1}]', NULL, 1, '2021-06-03 10:48:58', '2021-12-25 13:07:21', 0); -INSERT INTO `eb_store_seckill_manger` VALUES (2, '夜猫子', 13, 18, NULL, '[{\"attId\":191,\"name\":\"2702ff9ddd4e40ee97c957f07e9417b10hrby3rl2i.jpg\",\"attDir\":\"\",\"sattDir\":\"crmebimage/public/maintain/2021/12/25/9e97ddf78f804d50b985bdcf666478ebj76hbf3gpp.jpg\",\"attSize\":\"117394\",\"attType\":\"jpeg\",\"pid\":0,\"imageType\":1,\"createTime\":\"2021-12-25 11:57:38\",\"updateTime\":\"2021-12-25 11:57:38\",\"isSelect\":true,\"num\":2}]', NULL, 1, '2021-06-03 14:12:45', '2021-12-29 13:58:14', 0); -INSERT INTO `eb_store_seckill_manger` VALUES (4, '下班拉', 18, 22, NULL, '[{\"attId\":193,\"name\":\"0638dad477de4f979f1d6f58aa960c41bvp53cy53v.jpg\",\"attDir\":\"\",\"sattDir\":\"crmebimage/public/maintain/2021/12/25/3598e8d0aa3f4bf1b61140daa0e36300k0te4s6z3j.jpg\",\"attSize\":\"149827\",\"attType\":\"jpeg\",\"pid\":0,\"imageType\":1,\"createTime\":\"2021-12-25 11:57:38\",\"updateTime\":\"2021-12-25 11:57:38\",\"localImg\":\"\",\"isSelect\":true,\"num\":1}]', NULL, 1, '2021-07-17 17:46:35', '2021-12-25 13:07:11', 0); - --- ---------------------------- --- Table structure for eb_system_admin --- ---------------------------- -DROP TABLE IF EXISTS `eb_system_admin`; -CREATE TABLE `eb_system_admin` ( - `id` smallint(5) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '后台管理员表ID', - `account` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '后台管理员账号', - `pwd` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '后台管理员密码', - `real_name` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '后台管理员姓名', - `roles` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '后台管理员权限(menus_id)', - `last_ip` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '后台管理员最后一次登录ip', - `update_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '后台管理员最后一次登录时间', - `create_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '后台管理员添加时间', - `login_count` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '登录次数', - `level` tinyint(3) UNSIGNED NOT NULL DEFAULT 1 COMMENT '后台管理员级别', - `status` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '后台管理员状态 1有效0无效', - `is_del` tinyint(1) UNSIGNED NOT NULL DEFAULT 0, - `phone` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '手机号码', - `is_sms` tinyint(1) UNSIGNED NULL DEFAULT 0 COMMENT '是否接收短信', - PRIMARY KEY (`id`) USING BTREE, - INDEX `account`(`account`) USING BTREE, - INDEX `status`(`status`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '后台管理员表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of eb_system_admin --- ---------------------------- -INSERT INTO `eb_system_admin` VALUES (1, 'admin', 'L8qdg72wbeQ=', '超管', '1', '1.80.234.19', '2021-11-29 17:28:28', '2021-07-16 09:59:12', 505, 1, 1, 0, '11111111111', 0); -INSERT INTO `eb_system_admin` VALUES (2, 'demo', 'Rb/KmlSjAxI=', '演示账号', '5', '113.102.138.163', '2021-12-17 09:42:30', '2021-06-09 11:21:42', 346, 1, 1, 0, '18888888888', 0); - --- ---------------------------- --- Table structure for eb_system_attachment --- ---------------------------- -DROP TABLE IF EXISTS `eb_system_attachment`; -CREATE TABLE `eb_system_attachment` ( - `att_id` int(10) NOT NULL AUTO_INCREMENT, - `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '附件名称', - `att_dir` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '附件路径', - `satt_dir` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '压缩图片路径', - `att_size` char(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '附件大小', - `att_type` char(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '附件类型', - `pid` int(10) NOT NULL DEFAULT 0 COMMENT '分类ID0编辑器,1商品图片,2拼团图片,3砍价图片,4秒杀图片,5文章图片,6组合数据图， 7前台用户', - `image_type` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '图片上传类型 1本地 2七牛云 3OSS 4COS ', - `create_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - PRIMARY KEY (`att_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 273 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '附件管理表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of eb_system_attachment --- ---------------------------- -INSERT INTO `eb_system_attachment` VALUES (1, '510d9964f7434895a4d7681c05c0cbf48ramy247zo.png', '', 'crmebimage/public/maintain/2021/12/25/44bbd14303764d49a034ae51550a8452caek7lc1ch.png', '291502', 'png', 718, 1, '2021-12-25 10:17:14', '2021-12-25 10:17:14'); -INSERT INTO `eb_system_attachment` VALUES (2, 'db27bc64121740bd80401623288d17c2dg27m2fo9m.png', '', 'crmebimage/public/maintain/2021/12/25/ea6b31f1839c42238ea1c129c1b4d5eaup7j6zz0so.png', '5024', 'png', 718, 1, '2021-12-25 10:17:37', '2021-12-25 10:17:37'); -INSERT INTO `eb_system_attachment` VALUES (3, 'c96ecfc8c2ef42b6bbc3877eb68a00bco2mqhncbuk.png', '', 'crmebimage/public/maintain/2021/12/25/9b7ccec87366454098153196b5ab091cqhibrmf8c5.png', '5037', 'png', 718, 1, '2021-12-25 10:17:45', '2021-12-25 10:17:45'); -INSERT INTO `eb_system_attachment` VALUES (4, 'f371cfb0ad13433aa5e5b9300f6d42c5rtxnexv4p7.png', '', 'crmebimage/public/maintain/2021/12/25/05be58dd877f45d28d1af418614e8fa5mi3mwr9p5o.png', '4210', 'png', 718, 1, '2021-12-25 10:17:52', '2021-12-25 10:17:52'); -INSERT INTO `eb_system_attachment` VALUES (5, 'd869b609a65d41efbf59be207972c302mu2m328v2s.png', '', 'crmebimage/public/maintain/2021/12/25/ec5fbe4271674fba8873a45d6f767c98ygzcuucjsl.png', '4842', 'png', 718, 1, '2021-12-25 10:18:02', '2021-12-25 10:18:02'); -INSERT INTO `eb_system_attachment` VALUES (6, '11a6bb69a4094b2792709f952d60a869gu2vpjjueg.png', '', 'crmebimage/public/maintain/2021/12/25/6f599b7d21bf49dc9f93d6d1a1ef56e8hvyv1b4q5s.png', '8954', 'png', 720, 1, '2021-12-25 10:26:11', '2021-12-25 11:04:00'); -INSERT INTO `eb_system_attachment` VALUES (7, '088ff22c1f9946a58cd751dd68ee7949cc0to1jr80.png', '', 'crmebimage/public/maintain/2021/12/25/21c84909461c434a8ff39d467ba8d648prefpnpq15.png', '8748', 'png', 720, 1, '2021-12-25 10:26:25', '2021-12-25 11:04:00'); -INSERT INTO `eb_system_attachment` VALUES (8, '6eaf10e8e068450dbfaf27cf44cd0f5btjv2h03umq.png', '', 'crmebimage/public/maintain/2021/12/25/71b89c4f080948a981e06c6ba748c5e1x9mfhpzhfd.png', '7551', 'png', 720, 1, '2021-12-25 10:26:42', '2021-12-25 11:04:00'); -INSERT INTO `eb_system_attachment` VALUES (9, '0fafaa32b702483d8faaafa33e300189msytufgs4j.png', '', 'crmebimage/public/maintain/2021/12/25/3ab2dae5527742319ae003c58cca264duewwp3esg8.png', '7640', 'png', 720, 1, '2021-12-25 10:26:49', '2021-12-25 11:04:00'); -INSERT INTO `eb_system_attachment` VALUES (10, '05acef485dce4735ae7b984e54ad31e0v1aac7u2nt.png', '', 'crmebimage/public/maintain/2021/12/25/418c7649b2b646f4a13dd6f335ae927426354rq62r.png', '8292', 'png', 720, 1, '2021-12-25 10:27:00', '2021-12-25 11:04:00'); -INSERT INTO `eb_system_attachment` VALUES (11, '5bb57ed904e24e0ea4f80c87e0014e08r6wsq5uhkz.png', '', 'crmebimage/public/maintain/2021/12/25/ebf72b915ecc4deab71c353b62ce7de9d0uv4lgzwz.png', '8883', 'png', 720, 1, '2021-12-25 10:27:08', '2021-12-25 11:04:00'); -INSERT INTO `eb_system_attachment` VALUES (12, '28bbeae6892b42ce8838a0885e57bc506uw1xmsk67.png', '', 'crmebimage/public/maintain/2021/12/25/6ba5bf3b13c446cca8b703bf155ccc9362b0gvz1rc.png', '7932', 'png', 720, 1, '2021-12-25 10:27:13', '2021-12-25 11:04:00'); -INSERT INTO `eb_system_attachment` VALUES (13, '30e53adcdc204d79b3d613f013ca2a6d3jx323kyqm.png', '', 'crmebimage/public/maintain/2021/12/25/2e47a337dbdf445d81b20c1b5aeedf01ybm0jmic0h.png', '9382', 'png', 720, 1, '2021-12-25 10:27:24', '2021-12-25 11:04:00'); -INSERT INTO `eb_system_attachment` VALUES (14, '81d9d672b417406781f554d13980c7b890n0o9g4m7.png', '', 'crmebimage/public/maintain/2021/12/25/9ac69cbe9da4459db264b1902ff6f693spomyy6lkw.png', '10477', 'png', 720, 1, '2021-12-25 10:27:29', '2021-12-25 11:04:00'); -INSERT INTO `eb_system_attachment` VALUES (15, '0b07802a74574cae80d5f1b6ef43c08fusdil79x6c.png', '', 'crmebimage/public/maintain/2021/12/25/927222f030f146228d323c4af9d697c1ayirgv5ibc.png', '7454', 'png', 718, 1, '2021-12-25 10:27:52', '2021-12-25 10:27:52'); -INSERT INTO `eb_system_attachment` VALUES (16, '738371d9d0254c70b88db65fee0d21056ttdztgznp.png', '', 'crmebimage/public/maintain/2021/12/25/e7e54160e9db4a9e814675763a80e58ce0j522s6ds.png', '8846', 'png', 720, 1, '2021-12-25 10:28:12', '2021-12-25 11:04:00'); -INSERT INTO `eb_system_attachment` VALUES (17, '3d421f6e629a41fc9e1be98beb21993fao7uffqcgg.png', '', 'crmebimage/public/maintain/2021/12/25/19171c7360924d47a39f048414045e765k3rr7xwr2.png', '6819', 'png', 718, 1, '2021-12-25 10:28:21', '2021-12-25 10:28:21'); -INSERT INTO `eb_system_attachment` VALUES (18, 'fe4faf19b35c4dd0baea31f321a521ecpjud7ibsxl.png', '', 'crmebimage/public/maintain/2021/12/25/11113e1876ac427bb3173086a3bd6c5bhyan1ea9pz.png', '1859', 'png', 718, 1, '2021-12-25 10:29:10', '2021-12-25 10:29:10'); -INSERT INTO `eb_system_attachment` VALUES (19, 'b007ec2847d6418ba48c47c04780a972ramfbrjtzm.png', '', 'crmebimage/public/maintain/2021/12/25/c0db7c50e7024a5aaeefdae3bc192c5eerx8f25qrb.png', '4142', 'png', 718, 1, '2021-12-25 10:29:21', '2021-12-25 10:29:21'); -INSERT INTO `eb_system_attachment` VALUES (20, '91d0399d97524e919f75cb0264bd0a96uqm0rmjt0b.png', '', 'crmebimage/public/maintain/2021/12/25/dd497d333f4541d7ae41b2c579706370jhp2x39yrg.png', '2308', 'png', 718, 1, '2021-12-25 10:29:43', '2021-12-25 10:29:43'); -INSERT INTO `eb_system_attachment` VALUES (21, 'a2cfcc4ee73e4679a45e345655edd2ab752wdvzk6j.png', '', 'crmebimage/public/maintain/2021/12/25/77ac54ce5f514ebbb89854f927f2a891dzefr2qxmh.png', '2037', 'png', 718, 1, '2021-12-25 10:29:50', '2021-12-25 10:29:50'); -INSERT INTO `eb_system_attachment` VALUES (22, 'c15e71a4d96f46bb8795603c94d32b1cfb97p3nxnm.png', '', 'crmebimage/public/maintain/2021/12/25/eaec5b3bf0a74de888cd55cfa3cb47ffa5y4mlsvzh.png', '2239', 'png', 718, 1, '2021-12-25 10:29:56', '2021-12-25 10:29:56'); -INSERT INTO `eb_system_attachment` VALUES (23, 'a35edc82ffd840d09bf519d940cb7091enz3s3n683.png', '', 'crmebimage/public/maintain/2021/12/25/d9631b9c1b3641c4a0ab860a99e92d97nfwk9u6upj.png', '1811', 'png', 718, 1, '2021-12-25 10:30:05', '2021-12-25 10:30:05'); -INSERT INTO `eb_system_attachment` VALUES (24, '07850125979f416f97d0d853b942207c0979vj4gf5.png', '', 'crmebimage/public/maintain/2021/12/25/5d6617d3440c4d67802fdf064b77b471qzfen9343d.png', '1343', 'png', 718, 1, '2021-12-25 10:30:13', '2021-12-25 10:30:13'); -INSERT INTO `eb_system_attachment` VALUES (25, '9c9aafdb603e498b8a12226adee28321ywx46bntkt.png', '', 'crmebimage/public/maintain/2021/12/25/5b4c2373aee143c79a2cda64c030e452vc2uhsxy3q.png', '2237', 'png', 718, 1, '2021-12-25 10:30:27', '2021-12-25 10:30:27'); -INSERT INTO `eb_system_attachment` VALUES (26, 'c95d30fae48b459ab2ea2468298b45fdjgnfz6r6sv.png', '', 'crmebimage/public/maintain/2021/12/25/197b96e3a4d24728b4069b0c288326352gcds3duga.png', '2262', 'png', 718, 1, '2021-12-25 10:30:34', '2021-12-25 10:30:34'); -INSERT INTO `eb_system_attachment` VALUES (27, 'df9311e0c5bd4c81a94151cdd5771993p3fxs75e0t.png', '', 'crmebimage/public/maintain/2021/12/25/886e04146694474c966d346222fe2897ealwo6qycj.png', '2053', 'png', 718, 1, '2021-12-25 10:30:41', '2021-12-25 10:30:41'); -INSERT INTO `eb_system_attachment` VALUES (28, '69ab0bf7cf5f4926941d6d9f0c4bdeb8bvb90wktkd.png', '', 'crmebimage/public/maintain/2021/12/25/0624fe22d770438891ad666ebef9e21e1rhiepyec1.png', '2118', 'png', 718, 1, '2021-12-25 10:30:52', '2021-12-25 10:30:52'); -INSERT INTO `eb_system_attachment` VALUES (30, 'eea57fd717fa432786ffb7f10f6a2eb96p20ur1cil.png', '', 'crmebimage/public/maintain/2021/12/25/1369d83740284b6aa0601a0bc0960a050wfmede2py.png', '2932', 'png', 719, 1, '2021-12-25 10:35:44', '2021-12-25 10:35:44'); -INSERT INTO `eb_system_attachment` VALUES (31, 'a3c715971bd3463d90c7a636bc5d33a8r0oan2dt5s.png', '', 'crmebimage/public/maintain/2021/12/25/750c33dcdf134878ba1024c8828a191ardbxljb5qf.png', '12292', 'png', 718, 1, '2021-12-25 10:36:21', '2021-12-25 11:03:30'); -INSERT INTO `eb_system_attachment` VALUES (32, '5b1f0e525f134d77979707372c0380a6xednwualu2.png', '', 'crmebimage/public/maintain/2021/12/25/ff3283593f0444da9038f578fff96bcfguve7bk9pf.png', '10570', 'png', 718, 1, '2021-12-25 10:37:15', '2021-12-25 11:03:30'); -INSERT INTO `eb_system_attachment` VALUES (33, 'cdf7aa541f1c4d5f9a442947091fe3612d6e0rtzx9.jpg', '', 'crmebimage/public/maintain/2021/12/25/980ef8cc00504f15af77712bf1cdde72yc273lnpt3.jpg', '11046', 'jpeg', 721, 1, '2021-12-25 10:40:30', '2021-12-25 10:40:30'); -INSERT INTO `eb_system_attachment` VALUES (34, '35a505c2eee743cc9ac47f0ae61b9f54e5y2tg9js5.jpg', '', 'crmebimage/public/maintain/2021/12/25/22e7a94a8c7a48318e895aa3f23d24f1ecq3mqcdx8.jpg', '9660', 'jpeg', 721, 1, '2021-12-25 10:40:40', '2021-12-25 10:40:40'); -INSERT INTO `eb_system_attachment` VALUES (35, '099901633a374de8b93aa88d7273eb57u2z4naq5je.jpg', '', 'crmebimage/public/maintain/2021/12/25/55014ffb17b74d039b5670298e1047fcyw64lmyzlj.jpg', '7058', 'jpeg', 721, 1, '2021-12-25 10:40:47', '2021-12-25 10:40:47'); -INSERT INTO `eb_system_attachment` VALUES (36, '7442322de8b8466393c07b24812c7ceagayfi78ucc.jpg', '', 'crmebimage/public/maintain/2021/12/25/ea80c26cfb3d441b9b6affd68c62acf5l3ncs7skt9.jpg', '12654', 'jpeg', 721, 1, '2021-12-25 10:40:56', '2021-12-25 10:40:56'); -INSERT INTO `eb_system_attachment` VALUES (37, 'd165ef5cac704798b05e29de0c2f4e69boxn0l2n7f.jpg', '', 'crmebimage/public/maintain/2021/12/25/29a253f8752a46f4b2fb3b63767b4d89v1098p6yiv.jpg', '15042', 'jpeg', 721, 1, '2021-12-25 10:41:04', '2021-12-25 10:41:04'); -INSERT INTO `eb_system_attachment` VALUES (38, '4c901782d14a415d9c602cf95e470f5946ekev33o2.jpg', '', 'crmebimage/public/maintain/2021/12/25/fc4be55bf8c8420f89db87cbe8c2a95fkpar5lv6tw.jpg', '12347', 'jpeg', 721, 1, '2021-12-25 10:41:16', '2021-12-25 10:41:16'); -INSERT INTO `eb_system_attachment` VALUES (39, '3f149aa3119a4b92a45e3a7d648d87eajwc91bdzm8.jpg', '', 'crmebimage/public/maintain/2021/12/25/0e67de5c892047cf8788b9b51d1c4d5al5g2khm62q.jpg', '3725', 'jpeg', 721, 1, '2021-12-25 10:41:23', '2021-12-25 10:41:23'); -INSERT INTO `eb_system_attachment` VALUES (40, 'c0892f1ff9fa430286752b8a48dfe94agnowmoyu4z.jpg', '', 'crmebimage/public/maintain/2021/12/25/9612dab3a9ec44278dc5069c3d484f9388l25e3lxk.jpg', '24258', 'jpeg', 721, 1, '2021-12-25 10:41:31', '2021-12-25 10:41:31'); -INSERT INTO `eb_system_attachment` VALUES (41, '2f238a394bfd427d8d8aadee3ddb1248462zjvu3r7.jpg', '', 'crmebimage/public/maintain/2021/12/25/37901b98fba74345ad0e8a575999ad09n9d3winw2c.jpg', '12248', 'jpeg', 721, 1, '2021-12-25 10:41:39', '2021-12-25 10:41:39'); -INSERT INTO `eb_system_attachment` VALUES (42, 'fd69f8ffce614a46a3b92b976a99058a476sohn24w.jpg', '', 'crmebimage/public/maintain/2021/12/25/8f9eca84e2b14752ad4afb1ab8d06974xua9ambm9y.jpg', '8847', 'jpeg', 721, 1, '2021-12-25 10:41:50', '2021-12-25 10:41:50'); -INSERT INTO `eb_system_attachment` VALUES (43, '86df9901106a45c59d55215756e2d0e4yyp7kczp1i.jpg', '', 'crmebimage/public/maintain/2021/12/25/62414c551db44169a6429c0dd3d162833o6e82okff.jpg', '8426', 'jpeg', 721, 1, '2021-12-25 10:41:58', '2021-12-25 10:41:58'); -INSERT INTO `eb_system_attachment` VALUES (44, '450b5c828df24a20842ec77621a593bf5jaa85101m.jpg', '', 'crmebimage/public/maintain/2021/12/25/800915654d504c4a8da14ab4771b0411146f3w26cg.jpg', '11176', 'jpeg', 721, 1, '2021-12-25 10:42:04', '2021-12-25 10:42:04'); -INSERT INTO `eb_system_attachment` VALUES (45, 'a7fad9cea3f94dd5b3a34c9c05dbcbb6dhg8f9dmnb.jpg', '', 'crmebimage/public/maintain/2021/12/25/dc9a2481719445d49f045bc18c265dccqww5ieybh3.jpg', '11855', 'jpeg', 721, 1, '2021-12-25 10:42:17', '2021-12-25 10:42:17'); -INSERT INTO `eb_system_attachment` VALUES (46, 'afbfa9719ca648ca97d158c79e9cad793ln7e5a7jb.jpg', '', 'crmebimage/public/maintain/2021/12/25/2eef89b403dd47619e349e3edb057ce4g2clr5d4xn.jpg', '11582', 'jpeg', 721, 1, '2021-12-25 10:42:26', '2021-12-25 10:42:26'); -INSERT INTO `eb_system_attachment` VALUES (47, '4ef2bbb5067f4c838b2c1bc0d7d3cfbekromfdrf2l.png', '', 'crmebimage/public/maintain/2021/12/25/02805afbe2964016a7ec11dc723273634a65204z4d.png', '137246', 'png', 721, 1, '2021-12-25 10:42:33', '2021-12-25 10:42:33'); -INSERT INTO `eb_system_attachment` VALUES (48, '769d0166bbf1473e80122304d5ce8b21ue1eo7325t.jpg', '', 'crmebimage/public/maintain/2021/12/25/86f83bdc35534eeda2fb4daeb51dbb28pizkxqnzap.jpg', '11698', 'jpeg', 721, 1, '2021-12-25 10:42:41', '2021-12-25 10:42:41'); -INSERT INTO `eb_system_attachment` VALUES (49, 'e15f9a3d323243f09b794a9f3eb92e395b64y3y4zv.jpg', '', 'crmebimage/public/maintain/2021/12/25/432cb941d4f64f4c88d2d3a8b784f282kqlp2cu55l.jpg', '12104', 'jpeg', 721, 1, '2021-12-25 10:42:48', '2021-12-25 10:42:48'); -INSERT INTO `eb_system_attachment` VALUES (50, '0c26d73542594c24be0fc0f0c86df04en524w3tgh0.jpg', '', 'crmebimage/public/maintain/2021/12/25/4811fe50a33f48309337e67c3d36318exseuh6qys6.jpg', '13293', 'jpeg', 721, 1, '2021-12-25 10:42:55', '2021-12-25 10:42:55'); -INSERT INTO `eb_system_attachment` VALUES (51, '061463374f084111bd1ea7ff8efb9e6f9q6z7246xp.jpg', '', 'crmebimage/public/maintain/2021/12/25/73f9c6c1b14445b5bb477e8c05d8a2763sfij1gamk.jpg', '12894', 'jpeg', 721, 1, '2021-12-25 10:43:10', '2021-12-25 10:43:10'); -INSERT INTO `eb_system_attachment` VALUES (52, 'a6959d39961a4d7fa5c42f7479bfe853mf2j5y207g.jpg', '', 'crmebimage/public/maintain/2021/12/25/7beeefdecba6465d93fae9ec9ae952bde1fprb1tqi.jpg', '48892', 'jpeg', 721, 1, '2021-12-25 10:43:17', '2021-12-25 10:43:17'); -INSERT INTO `eb_system_attachment` VALUES (53, 'fc6bbd39a9c244a8b8697ec74b096258ltkiim3ias.png', '', 'crmebimage/public/maintain/2021/12/25/3a395df3d79a40a08cbc938c35e2dc35b84sujo2yn.png', '90279', 'png', 721, 1, '2021-12-25 10:43:29', '2021-12-25 10:43:29'); -INSERT INTO `eb_system_attachment` VALUES (54, '3ad1dd1e69a84dd3b2c6182198c7f5d0f3j4hxypxe.jpg', '', 'crmebimage/public/maintain/2021/12/25/a272fcefed804cf2b1e6785d5662c29ejqjxha0eow.jpg', '40991', 'jpeg', 721, 1, '2021-12-25 10:43:45', '2021-12-25 10:43:45'); -INSERT INTO `eb_system_attachment` VALUES (55, '81b545270bbf443c84a33e7dc0335224twn9esewp5.jpg', '', 'crmebimage/public/maintain/2021/12/25/03cc34d0bb3f4bbcafa751462a2783c35u00exmfji.jpg', '41951', 'jpeg', 721, 1, '2021-12-25 10:43:53', '2021-12-25 10:43:53'); -INSERT INTO `eb_system_attachment` VALUES (56, '1a6318ea870043eba1daec9bdcc2b998a5tuyn7gsj.jpg', '', 'crmebimage/public/maintain/2021/12/25/fb364676ea364297b7441638f9e0f557dckg4t2rds.jpg', '18503', 'jpeg', 721, 1, '2021-12-25 10:43:58', '2021-12-25 10:43:58'); -INSERT INTO `eb_system_attachment` VALUES (57, '2d1e3f9c640c42259988c1f2ba097cab1l9rwd6k8o.png', '', 'crmebimage/public/maintain/2021/12/25/a574f30b250941a7b3c0dd534e89df348n7shpz7t1.png', '10124', 'png', 722, 1, '2021-12-25 10:45:24', '2021-12-25 10:45:24'); -INSERT INTO `eb_system_attachment` VALUES (58, '48a2d36c676d4d64b0db145c5fd4cb0bnkbkwzx3u3.png', '', 'crmebimage/public/maintain/2021/12/25/f8fa9ebb978f4564a1b6bdd145de5303fmswbc6mlr.png', '9336', 'png', 722, 1, '2021-12-25 10:45:24', '2021-12-25 10:45:24'); -INSERT INTO `eb_system_attachment` VALUES (59, '10947a963ca04408a2e2c7ef730cf771kw84thv3zz.png', '', 'crmebimage/public/maintain/2021/12/25/e14049cfd2a3435abb4cdb938a52a3fbtd8uoupja1.png', '9910', 'png', 722, 1, '2021-12-25 10:45:24', '2021-12-25 10:45:24'); -INSERT INTO `eb_system_attachment` VALUES (60, '8f2609b341c547ad8cc1eb61f9f1ec55joy9yjqyad.png', '', 'crmebimage/public/maintain/2021/12/25/dfa88bc269de407f95febe418269b65dlp2boy3pkr.png', '11047', 'png', 722, 1, '2021-12-25 10:45:24', '2021-12-25 10:45:24'); -INSERT INTO `eb_system_attachment` VALUES (61, 'efbfa787584446e4b412d4c4ec1b8c46qcoju9m76v.png', '', 'crmebimage/public/maintain/2021/12/25/c959d47d07a64b14843ba67dfa5b3fe6j2c32uq6h0.png', '10085', 'png', 722, 1, '2021-12-25 10:45:24', '2021-12-25 10:45:24'); -INSERT INTO `eb_system_attachment` VALUES (62, 'a349b548ddf14a859b574a79617db141eno4knazt1.png', '', 'crmebimage/public/maintain/2021/12/25/b96a241b6683440fb19d26ed90189273fyp23gsevb.png', '10009', 'png', 722, 1, '2021-12-25 10:45:24', '2021-12-25 10:45:24'); -INSERT INTO `eb_system_attachment` VALUES (63, '87c89c4e6484495fbd769eb97759650ds27rsdn1qq.png', '', 'crmebimage/public/maintain/2021/12/25/0c32e97956d34f6e8a8b67caacec685283ufh1vuoy.png', '10428', 'png', 722, 1, '2021-12-25 10:45:24', '2021-12-25 10:45:24'); -INSERT INTO `eb_system_attachment` VALUES (64, '2755d049cda548729432d8a6dc5f3468spjlx65qm6.png', '', 'crmebimage/public/maintain/2021/12/25/e9d9bc38164f417b968d368d1158acf0sxq8tuqq5h.png', '10496', 'png', 722, 1, '2021-12-25 10:45:24', '2021-12-25 10:45:24'); -INSERT INTO `eb_system_attachment` VALUES (65, '1936d1a9c76249b7bc37461645f2e952uc0yw0bhq5.png', '', 'crmebimage/public/maintain/2021/12/25/7b93fd438d974bf2a7b999e2e3a24880ggis08twkr.png', '10560', 'png', 722, 1, '2021-12-25 10:45:24', '2021-12-25 10:45:24'); -INSERT INTO `eb_system_attachment` VALUES (66, '5223c2dd64ab4517bab59f9b9b473cd07t0sa4uksx.png', '', 'crmebimage/public/maintain/2021/12/25/e739d5a88c2141a0b346e1bdb1d8e2dea6ktbegtad.png', '10533', 'png', 722, 1, '2021-12-25 10:45:24', '2021-12-25 10:45:24'); -INSERT INTO `eb_system_attachment` VALUES (67, '9456b16028e941d48386e26a7b8b17e7un0n7uopr7.png', '', 'crmebimage/public/maintain/2021/12/25/568f2d58e43a4dd9bae304e2112025bben74m2lpt9.png', '10743', 'png', 722, 1, '2021-12-25 10:45:24', '2021-12-25 10:45:24'); -INSERT INTO `eb_system_attachment` VALUES (68, '29709488ba29464d948790fb23fecb53rqs8rwcbrf.png', '', 'crmebimage/public/maintain/2021/12/25/afd2e837f9fe40e8998a9f3c37fb4d9cvnz3qsdfl2.png', '10698', 'png', 722, 1, '2021-12-25 10:45:24', '2021-12-25 10:45:24'); -INSERT INTO `eb_system_attachment` VALUES (69, '6def899519f84f2b992492cbe267da141m7ugq21gr.png', '', 'crmebimage/public/maintain/2021/12/25/6f98afe5e63d4626a20ed710dc380d5bmc5a0w5phh.png', '3629', 'png', 723, 1, '2021-12-25 10:46:25', '2021-12-25 10:46:25'); -INSERT INTO `eb_system_attachment` VALUES (70, 'b2d091363fc34fdf8bc737c2f978bc090j7hxbnank.png', '', 'crmebimage/public/maintain/2021/12/25/c71d6b74594e4f47a986abda5d5bf983o4drst1ojf.png', '3894', 'png', 723, 1, '2021-12-25 10:46:25', '2021-12-25 10:46:25'); -INSERT INTO `eb_system_attachment` VALUES (71, 'ce34f7cf454846a28b152049ba5494417vok0wvl7l.png', '', 'crmebimage/public/maintain/2021/12/25/a1470da9ce7f44e3a0248f519b0b02844efygohg3b.png', '4248', 'png', 723, 1, '2021-12-25 10:46:25', '2021-12-25 10:46:25'); -INSERT INTO `eb_system_attachment` VALUES (72, '197514463aad4dbf88cd4266ad35254a18dwgv0dt8.png', '', 'crmebimage/public/maintain/2021/12/25/0353c775de384b939cd994ac33b6c3f4m328kwji83.png', '5110', 'png', 723, 1, '2021-12-25 10:46:25', '2021-12-25 10:46:25'); -INSERT INTO `eb_system_attachment` VALUES (73, '703948f0db5a453f8be387323fe82f80wyw14ya38y.png', '', 'crmebimage/public/maintain/2021/12/25/33a35c7b85de4fec8ed148fc6f3e8e670itip8qtor.png', '4699', 'png', 723, 1, '2021-12-25 10:46:25', '2021-12-25 10:46:25'); -INSERT INTO `eb_system_attachment` VALUES (74, '2fae2d2af91440c1ad338b2b23983dfa671mdk4l3t.jpg', '', 'crmebimage/public/maintain/2021/12/25/74e6bf23d0284c22ac1ca7837a3927ea5mej4ww8aa.jpg', '63753', 'jpeg', 725, 1, '2021-12-25 10:49:33', '2021-12-25 10:49:33'); -INSERT INTO `eb_system_attachment` VALUES (75, '25be80de52794dc09582ec299866afeejvtyjuzef5.png', '', 'crmebimage/public/maintain/2021/12/25/f7d89b2f45d740e6b87cc0dc46356b21h0tn9ouid7.png', '5585', 'png', 726, 1, '2021-12-25 10:51:14', '2021-12-25 10:51:14'); -INSERT INTO `eb_system_attachment` VALUES (76, 'fcd20673fac14df59f4dbec7318775832i1bp92r6f.png', '', 'crmebimage/public/maintain/2021/12/25/7486f062431740098cb0923fec8d42f1pv9kxnbiag.png', '5267', 'png', 726, 1, '2021-12-25 10:51:14', '2021-12-25 10:51:14'); -INSERT INTO `eb_system_attachment` VALUES (77, '7ee3cccb2a55477ca65f89b63bfb10a1a7scec02cg.png', '', 'crmebimage/public/maintain/2021/12/25/4bedfd95c947443685603bf08bae6947aw468cpz1y.png', '6113', 'png', 726, 1, '2021-12-25 10:51:14', '2021-12-25 10:51:14'); -INSERT INTO `eb_system_attachment` VALUES (78, '469e1c1992ef4131bfc06b74a2d1d4a6eon5l14smv.png', '', 'crmebimage/public/maintain/2021/12/25/206799794c1b4602aa94340279bc36946x7jz72lzl.png', '6414', 'png', 726, 1, '2021-12-25 10:51:14', '2021-12-25 10:51:14'); -INSERT INTO `eb_system_attachment` VALUES (79, '09b558899fca4a6daf0697865f976ebcwomw4hiucq.png', '', 'crmebimage/public/maintain/2021/12/25/41622a74c8944f6cb7afac2e1d09da22wwjweacn72.png', '7182', 'png', 726, 1, '2021-12-25 10:51:14', '2021-12-25 10:51:14'); -INSERT INTO `eb_system_attachment` VALUES (80, '500ba94e851f4859bd94f3233087bd27bn6fshafhn.png', '', 'crmebimage/public/maintain/2021/12/25/62afae7a0cea4401b2286715b2a5f69dsegpwwtsx2.png', '7407', 'png', 726, 1, '2021-12-25 10:51:14', '2021-12-25 10:51:14'); -INSERT INTO `eb_system_attachment` VALUES (81, '5fb47c83d82844f9ac66fd9c8c8bdece4sf74p74vy.png', '', 'crmebimage/public/maintain/2021/12/25/e78b705b1b2644c7a346faee51fcdd08qgtywp55en.png', '5122', 'png', 726, 1, '2021-12-25 10:51:14', '2021-12-25 10:51:14'); -INSERT INTO `eb_system_attachment` VALUES (82, 'da156b61398941aaa85b3b123eb06ed0skzo02qy47.png', '', 'crmebimage/public/maintain/2021/12/25/4410717d904943c6833933be3631787a7rva238ji2.png', '7119', 'png', 726, 1, '2021-12-25 10:51:27', '2021-12-25 10:51:27'); -INSERT INTO `eb_system_attachment` VALUES (83, '27124cbf8035454a88869fac73d28b13vw8ro086g9.png', '', 'crmebimage/public/maintain/2021/12/25/7824e193be8b4b29a0d895b15ad429b1z5l6m2hkvv.png', '5639', 'png', 728, 1, '2021-12-25 10:52:39', '2021-12-25 10:52:39'); -INSERT INTO `eb_system_attachment` VALUES (84, '10b75c511b574a4d8028af9786911862bqf19hm7zm.png', '', 'crmebimage/public/maintain/2021/12/25/84ed45fcdaf04ae3a53c9bc65f304fcepm3ioshj7j.png', '5160', 'png', 728, 1, '2021-12-25 10:52:46', '2021-12-25 10:52:46'); -INSERT INTO `eb_system_attachment` VALUES (85, '2609d7d2b928408b920f599ffa6a2dd8wrsb2xwpg8.png', '', 'crmebimage/public/maintain/2021/12/25/33d6b8f635384c85abf8912771dd89c5gf0qu8zfk9.png', '6250', 'png', 728, 1, '2021-12-25 10:52:53', '2021-12-25 10:52:53'); -INSERT INTO `eb_system_attachment` VALUES (86, '8b9058611ce44cfaab2e430a6416d475zpeb8b02ja.png', '', 'crmebimage/public/maintain/2021/12/25/e8737e822d1c47a698b9ed16e4cd627aodkc2o145w.png', '5676', 'png', 728, 1, '2021-12-25 10:53:01', '2021-12-25 10:53:01'); -INSERT INTO `eb_system_attachment` VALUES (87, '41259a2154bc416ab1a4388b0d67f6673u4zb33li0.png', '', 'crmebimage/public/maintain/2021/12/25/aaaa1ea4a9f64baabc08b7a30205e720qazetub0ha.png', '6624', 'png', 728, 1, '2021-12-25 10:53:08', '2021-12-25 10:53:08'); -INSERT INTO `eb_system_attachment` VALUES (88, '942645ac55da46b280c5e26bddb195f8c43wgzoc2m.png', '', 'crmebimage/public/maintain/2021/12/25/354c461aab964049b3d276a8588977a8ugvejjqbox.png', '6109', 'png', 728, 1, '2021-12-25 10:53:22', '2021-12-25 10:53:22'); -INSERT INTO `eb_system_attachment` VALUES (89, '91f697edfbc1422dbcef2a08e195d930zqntlbixi7.png', '', 'crmebimage/public/maintain/2021/12/25/8bb005bbf2fe4a168ed4c938063a1a6bgnj6w42pyb.png', '5898', 'png', 728, 1, '2021-12-25 10:53:31', '2021-12-25 10:53:31'); -INSERT INTO `eb_system_attachment` VALUES (90, 'b61f278230cc439aa0d2e5975fe6abfdo2hzq7eyje.png', '', 'crmebimage/public/maintain/2021/12/25/010f3a33b48846a39c2c086b4a289fa1c0aply6wjn.png', '5673', 'png', 728, 1, '2021-12-25 10:53:46', '2021-12-25 10:53:46'); -INSERT INTO `eb_system_attachment` VALUES (91, 'e6f0a3c07ec04a4c86101a184e6baf53ihsryirylp.png', '', 'crmebimage/public/maintain/2021/12/25/9b50f61c6ff748f0b491b971fe9b9d105p0d1echuu.png', '5707', 'png', 728, 1, '2021-12-25 10:54:02', '2021-12-25 10:54:02'); -INSERT INTO `eb_system_attachment` VALUES (92, 'cb2ddac8bffd4416a52da77e0318c2edgcpttd17tp.png', '', 'crmebimage/public/maintain/2021/12/25/31a9c9c08ae84c33879f8709a98877cb0tr5hsoh0p.png', '5768', 'png', 728, 1, '2021-12-25 10:54:17', '2021-12-25 10:54:17'); -INSERT INTO `eb_system_attachment` VALUES (93, 'e280c28aab694bfaad656fd1c3af2f2cljnh8kf4ef.png', '', 'crmebimage/public/maintain/2021/12/25/d2fff77310724a9999c1e0e97eac0b3830n6cpnhxp.png', '6086', 'png', 729, 1, '2021-12-25 10:54:46', '2021-12-25 10:54:46'); -INSERT INTO `eb_system_attachment` VALUES (94, 'd43066089b8348c68a9e3ef4e5d7419cgy5lc3ve12.png', '', 'crmebimage/public/maintain/2021/12/25/907de1e2b8b048da9e75cfe48f27aaab42n9a7n2jr.png', '5927', 'png', 729, 1, '2021-12-25 10:55:59', '2021-12-25 10:55:59'); -INSERT INTO `eb_system_attachment` VALUES (95, '2fdb834b2e4b4e61a16d26947b95de9886cgcd7azf.png', '', 'crmebimage/public/maintain/2021/12/25/3dac9309ddfd46b08f67e4b1a2bf08d3bf2mp09gow.png', '7004', 'png', 729, 1, '2021-12-25 10:56:33', '2021-12-25 10:56:33'); -INSERT INTO `eb_system_attachment` VALUES (96, '053f666cee0f438aa8047d7d8a6e0c61u8fuc1uy6v.png', '', 'crmebimage/public/maintain/2021/12/25/723c114372764a8d8344ffaf1606eea19m9rxjx1vf.png', '6278', 'png', 729, 1, '2021-12-25 10:56:33', '2021-12-25 10:56:33'); -INSERT INTO `eb_system_attachment` VALUES (97, '761d3f3ceb0c4c8f81dbd864553d791b9fgooi0vg9.png', '', 'crmebimage/public/maintain/2021/12/25/bcc7fb293bfb471cbbebfadd8e6c150ey9n8o2vsnu.png', '6935', 'png', 729, 1, '2021-12-25 10:56:33', '2021-12-25 10:56:33'); -INSERT INTO `eb_system_attachment` VALUES (98, 'c90839d3b1ae4df9b566ca486f345770u9kpbni7lc.png', '', 'crmebimage/public/maintain/2021/12/25/85b457e6ed29491e98e1789a96a00353bs4cpvc7we.png', '5974', 'png', 729, 1, '2021-12-25 10:56:33', '2021-12-25 10:56:33'); -INSERT INTO `eb_system_attachment` VALUES (99, '052d6efaba464e6c8c8b58cd52d43282m5juuomfaa.png', '', 'crmebimage/public/maintain/2021/12/25/19242c389ab749d1b7dece74000b26204j7q3sirs1.png', '7679', 'png', 729, 1, '2021-12-25 10:56:33', '2021-12-25 10:56:33'); -INSERT INTO `eb_system_attachment` VALUES (100, 'b6e6c55077964456bd6bcf285b118ebc02aeb11tlj.png', '', 'crmebimage/public/maintain/2021/12/25/f65b4fa1948a4dabbfc60a02aa8ca942bmxlxykd9i.png', '7626', 'png', 729, 1, '2021-12-25 10:56:33', '2021-12-25 10:56:33'); -INSERT INTO `eb_system_attachment` VALUES (101, 'bff7ac7aee374cb4a73d8234b2b918900u60xlqzmg.png', '', 'crmebimage/public/maintain/2021/12/25/f71c687274cf42ed9757e5cf658cbfb9v1rgcok7j4.png', '7520', 'png', 729, 1, '2021-12-25 10:56:33', '2021-12-25 10:56:33'); -INSERT INTO `eb_system_attachment` VALUES (102, 'd3dd74172f2c4887a291213012be5fb3tnw10pcczw.png', '', 'crmebimage/public/maintain/2021/12/25/14e4ecbdbfcb48909b4a7f93b2ce6a3e360qlj0rtb.png', '7976', 'png', 729, 1, '2021-12-25 10:56:33', '2021-12-25 10:56:33'); -INSERT INTO `eb_system_attachment` VALUES (103, '7a78ce5c771c47a286d3a7a2c549da004n1xcx46il.png', '', 'crmebimage/public/maintain/2021/12/25/aaee8de98d1b4e62961cceb35f9ea627j69xdnj980.png', '21401', 'png', 730, 1, '2021-12-25 11:13:13', '2021-12-25 11:13:13'); -INSERT INTO `eb_system_attachment` VALUES (104, '72bcc4cf344e43dc97ad2d16e6c59166niu9ag5mv1.png', '', 'crmebimage/public/maintain/2021/12/25/40965a4dc1504b1fb360a942380996ee11bsimpqs3.png', '21746', 'png', 730, 1, '2021-12-25 11:13:13', '2021-12-25 11:13:13'); -INSERT INTO `eb_system_attachment` VALUES (105, '3a8298dc352546bba3cc795ea572e160xp4quc3cgx.png', '', 'crmebimage/public/maintain/2021/12/25/cf5a4a7e233c4fe2bb9a554f74439921jcfgsu0dgg.png', '22311', 'png', 730, 1, '2021-12-25 11:13:13', '2021-12-25 11:13:13'); -INSERT INTO `eb_system_attachment` VALUES (106, 'b457858423d54a52bcbf9d2ea7fa6c69wr7yapx27t.png', '', 'crmebimage/public/maintain/2021/12/25/961eeb398bae4e60a520d5abf04f02335vlh98hjuc.png', '22198', 'png', 730, 1, '2021-12-25 11:13:13', '2021-12-25 11:13:13'); -INSERT INTO `eb_system_attachment` VALUES (107, '16f7c6ee0cca4f139a03beb27f45916bldcmu1y7h4.png', '', 'crmebimage/public/maintain/2021/12/25/5f08b84f574045da85e27548c5728ea3iwwv9b54dw.png', '22355', 'png', 730, 1, '2021-12-25 11:13:13', '2021-12-25 11:13:13'); -INSERT INTO `eb_system_attachment` VALUES (108, '73b69941ffea402782ee8bfdb003b5d9lrmjslzmgp.png', '', 'crmebimage/public/maintain/2021/12/25/a2de0cb2c98e4c75be050949c4ffd602fvi2dw8tvl.png', '22365', 'png', 730, 1, '2021-12-25 11:13:13', '2021-12-25 11:13:13'); -INSERT INTO `eb_system_attachment` VALUES (109, '1374d9f92a14488d8e72f4c544c0db42g1x8tfjln0.png', '', 'crmebimage/public/maintain/2021/12/25/8cf2817ac6ca4deb8ee956661e4ffd16m2u1lto2nu.png', '22663', 'png', 730, 1, '2021-12-25 11:13:13', '2021-12-25 11:13:13'); -INSERT INTO `eb_system_attachment` VALUES (110, '6630dc4064cb46ebbf06c5365f06958ek0wzveiqf1.png', '', 'crmebimage/public/maintain/2021/12/25/6fcb5bd8f5dd4ba3a485e572de6b22b6bnt364bw4z.png', '23172', 'png', 730, 1, '2021-12-25 11:13:13', '2021-12-25 11:13:13'); -INSERT INTO `eb_system_attachment` VALUES (111, 'bfa996bb9cc64dff963bf58c8a806191gswi5v3h7j.png', '', 'crmebimage/public/maintain/2021/12/25/be891e57d9a74f8291d41a30b1e6f49che4zty98dx.png', '23270', 'png', 730, 1, '2021-12-25 11:13:13', '2021-12-25 11:13:13'); -INSERT INTO `eb_system_attachment` VALUES (112, 'c8168b4a81b6440fa4a08b7c6a5aa1c9970wdw79l1.png', '', 'crmebimage/public/maintain/2021/12/25/25077b4a4d654f9fa738b7433a118d4552177mpsc5.png', '22612', 'png', 730, 1, '2021-12-25 11:13:13', '2021-12-25 11:13:13'); -INSERT INTO `eb_system_attachment` VALUES (113, '0ef43e03b2224bfe94890d0acdbba6ca8ljov1r5oh.png', '', 'crmebimage/public/maintain/2021/12/25/8c9a5bfa049d4c56817318cd5ff405507t3jozdncn.png', '1883', 'png', 0, 1, '2021-12-25 11:30:10', '2021-12-25 11:30:10'); -INSERT INTO `eb_system_attachment` VALUES (114, '1e59f1f7425947f395be89719c594a49vpg391j3tr.png', '', 'crmebimage/public/maintain/2021/12/25/04fae7b9bc9a44e899ea8f6fbce1600aexehrjdj82.png', '2234', 'png', 0, 1, '2021-12-25 11:30:10', '2021-12-25 11:30:10'); -INSERT INTO `eb_system_attachment` VALUES (115, '5e8a99746811433eb99d0adae52ef45dqhlu75hy1t.png', '', 'crmebimage/public/maintain/2021/12/25/78ab644d84bc4e858adf6b4f83774125p0uz4p70sb.png', '2642', 'png', 0, 1, '2021-12-25 11:30:10', '2021-12-25 11:30:10'); -INSERT INTO `eb_system_attachment` VALUES (116, '08b738e369e74dbcbc5716a70dd923e2x8cdi2pz4o.png', '', 'crmebimage/public/maintain/2021/12/25/aeb852fe04e946fbaf8f166234d2984blhbejw91jj.png', '1368', 'png', 0, 1, '2021-12-25 11:30:10', '2021-12-25 11:30:10'); -INSERT INTO `eb_system_attachment` VALUES (117, '07efcf22c61e45f3aea40e5a12aaa9faa1nnlfz7wa.png', '', 'crmebimage/public/maintain/2021/12/25/cdce16eb7eba4346acb59c6d642e088f5cbhgz2yw9.png', '1988', 'png', 0, 1, '2021-12-25 11:30:10', '2021-12-25 11:30:10'); -INSERT INTO `eb_system_attachment` VALUES (118, '36a12d4a8beb4c49be4ad7c1c95924422d7xx1iit7.png', '', 'crmebimage/public/maintain/2021/12/25/7a0ce84c43fd470e8f960a6c463ffb98npn9grvkpb.png', '1759', 'png', 0, 1, '2021-12-25 11:30:11', '2021-12-25 11:30:11'); -INSERT INTO `eb_system_attachment` VALUES (119, '54362ba5c45d4774bda6113abf746b39nhpqbam7c1.png', '', 'crmebimage/public/maintain/2021/12/25/0517e880a70b4c539ff9163c90ab21f9hz0bea05p7.png', '1043', 'png', 0, 1, '2021-12-25 11:30:11', '2021-12-25 11:30:11'); -INSERT INTO `eb_system_attachment` VALUES (120, '828f91bef4824ff5b26147b7b5cdf3acboqbcq6dob.png', '', 'crmebimage/public/maintain/2021/12/25/3a21cc3f53444cd98078c5244a9472ac7r8mnpdj19.png', '1810', 'png', 0, 1, '2021-12-25 11:30:11', '2021-12-25 11:30:11'); -INSERT INTO `eb_system_attachment` VALUES (121, '48448d523bb44b6bae7eef5c5859ae1eb2washh679.png', '', 'crmebimage/public/maintain/2021/12/25/b4a1b5595add488db6a1a16c2dd45ec8lp8en2gask.png', '1833', 'png', 0, 1, '2021-12-25 11:30:11', '2021-12-25 11:30:11'); -INSERT INTO `eb_system_attachment` VALUES (122, 'a8bbc0e442934be5aa894f057e06e7c0plwa7sdyp6.png', '', 'crmebimage/public/maintain/2021/12/25/4336d25a226a4df1913369fd82ec8c53mre4nruc5s.png', '2680', 'png', 0, 1, '2021-12-25 11:30:11', '2021-12-25 11:30:11'); -INSERT INTO `eb_system_attachment` VALUES (123, 'a8763beb17bb4173a93b4a7bd989e1753ortwzjf5m.png', '', 'crmebimage/public/maintain/2021/12/25/7e1777f0b47b4a14952891aa4f1b8458hiyqi9zu5t.png', '1867', 'png', 0, 1, '2021-12-25 11:30:11', '2021-12-25 11:30:11'); -INSERT INTO `eb_system_attachment` VALUES (124, 'd91b92c45c774189a3261e6909708fe5bjqdreuh8i.png', '', 'crmebimage/public/maintain/2021/12/25/2a8554bcbf1b4396afef370f9255df19sacbmpcodn.png', '2020', 'png', 0, 1, '2021-12-25 11:30:11', '2021-12-25 11:30:11'); -INSERT INTO `eb_system_attachment` VALUES (125, '93fab393506c42aebc5ee3e173ef5113udqa262mxb.png', '', 'crmebimage/public/maintain/2021/12/25/46d9b5a7e9e24fceb31c80eb6f31e2c7u4birl7vr1.png', '2429', 'png', 0, 1, '2021-12-25 11:30:11', '2021-12-25 11:30:11'); -INSERT INTO `eb_system_attachment` VALUES (126, 'fa4a3bb703b74f24bff8beb5043f5673ubh7c2p722.png', '', 'crmebimage/public/maintain/2021/12/25/3308f2d779874079b0e02ae206cf141bwb23ii2z52.png', '1781', 'png', 0, 1, '2021-12-25 11:30:11', '2021-12-25 11:30:11'); -INSERT INTO `eb_system_attachment` VALUES (127, '154cf15703fc46088c98bde59d1e2105ncndtqe9x6.png', '', 'crmebimage/public/maintain/2021/12/25/a498ea7fd9f74c4f812518c40c93fa79gtx5zeq28l.png', '2463', 'png', 0, 1, '2021-12-25 11:30:11', '2021-12-25 11:30:11'); -INSERT INTO `eb_system_attachment` VALUES (128, '769d80d3ee3f4e2caa5fd89ba72f8a94pczcozqyv7.png', '', 'crmebimage/public/maintain/2021/12/25/3316070ce6bb49aab05776cd21d91b21pra6fxiblz.png', '1582', 'png', 0, 1, '2021-12-25 11:30:11', '2021-12-25 11:30:11'); -INSERT INTO `eb_system_attachment` VALUES (129, 'd8f6833c996e463b8b9e45cce9806b17mu80wxr2qd.png', '', 'crmebimage/public/maintain/2021/12/25/b73c648fb7fd45cf8782e4ca0bc28a42s2a8dpad2x.png', '1784', 'png', 0, 1, '2021-12-25 11:30:11', '2021-12-25 11:30:11'); -INSERT INTO `eb_system_attachment` VALUES (130, '022cd7488e4943c9bc3486972333808ei8kfpmnprf.jpg', '', 'crmebimage/public/maintain/2021/12/25/1618a47e11e745ff90c70f752c204e17qi6vjngrcd.jpg', '13292', 'jpeg', 721, 1, '2021-12-25 11:31:24', '2021-12-25 11:31:24'); -INSERT INTO `eb_system_attachment` VALUES (131, 'bad2c470df6541c8b3ccca32f3fb016d3as9aofdsv.png', '', 'crmebimage/public/maintain/2021/12/25/5267cf5c9aad49fa8b2699fe9c5344bbsw99nmba85.png', '268610', 'png', 732, 1, '2021-12-25 11:32:34', '2021-12-25 11:32:34'); -INSERT INTO `eb_system_attachment` VALUES (132, '4ad73d4da5d941a59e3b02f9e817753d3adj4by4ij.png', '', 'crmebimage/public/maintain/2021/12/25/9efdb0a56b6643b8b4a42f7586b5a731bv3ouokg2s.png', '364279', 'png', 732, 1, '2021-12-25 11:32:35', '2021-12-25 11:32:35'); -INSERT INTO `eb_system_attachment` VALUES (133, '62616ba81c0f497aa428606a7b7975670pa8jtg0fy.jpg', '', 'crmebimage/public/maintain/2021/12/25/9dcafbf40f4a43909ef991338583e633qh2zl6rdwi.jpg', '43764', 'jpeg', 721, 1, '2021-12-25 11:36:37', '2021-12-25 11:36:37'); -INSERT INTO `eb_system_attachment` VALUES (134, 'a1776e227d664802988567151f48099dxcxp60f0as.jpg', '', 'crmebimage/public/maintain/2021/12/25/488a6dd9c9954b5b995d96908ca5fdb9qw0hda3qr8.jpg', '105365', 'jpeg', 721, 1, '2021-12-25 11:36:38', '2021-12-25 11:36:38'); -INSERT INTO `eb_system_attachment` VALUES (135, 'fc52645e75ee4891b999930220759260fy3tpdists.jpg', '', 'crmebimage/public/maintain/2021/12/25/bafcd155124643c49fa9cc750d0190fa5iru6zsc8m.jpg', '46365', 'jpeg', 732, 1, '2021-12-25 11:38:40', '2021-12-25 11:38:40'); -INSERT INTO `eb_system_attachment` VALUES (136, '279b12238a284b799b3b9cf04dce8300li0hm1ufvb.jpg', '', 'crmebimage/public/maintain/2021/12/25/5f08bcbb6d1a47a0baa96abb9a3d32bbpyujua6ecm.jpg', '121594', 'jpeg', 721, 1, '2021-12-25 11:42:49', '2021-12-25 11:42:49'); -INSERT INTO `eb_system_attachment` VALUES (137, '0ec1c8ee47a54a34848cff35d2b822e667jgcnk9wl.gif', '', 'crmebimage/public/maintain/2021/12/25/d9dffd9eccbc40e0bc01553846c391b3vj8fuux52d.gif', '58054', 'gif', 719, 1, '2021-12-25 11:44:41', '2021-12-25 11:44:41'); -INSERT INTO `eb_system_attachment` VALUES (138, '38d18454d2644385bec4d17bc2d47fcfa84a36ea6m.png', '', 'crmebimage/public/maintain/2021/12/25/8cf6cd4fd29c4a59a094ba028c8f3f4czyd21fctzc.png', '24056', 'png', 719, 1, '2021-12-25 11:45:11', '2021-12-25 11:45:11'); -INSERT INTO `eb_system_attachment` VALUES (139, 'aa6e46fd9fbd424e8cb636a34db50176nj0e4r0f6o.png', '', 'crmebimage/public/maintain/2021/12/25/7de81090b87a4325a603e056a660c620q50t3etnee.png', '2081', 'png', 719, 1, '2021-12-25 11:45:42', '2021-12-25 11:45:42'); -INSERT INTO `eb_system_attachment` VALUES (140, '5704ed07f0f14b04a48d67b22d1bf15cphquh484q8.png', '', 'crmebimage/public/maintain/2021/12/25/ae020f17148b4cc19bcab221c0836dd1iy0vrck2jm.png', '67820', 'png', 732, 1, '2021-12-25 11:46:35', '2021-12-25 11:46:35'); -INSERT INTO `eb_system_attachment` VALUES (141, 'ebb7dc10cd2c420ea4a844a3e5a8dcaaxiffsovm73.png', '', 'crmebimage/public/maintain/2021/12/25/e07dda98525d4226818de310cb3c21ae6hg5f2sv5m.png', '84701', 'png', 732, 1, '2021-12-25 11:46:43', '2021-12-25 11:46:43'); -INSERT INTO `eb_system_attachment` VALUES (142, 'e5b530d4a2e04f1fad1b9f78c654850auxf8xn6ait.png', '', 'crmebimage/public/maintain/2021/12/25/ec49b431bee545e09abc3dc294d1e54669dtn9bvuy.png', '138991', 'png', 732, 1, '2021-12-25 11:46:43', '2021-12-25 11:46:43'); -INSERT INTO `eb_system_attachment` VALUES (143, 'a231a2f3798247b091cb84e749c0e467y0fxu8om1b.png', '', 'crmebimage/public/maintain/2021/12/25/9bd5d3800bc34ace8e980251dd40bbf2ma64ym9653.png', '7899', 'png', 719, 1, '2021-12-25 11:48:45', '2021-12-25 11:48:45'); -INSERT INTO `eb_system_attachment` VALUES (144, '微信截图_20211225114911.png', '', 'crmebimage/public/store/2021/12/25/476f2b8a50644f5f80124f831ac14aecct8ewiyvwf.png', '777078', 'png', 721, 1, '2021-12-25 11:49:49', '2021-12-25 11:49:49'); -INSERT INTO `eb_system_attachment` VALUES (145, '微信截图_20211225115042.png', '', 'crmebimage/public/store/2021/12/25/f22830611d324e8fb10129e969f1ec661lcpu7346h.png', '1091423', 'png', 721, 1, '2021-12-25 11:51:09', '2021-12-25 11:51:09'); -INSERT INTO `eb_system_attachment` VALUES (146, '9b7a3ba4ae5b436fb3ae61a6550dc63dsgvday64fo.png', '', 'crmebimage/public/maintain/2021/12/25/eb26223281aa454389c735726790a415abrhvrtq4y.png', '22037', 'png', 732, 1, '2021-12-25 11:52:09', '2021-12-25 11:52:09'); -INSERT INTO `eb_system_attachment` VALUES (147, 'a3ea80be646647c49aff41d50f22d39445mdxlejxn.png', '', 'crmebimage/public/maintain/2021/12/25/3c31dd504b0e440f9f3dafd7b4fb660cu1i58m9n65.png', '25310', 'png', 732, 1, '2021-12-25 11:52:09', '2021-12-25 11:52:09'); -INSERT INTO `eb_system_attachment` VALUES (148, '微信截图_20211225115222.png', '', 'crmebimage/public/store/2021/12/25/8b665c20edef4d61a508de9395eb40c4ln34d0f3i5.png', '751271', 'png', 721, 1, '2021-12-25 11:53:04', '2021-12-25 11:53:04'); -INSERT INTO `eb_system_attachment` VALUES (149, '5f1a5aeab5c4430a8c992be00ca5435a9y1as92yny.png', '', 'crmebimage/public/maintain/2021/12/25/367026e6e99a4bd490b6a424e921b3d4ymiteod2gx.png', '3808', 'png', 733, 1, '2021-12-25 11:53:12', '2021-12-25 11:53:12'); -INSERT INTO `eb_system_attachment` VALUES (150, '1588573cc18841a997d32d8eb9a5bb4fzkts2x9z99.png', '', 'crmebimage/public/maintain/2021/12/25/92f685f8a6044ec2a26a5901514fddb0qt5ygurp30.png', '2810', 'png', 733, 1, '2021-12-25 11:53:13', '2021-12-25 11:53:13'); -INSERT INTO `eb_system_attachment` VALUES (151, '68a2ffdb12f14daab2d0aa726ae78ca6tmf8hddyrr.png', '', 'crmebimage/public/maintain/2021/12/25/d9253c01ace24140839435a81e045f1dko3od05i87.png', '4470', 'png', 733, 1, '2021-12-25 11:53:13', '2021-12-25 11:53:13'); -INSERT INTO `eb_system_attachment` VALUES (152, '8a85de49532341059364a8a14832e90db5p3vkc89q.png', '', 'crmebimage/public/maintain/2021/12/25/6927a786cace49d394334f2b6f2924d895tbhihuwr.png', '6489', 'png', 733, 1, '2021-12-25 11:53:13', '2021-12-25 11:53:13'); -INSERT INTO `eb_system_attachment` VALUES (153, 'ad5a573ac9b74fe29dcc04e8fb20d478zrtav8nodp.png', '', 'crmebimage/public/maintain/2021/12/25/f9ec9f03b8694a308b62f6158e5ccadb09fnoz19kc.png', '5290', 'png', 733, 1, '2021-12-25 11:53:13', '2021-12-25 11:53:13'); -INSERT INTO `eb_system_attachment` VALUES (154, 'b77034e6621c4a978a174825c473efc9juvvf9qlhw.png', '', 'crmebimage/public/maintain/2021/12/25/e670a50e6c374f43abe6b61260ce0c33v1yf1aafwr.png', '4628', 'png', 733, 1, '2021-12-25 11:53:13', '2021-12-25 11:53:13'); -INSERT INTO `eb_system_attachment` VALUES (155, 'd01cbb49ab2c4ab981e775b266e8296aoh14o5onz3.png', '', 'crmebimage/public/maintain/2021/12/25/67fdef82a1fe4262bfb20f593860c948kw3oz1i8oz.png', '5725', 'png', 733, 1, '2021-12-25 11:53:13', '2021-12-25 11:53:13'); -INSERT INTO `eb_system_attachment` VALUES (156, 'a36c669e923342f5abe888f31f8fe690urbbrhcdzs.png', '', 'crmebimage/public/maintain/2021/12/25/c9b53340cfdc488f9d52bf121b715d45v9h0uswomi.png', '7052', 'png', 733, 1, '2021-12-25 11:53:13', '2021-12-25 11:53:13'); -INSERT INTO `eb_system_attachment` VALUES (157, '18cab4ad83be47ea80adca47e882a687ofv4acbuot.png', '', 'crmebimage/public/maintain/2021/12/25/5409e5e504444752bb5c1076036ab7b44xcyhrtplk.png', '10027', 'png', 733, 1, '2021-12-25 11:53:13', '2021-12-25 11:53:13'); -INSERT INTO `eb_system_attachment` VALUES (158, '29d5534cd40b42748622679f2116c94euy5hwx1k43.png', '', 'crmebimage/public/maintain/2021/12/25/bd0d22b653b247fa840542c7b7b79bdflj966ybw1e.png', '10078', 'png', 733, 1, '2021-12-25 11:53:14', '2021-12-25 11:53:14'); -INSERT INTO `eb_system_attachment` VALUES (159, '045963abafd74b1cb10f71d67315b6a4xqww96eazc.png', '', 'crmebimage/public/maintain/2021/12/25/a1ec5b32c97143379648f46166547f092y57yxrs9l.png', '10162', 'png', 733, 1, '2021-12-25 11:53:14', '2021-12-25 11:53:14'); -INSERT INTO `eb_system_attachment` VALUES (160, 'fa882113aed2499e841a36e8ac906183e5qw66kus1.png', '', 'crmebimage/public/maintain/2021/12/25/28d8c56d248948ddab759d1eb708ab1c2zquoclgbq.png', '9923', 'png', 733, 1, '2021-12-25 11:53:14', '2021-12-25 11:53:14'); -INSERT INTO `eb_system_attachment` VALUES (161, '41ca774f13634398baa5a5e1acce48e8j6ji3z1uxm.png', '', 'crmebimage/public/maintain/2021/12/25/8492febd4a4f4fbca9278e177ad85976518hamump8.png', '10570', 'png', 733, 1, '2021-12-25 11:53:14', '2021-12-25 11:53:14'); -INSERT INTO `eb_system_attachment` VALUES (162, '493fd620c3de4e52a499a9a7474e1df3pnx5jv35qr.png', '', 'crmebimage/public/maintain/2021/12/25/8e03c0c2e4044c05a2c20e858945a2743nhibwclel.png', '11243', 'png', 733, 1, '2021-12-25 11:53:14', '2021-12-25 11:53:14'); -INSERT INTO `eb_system_attachment` VALUES (163, 'a42acc2b933249899dabd455e2664928a8ajny198c.png', '', 'crmebimage/public/maintain/2021/12/25/e46b09e6dd2944328426b32b7dceff92bhe08w4td0.png', '10803', 'png', 733, 1, '2021-12-25 11:53:14', '2021-12-25 11:53:14'); -INSERT INTO `eb_system_attachment` VALUES (164, 'b9e02099219848af834048bfc6449b5dii1y950tme.png', '', 'crmebimage/public/maintain/2021/12/25/7ed93718dca04f9784517909f6bc4e2f8ee1idkw5m.png', '10297', 'png', 733, 1, '2021-12-25 11:53:14', '2021-12-25 11:53:14'); -INSERT INTO `eb_system_attachment` VALUES (165, 'f589f28c2ef04da1a65e145d4ab510979l4la8e7b9.png', '', 'crmebimage/public/maintain/2021/12/25/3eca7ab31b22479e80338e0a34cfaa3e5ikbs03gxz.png', '10733', 'png', 733, 1, '2021-12-25 11:53:14', '2021-12-25 11:53:14'); -INSERT INTO `eb_system_attachment` VALUES (166, '798e3850713a453d85b7d8beb7d168b2m0q4jlgyfh.png', '', 'crmebimage/public/maintain/2021/12/25/cc016fa7d56d498d8cd767e6d0e0c5e8l34nugsvmi.png', '12164', 'png', 733, 1, '2021-12-25 11:53:14', '2021-12-25 11:53:14'); -INSERT INTO `eb_system_attachment` VALUES (167, 'e05323e9392341e9950fe7b05ae061b0kztoo2ufw3.jpg', '', 'crmebimage/public/maintain/2021/12/25/5b40f7bd71f64931b30c38fa97631e7840rlio3vo2.jpg', '75752', 'jpeg', 733, 1, '2021-12-25 11:53:15', '2021-12-25 11:53:15'); -INSERT INTO `eb_system_attachment` VALUES (168, '1c36153795f74634ab8f0ca2080ddc3d7sfsaoehbf.png', '', 'crmebimage/public/maintain/2021/12/25/05896e9a492041e7b665596046b8b4fa8fxkw2x1k9.png', '5101', 'png', 734, 1, '2021-12-25 11:53:56', '2021-12-25 11:53:56'); -INSERT INTO `eb_system_attachment` VALUES (169, '54626ba2bafc4003a004bf0ba9d6c0b3euhxv4w4x1.png', '', 'crmebimage/public/maintain/2021/12/25/e97b753a3cf041169bae29045ff23d6a5g1vbrdgld.png', '4960', 'png', 734, 1, '2021-12-25 11:53:56', '2021-12-25 11:53:56'); -INSERT INTO `eb_system_attachment` VALUES (170, 'c8ab78c6451844d292745d0cb6797a1coyhu4t1mew.png', '', 'crmebimage/public/maintain/2021/12/25/24fb34ad03244e1aa0899672f6450605x4g288iyus.png', '4671', 'png', 734, 1, '2021-12-25 11:53:57', '2021-12-25 11:53:57'); -INSERT INTO `eb_system_attachment` VALUES (171, 'e288469d8b6743cc94008b53f4d05f1acsev2dphb9.png', '', 'crmebimage/public/maintain/2021/12/25/83dace527287474c890d2cfbc43119f0bneqqh8l21.png', '5171', 'png', 734, 1, '2021-12-25 11:53:57', '2021-12-25 11:53:57'); -INSERT INTO `eb_system_attachment` VALUES (172, 'f2dc7079f4794fd39eaefa9479cba0f65bcwfgdqp3.png', '', 'crmebimage/public/maintain/2021/12/25/892a81babb06410389df6ca54da57390wfl75dlpx9.png', '7944', 'png', 734, 1, '2021-12-25 11:53:57', '2021-12-25 11:53:57'); -INSERT INTO `eb_system_attachment` VALUES (173, '32dea23e96f7485394f219ab2f1192d7x74cuno8i9.png', '', 'crmebimage/public/maintain/2021/12/25/57a8dcf4457449dfb972b5beb015c053wxz70rjrsr.png', '7587', 'png', 734, 1, '2021-12-25 11:53:57', '2021-12-25 11:53:57'); -INSERT INTO `eb_system_attachment` VALUES (174, 'a06beedf19d349da81dceca0b5074a7br5c8k7uwgo.png', '', 'crmebimage/public/maintain/2021/12/25/5407cb9947bc4b5fbca0a51653bee42c1m8uj2y4zr.png', '7306', 'png', 734, 1, '2021-12-25 11:53:57', '2021-12-25 11:53:57'); -INSERT INTO `eb_system_attachment` VALUES (175, 'd6fa010ef0e44ebf9782a54570619139769cq7g2dj.png', '', 'crmebimage/public/maintain/2021/12/25/6513e472eafe457c8613d0bb119d0c101elrmgn5tk.png', '7771', 'png', 734, 1, '2021-12-25 11:53:57', '2021-12-25 11:53:57'); -INSERT INTO `eb_system_attachment` VALUES (176, '47d8909ff61c449a98aa31fcb3be27346l0tp4c00v.png', '', 'crmebimage/public/maintain/2021/12/25/80a11304bac14a44aa95b841e0f104cdg9e6zqrnxq.png', '9490', 'png', 734, 1, '2021-12-25 11:53:57', '2021-12-25 11:53:57'); -INSERT INTO `eb_system_attachment` VALUES (177, '49658451b303433ea31895778b3ac28bm9jmpidtk6.png', '', 'crmebimage/public/maintain/2021/12/25/c818e9b4038642ea9702712af7d2c7c280tw4wj8yo.png', '8947', 'png', 734, 1, '2021-12-25 11:53:57', '2021-12-25 11:53:57'); -INSERT INTO `eb_system_attachment` VALUES (178, 'b7bb0f2dcab947558e9bb5a96c2e681co10yas7rim.png', '', 'crmebimage/public/maintain/2021/12/25/1ec20d53b5fe4cea9b6b83dd90026d15qvui1h1cpp.png', '9914', 'png', 734, 1, '2021-12-25 11:53:57', '2021-12-25 11:53:57'); -INSERT INTO `eb_system_attachment` VALUES (179, 'e8ef92e043ce48d18a1f53b001f77f32r6eohmfsxe.png', '', 'crmebimage/public/maintain/2021/12/25/64f4f919b9f848aabfbcf56ed4c9dc5b0cvem1g2f8.png', '9928', 'png', 734, 1, '2021-12-25 11:53:57', '2021-12-25 11:53:57'); -INSERT INTO `eb_system_attachment` VALUES (180, '1729154aea614fd28545bb033a14197axmohol4756.png', '', 'crmebimage/public/maintain/2021/12/25/f9e0a4939cb3484b9babfe72dc70cd7cqqexhsbdpu.png', '11013', 'png', 734, 1, '2021-12-25 11:53:57', '2021-12-25 11:53:57'); -INSERT INTO `eb_system_attachment` VALUES (181, 'e9cce38c87214648a5a3c53e2b0f535d9luu9k74ea.png', '', 'crmebimage/public/maintain/2021/12/25/e9b5981f0e82410da5dc83992b68289ekxngfwyuz0.png', '11758', 'png', 734, 1, '2021-12-25 11:53:57', '2021-12-25 11:53:57'); -INSERT INTO `eb_system_attachment` VALUES (182, '5ae26a89e27e42ffb2f32bf21ec41cf39ohbshdcrn.png', '', 'crmebimage/public/maintain/2021/12/25/54d7a09f1dee463fa12ec01c02294b31z66prnux9w.png', '12290', 'png', 734, 1, '2021-12-25 11:53:58', '2021-12-25 11:53:58'); -INSERT INTO `eb_system_attachment` VALUES (183, '712724d9662a4269abcce9e60a8ee5e6a1wo76pule.png', '', 'crmebimage/public/maintain/2021/12/25/641eaebe810141229997b6a44670aa481xly87j88i.png', '12371', 'png', 734, 1, '2021-12-25 11:53:58', '2021-12-25 11:53:58'); -INSERT INTO `eb_system_attachment` VALUES (184, 'bd6ccc4028eb4e7ba9edb8b32aef47eaflz1oojwyn.png', '', 'crmebimage/public/maintain/2021/12/25/51c3c432ff5147fcb3b749af0404d7a783yc148lho.png', '12514', 'png', 734, 1, '2021-12-25 11:53:58', '2021-12-25 11:53:58'); -INSERT INTO `eb_system_attachment` VALUES (185, 'e3828f65b2f74417abe87340a72de6c3gfod2knkc2.png', '', 'crmebimage/public/maintain/2021/12/25/6080162a7ef54ef2b9331c39f8f5d9d8wxskm48zy9.png', '13334', 'png', 734, 1, '2021-12-25 11:53:58', '2021-12-25 11:53:58'); -INSERT INTO `eb_system_attachment` VALUES (186, 'f4a33855413a47638d24a365afcc0670muvbd04p4c.jpg', '', 'crmebimage/public/maintain/2021/12/25/bd7232963bec41da8f483289dde3fdf2whx5dk3owb.jpg', '95777', 'jpeg', 734, 1, '2021-12-25 11:53:59', '2021-12-25 11:53:59'); -INSERT INTO `eb_system_attachment` VALUES (187, 'ccc58d3de5f34ede96cffede59557fc0ewrr7xtr9j.jpg', '', 'crmebimage/public/store/2021/12/25/24119aa4d48e4c7a95b21ece82a41715uns67350bd.jpg', '19611', 'jpeg', 721, 1, '2021-12-25 11:54:10', '2021-12-25 11:54:10'); -INSERT INTO `eb_system_attachment` VALUES (188, '微信截图_20211225115517.png', '', 'crmebimage/public/store/2021/12/25/7b4c8af47e414f62a5d7b26d95504cbafw13ela5i7.png', '735362', 'png', 721, 1, '2021-12-25 11:55:45', '2021-12-25 11:55:45'); -INSERT INTO `eb_system_attachment` VALUES (189, '8be5893c68a0426d8b9d950b18a0fa086nj33d96dj.png', '', 'crmebimage/public/maintain/2021/12/25/58560559042841a498dc9a3ea975f3d2baabqbl1tp.png', '182734', 'png', 0, 1, '2021-12-25 11:57:22', '2021-12-25 11:57:22'); -INSERT INTO `eb_system_attachment` VALUES (190, '904833ab88f245068bd8e0625fe8fbd14ofwkgtw7w.jpg', '', 'crmebimage/public/maintain/2021/12/25/b9f86161d09a44d29f7e5083d402245321764lzsus.jpg', '108219', 'jpeg', 0, 1, '2021-12-25 11:57:37', '2021-12-25 11:57:37'); -INSERT INTO `eb_system_attachment` VALUES (191, '2702ff9ddd4e40ee97c957f07e9417b10hrby3rl2i.jpg', '', 'crmebimage/public/maintain/2021/12/25/9e97ddf78f804d50b985bdcf666478ebj76hbf3gpp.jpg', '117394', 'jpeg', 0, 1, '2021-12-25 11:57:38', '2021-12-25 11:57:38'); -INSERT INTO `eb_system_attachment` VALUES (192, 'eab9cdc74c4e4673acab70b801ee4612wnxgu98i0l.jpg', '', 'crmebimage/public/maintain/2021/12/25/e91ccd7e37294221bfdb7b43a42d8ed5hghg7nw0qb.jpg', '118260', 'jpeg', 0, 1, '2021-12-25 11:57:38', '2021-12-25 11:57:38'); -INSERT INTO `eb_system_attachment` VALUES (193, '0638dad477de4f979f1d6f58aa960c41bvp53cy53v.jpg', '', 'crmebimage/public/maintain/2021/12/25/3598e8d0aa3f4bf1b61140daa0e36300k0te4s6z3j.jpg', '149827', 'jpeg', 0, 1, '2021-12-25 11:57:38', '2021-12-25 11:57:38'); -INSERT INTO `eb_system_attachment` VALUES (194, '微信截图_20211225115759.png', '', 'crmebimage/public/store/2021/12/25/0f419f2a65844ae5a00c20e22dc9b92env32uvr4dy.png', '365673', 'png', 721, 1, '2021-12-25 11:58:35', '2021-12-25 11:58:35'); -INSERT INTO `eb_system_attachment` VALUES (195, '8fef924851ff40ac96857ce70b1406a64fejl3g98z.png', '', 'crmebimage/public/maintain/2021/12/25/6c266c40bd5e4ff8bb574fcecb2156feklz8uzymox.png', '342021', 'png', 732, 1, '2021-12-25 11:59:33', '2021-12-25 11:59:33'); -INSERT INTO `eb_system_attachment` VALUES (196, 'be06cf0db56346efa94799d943b879182kqcaeh8sm.png', '', 'crmebimage/public/maintain/2021/12/25/c17d24b632b544828bd4c70744bc2931tmnu4ffkoj.png', '363824', 'png', 732, 1, '2021-12-25 11:59:34', '2021-12-25 11:59:34'); -INSERT INTO `eb_system_attachment` VALUES (197, '241e9f8065354fd295d3c626d9ccf492984lsgwqwh.png', '', 'crmebimage/public/maintain/2021/12/25/acbb97c8b30e4c63ae92a81f8679ab06uib5yau47a.png', '427586', 'png', 732, 1, '2021-12-25 11:59:35', '2021-12-25 11:59:35'); -INSERT INTO `eb_system_attachment` VALUES (198, '微信截图_20211225120008.png', '', 'crmebimage/public/store/2021/12/25/bf8bc87d525844b68ca17ca60c567233hkh2h9c2un.png', '677482', 'png', 721, 1, '2021-12-25 12:00:53', '2021-12-25 12:00:53'); -INSERT INTO `eb_system_attachment` VALUES (199, '0f11d9e5c3d14c0e941f677ea314c0d03kcpizxfvd.png', '', 'crmebimage/public/maintain/2021/12/25/8e30a0b2fc0f4c19a14b5dea9d3f3e1ancrlbopakw.png', '9768', 'png', 735, 1, '2021-12-25 12:01:17', '2021-12-25 12:01:17'); -INSERT INTO `eb_system_attachment` VALUES (200, 'f4b49cb361ac4a35ae92ad7ba4a2ec40sjx9dv25kg.png', '', 'crmebimage/public/maintain/2021/12/25/1aa14360c7264153acc50ff5c5af7451fejoxdb2bt.png', '9753', 'png', 735, 1, '2021-12-25 12:01:17', '2021-12-25 12:01:17'); -INSERT INTO `eb_system_attachment` VALUES (201, '1b1e7be581784b3da8fda546212138b6ylv2mgsgpz.png', '', 'crmebimage/public/maintain/2021/12/25/f16789d76eab430e90de8ddbbf26b8362xifqs055m.png', '10110', 'png', 735, 1, '2021-12-25 12:01:17', '2021-12-25 12:01:17'); -INSERT INTO `eb_system_attachment` VALUES (202, 'fd052649aa9f4a458d30c8ced95d6073i40zuxp47o.png', '', 'crmebimage/public/maintain/2021/12/25/84902bff7e5d4b09881b91b4a3d23b1bi0wwnljt9w.png', '9871', 'png', 735, 1, '2021-12-25 12:01:17', '2021-12-25 12:01:17'); -INSERT INTO `eb_system_attachment` VALUES (203, '1e0d3d636397479691a4b04e419b4d0bod1lw0hb5x.png', '', 'crmebimage/public/maintain/2021/12/25/956f4534d22343a88e860a1779c69afcboynkm8plz.png', '9418', 'png', 735, 1, '2021-12-25 12:01:18', '2021-12-25 12:01:18'); -INSERT INTO `eb_system_attachment` VALUES (204, '232d542d5d6a484fb67e9602d1b283c3ahvy4614ww.png', '', 'crmebimage/public/maintain/2021/12/25/d1c992690cf040d7bf87d7767f12ec9cks6in93p21.png', '9380', 'png', 735, 1, '2021-12-25 12:01:18', '2021-12-25 12:01:18'); -INSERT INTO `eb_system_attachment` VALUES (205, '30384d986ef847dcbf523b73e92f54d89ljwm3y9bz.png', '', 'crmebimage/public/maintain/2021/12/25/bf4e33ad4e994c3fbb48aba8e81b3be3zme09wjvqa.png', '9871', 'png', 735, 1, '2021-12-25 12:01:18', '2021-12-25 12:01:18'); -INSERT INTO `eb_system_attachment` VALUES (206, 'b5bbbb90562f426cbc4b16d624c4ca1dpunty6guca.png', '', 'crmebimage/public/maintain/2021/12/25/7965c1d75e9d4a689f09ecb207468468icfybjk9g9.png', '8849', 'png', 735, 1, '2021-12-25 12:01:18', '2021-12-25 12:01:18'); -INSERT INTO `eb_system_attachment` VALUES (207, 'b77dfb32d0c846a491ba85391bd949cdzbw20vwqz0.png', '', 'crmebimage/public/maintain/2021/12/25/e8c8ea8102524b8a9277d3ee623ac29dmvg2gsudr6.png', '9863', 'png', 735, 1, '2021-12-25 12:01:18', '2021-12-25 12:01:18'); -INSERT INTO `eb_system_attachment` VALUES (208, '3803485236224355a6630c519b3619788dssfxzwfo.png', '', 'crmebimage/public/maintain/2021/12/25/e759d63f04b94689aaa6838c424e419cgcsk0dsagu.png', '9956', 'png', 735, 1, '2021-12-25 12:01:18', '2021-12-25 12:01:18'); -INSERT INTO `eb_system_attachment` VALUES (209, '1319e0793e634a8aa9eb75662f4a156fwsh8jo81l0.png', '', 'crmebimage/public/maintain/2021/12/25/e0203b58c997468f928031df28b6a27acns5riul2t.png', '10110', 'png', 735, 1, '2021-12-25 12:01:18', '2021-12-25 12:01:18'); -INSERT INTO `eb_system_attachment` VALUES (210, 'e90db92b65154437bbef5715848482855x70rhndpv.png', '', 'crmebimage/public/maintain/2021/12/25/8bf3c1a3c2284ef5b29ab6e320d2baf2lzw5pxuw1j.png', '10605', 'png', 735, 1, '2021-12-25 12:01:18', '2021-12-25 12:01:18'); -INSERT INTO `eb_system_attachment` VALUES (211, '6fe40cb4f54e426c8acc52471bfa9ce1ez8b17ypyv.jpg', '', 'crmebimage/public/maintain/2021/12/25/4bdd334e3b084908ae56b7ce1e576204a43i68txom.jpg', '19973', 'jpeg', 732, 1, '2021-12-25 12:01:18', '2021-12-25 12:01:57'); -INSERT INTO `eb_system_attachment` VALUES (212, '41c125bd9bb446b9a19cd393585802e6y2g801z05j.jpg', '', 'crmebimage/public/maintain/2021/12/25/d4c7282740fb4e71bd2d7e80fad985d8o1wfu26pyd.jpg', '20103', 'jpeg', 732, 1, '2021-12-25 12:01:18', '2021-12-25 12:01:57'); -INSERT INTO `eb_system_attachment` VALUES (213, 'a55abb14526b408fb79ed8d78941b849fwvx34l42g.jpg', '', 'crmebimage/public/maintain/2021/12/25/60e1d297eb5a49bca13b92e2b0b411c2siripyrcu0.jpg', '26376', 'jpeg', 732, 1, '2021-12-25 12:01:19', '2021-12-25 12:01:57'); -INSERT INTO `eb_system_attachment` VALUES (215, '1b204215126846e6a29408af119c10d867550cp1qx.jpg', '', 'crmebimage/public/maintain/2021/12/25/9d95f61a5db84591972fbc90f31c1fb21g5krqax8i.jpg', '70122', 'jpeg', 732, 1, '2021-12-25 12:01:20', '2021-12-25 12:01:57'); -INSERT INTO `eb_system_attachment` VALUES (216, '微信截图_20211225120159.png', '', 'crmebimage/public/store/2021/12/25/ef98f38ef1cd4083a91fb62b1dd8362cmran1psnmc.png', '778394', 'png', 721, 1, '2021-12-25 12:02:40', '2021-12-25 12:02:40'); -INSERT INTO `eb_system_attachment` VALUES (217, '4fecdf20de674921a1e106fc2565614251dhtu43zb.png', '', 'crmebimage/public/maintain/2021/12/25/50b4a853b4aa41a9bc8125ac2c2ae3e8in85dafiwk.png', '4510', 'png', 736, 1, '2021-12-25 12:05:07', '2021-12-25 12:05:07'); -INSERT INTO `eb_system_attachment` VALUES (218, '8103314266b14cadb294e41bccba493dwwho3odoqa.png', '', 'crmebimage/public/maintain/2021/12/25/4d6a7711c889409c92eaf580f62b90ca0f92wo6cz2.png', '3834', 'png', 736, 1, '2021-12-25 12:05:07', '2021-12-25 12:05:07'); -INSERT INTO `eb_system_attachment` VALUES (219, '2e456e4e0cad4e15a6e578da2f5ecbe2jmiocsybon.png', '', 'crmebimage/public/maintain/2021/12/25/044cb00c43134dde88a76770a65c4b73aggk7cb6bo.png', '5891', 'png', 736, 1, '2021-12-25 12:05:07', '2021-12-25 12:05:07'); -INSERT INTO `eb_system_attachment` VALUES (220, '9c5c6c7822544013a2eba35312d08de7t46zoigy0z.png', '', 'crmebimage/public/maintain/2021/12/25/b7cc05160f3b4fa198a585042e7f3ac4yes1qlr9t8.png', '4882', 'png', 736, 1, '2021-12-25 12:05:07', '2021-12-25 12:05:07'); -INSERT INTO `eb_system_attachment` VALUES (221, '9764d308ef484594a5ea44c4fc99b58a4de4obbja1.png', '', 'crmebimage/public/maintain/2021/12/25/0cd9800f27e9400c859859277baf469c28c7hjd64b.png', '5201', 'png', 736, 1, '2021-12-25 12:05:07', '2021-12-25 12:05:07'); -INSERT INTO `eb_system_attachment` VALUES (222, '470800bb23f642028d3e12f8c662474b2bq2as9hxp.png', '', 'crmebimage/public/maintain/2021/12/25/1fcc02fe479e493db9da240ee8e83675b3rprs95sz.png', '6047', 'png', 736, 1, '2021-12-25 12:05:08', '2021-12-25 12:05:08'); -INSERT INTO `eb_system_attachment` VALUES (223, '1cb623a89fab475593ca6333b4272494p0q0qpojs9.png', '', 'crmebimage/public/maintain/2021/12/25/a17a7ac2e489478e95ba16e250e997ae0uq5mmtuud.png', '8868', 'png', 736, 1, '2021-12-25 12:05:08', '2021-12-25 12:05:08'); -INSERT INTO `eb_system_attachment` VALUES (224, '6bca0b4815d342458fc867137c77af305w3e9o3xap.png', '', 'crmebimage/public/maintain/2021/12/25/6e188941ad2b4c19a20b04316bb76c4636w09b1ghb.png', '8175', 'png', 736, 1, '2021-12-25 12:05:08', '2021-12-25 12:05:08'); -INSERT INTO `eb_system_attachment` VALUES (225, '7afd824b8e5e45f69097a3e704c6f484blo58jntja.png', '', 'crmebimage/public/maintain/2021/12/25/b531cf7e4c274afba6eac070c7bd6944jcc3suaufz.png', '8390', 'png', 736, 1, '2021-12-25 12:05:08', '2021-12-25 12:05:08'); -INSERT INTO `eb_system_attachment` VALUES (226, '9842bb4aa975495daca4998fcd2b9f1b7rgjc1shlh.png', '', 'crmebimage/public/maintain/2021/12/25/058dd806ac3b49ddad1bcd610981bf85dixxzthr5d.png', '7699', 'png', 736, 1, '2021-12-25 12:05:08', '2021-12-25 12:05:08'); -INSERT INTO `eb_system_attachment` VALUES (227, 'e4a64305496e4d51bd6fc262adb1cbf4sunnlskk21.png', '', 'crmebimage/public/maintain/2021/12/25/73f05211b4e74783892c868ea168e16drvd0kxau4h.png', '7657', 'png', 736, 1, '2021-12-25 12:05:08', '2021-12-25 12:05:08'); -INSERT INTO `eb_system_attachment` VALUES (228, 'cad7fb47b1ff4205be993e2f84c3fe09ia1zq04odl.png', '', 'crmebimage/public/maintain/2021/12/25/efbee20621ec424a983f45cfca57508bxitwgvu74n.png', '8430', 'png', 736, 1, '2021-12-25 12:05:08', '2021-12-25 12:05:08'); -INSERT INTO `eb_system_attachment` VALUES (229, '44d7924af0c941a6b7ab3211085540a79e6ba7kkvj.png', '', 'crmebimage/public/maintain/2021/12/25/855c336f4cd84f3fb0bccae9d809365bpyfrc337l2.png', '10266', 'png', 736, 1, '2021-12-25 12:05:08', '2021-12-25 12:05:08'); -INSERT INTO `eb_system_attachment` VALUES (230, '1886172884984f2fb5463d31ec68cfc6exwfjarlvf.png', '', 'crmebimage/public/maintain/2021/12/25/d287ad96e12e40fcbdb8e8608f69b03ebyh731wk9j.png', '9102', 'png', 736, 1, '2021-12-25 12:05:08', '2021-12-25 12:05:08'); -INSERT INTO `eb_system_attachment` VALUES (231, '04333c775c494a2f9f9135e6f0072985pihk9gou1y.gif', '', 'crmebimage/public/maintain/2021/12/25/d8490798c1e141348c1ba3c109c26e18of6rw66y1f.gif', '81071', 'gif', 736, 1, '2021-12-25 12:05:11', '2021-12-25 12:05:11'); -INSERT INTO `eb_system_attachment` VALUES (232, '3ed7630486a64d55b3e773d98e70bb7ehfmn5ve5su.gif', '', 'crmebimage/public/maintain/2021/12/25/1f052138a6514e748137d863f54d719axyr6kovjd3.gif', '161608', 'gif', 736, 1, '2021-12-25 12:05:12', '2021-12-25 12:05:12'); -INSERT INTO `eb_system_attachment` VALUES (233, '5f8ae8d4aad3481488861de022a27935j2baqqrcja.gif', '', 'crmebimage/public/maintain/2021/12/25/bfba48d86c4b49e19e01496ea3e24540chlmmft4o7.gif', '190111', 'gif', 736, 1, '2021-12-25 12:05:13', '2021-12-25 12:05:13'); -INSERT INTO `eb_system_attachment` VALUES (234, '5c9d8b4b4a2e4fc782558787fc941e24o6u5iv52dl.png', '', 'crmebimage/public/store/2021/12/25/fbc798bf3c91493f95c97be7d6cbaa5akhcpo5ent3.png', '101227', 'png', 721, 1, '2021-12-25 12:06:37', '2021-12-25 12:06:37'); -INSERT INTO `eb_system_attachment` VALUES (235, '59a066f8bb5145cbada4b7a08965cf15b26idurig9.png', '', 'crmebimage/public/store/2021/12/25/6246abff834b4d2fb1edad2a8927c8a3yes6irrqfw.png', '103216', 'png', 721, 1, '2021-12-25 12:06:37', '2021-12-25 12:06:37'); -INSERT INTO `eb_system_attachment` VALUES (236, '72f39322b33249e0b3441908e3b657b2rzf7g4x37c.png', '', 'crmebimage/public/store/2021/12/25/0705b0fad3884eddb31745e453de6503atuqud1tr3.png', '75992', 'png', 721, 1, '2021-12-25 12:06:37', '2021-12-25 12:06:37'); -INSERT INTO `eb_system_attachment` VALUES (237, '769f2ba251114a75bc3da94166770482zv3tb4ogjy.png', '', 'crmebimage/public/store/2021/12/25/090f2f83e9b343c38c7c7b4ebc860a352r8u8adjsq.png', '112263', 'png', 721, 1, '2021-12-25 12:06:37', '2021-12-25 12:06:37'); -INSERT INTO `eb_system_attachment` VALUES (238, '57f108bff43744c88323c666d77cac72g4p0a23tpo.png', '', 'crmebimage/public/store/2021/12/25/1ccac5f9f62646ba930000ad70f741efpfgagvhrzh.png', '160577', 'png', 721, 1, '2021-12-25 12:06:37', '2021-12-25 12:06:37'); -INSERT INTO `eb_system_attachment` VALUES (239, 'bf981c370d9d44f998803310fedb8af3yr9suwbwp1.png', '', 'crmebimage/public/store/2021/12/25/0e13333fdf2841a2a886a9595bebc855q5jgkr8b66.png', '269248', 'png', 721, 1, '2021-12-25 12:06:38', '2021-12-25 12:06:38'); -INSERT INTO `eb_system_attachment` VALUES (240, '343af3ecdc087f3e.jpg', '', 'crmebimage/public/store/2021/12/25/d813cbdd98b148c99885652234ad43b1m1aewwn8wd.jpg', '1519', 'jpeg', 721, 1, '2021-12-25 12:11:24', '2021-12-25 12:11:24'); -INSERT INTO `eb_system_attachment` VALUES (241, 'eb7a947539d94cd495ea6493e37a3e35lkqmcnnl9q.png', '', 'crmebimage/public/store/2021/12/25/ae2a9db4d74a4a56bddb971d3df9e60fljwxe9z3lh.png', '147901', 'png', 721, 1, '2021-12-25 12:16:12', '2021-12-25 12:16:12'); -INSERT INTO `eb_system_attachment` VALUES (242, 'a84efcfa299c4269af95d671e122d4770vrq87ttfz.png', '', 'crmebimage/public/store/2021/12/25/de35d545523448db9f3636e34ca085b29qw11rescg.png', '150018', 'png', 721, 1, '2021-12-25 12:16:12', '2021-12-25 12:16:12'); -INSERT INTO `eb_system_attachment` VALUES (243, 'ba82799518704655ab2fdc254336de08wtb2ofda96.png', '', 'crmebimage/public/store/2021/12/25/61bf8228d96b4c8c9343bc13b4e6fc67c0jmc2y781.png', '215666', 'png', 721, 1, '2021-12-25 12:16:12', '2021-12-25 12:16:12'); -INSERT INTO `eb_system_attachment` VALUES (244, 'dc0c960874b6408781d119e4c84768c03n91s62hyd.jpg', '', 'crmebimage/public/maintain/2021/12/25/0016d1efa86d41e38e76801a7cd743c6wcupy21hvb.jpg', '71811', 'jpeg', 731, 1, '2021-12-25 12:23:32', '2021-12-25 12:23:32'); -INSERT INTO `eb_system_attachment` VALUES (245, '123456.png', '', 'crmebimage/public/operation/2021/12/25/6d292f4a663a453e8bcc9410eda89db55z1vksp7fx.png', '9371', 'png', 719, 1, '2021-12-25 12:23:43', '2021-12-25 12:23:43'); -INSERT INTO `eb_system_attachment` VALUES (246, '275e60789951438c9cac5928bd2b0ec33brze97mkn.png', '', 'crmebimage/public/maintain/2021/12/25/67b2961431ae473d8c24029b3d53d32a6xf1nljtw3.png', '3428', 'png', 731, 1, '2021-12-25 12:24:03', '2021-12-25 12:24:03'); -INSERT INTO `eb_system_attachment` VALUES (247, '834580d86f1c43529247fedf3c4304a51twgcts5bs.png', '', 'crmebimage/public/maintain/2021/12/25/469a3189a95643a8851d4158eb7ff606vs6efrhkrc.png', '9371', 'png', 731, 1, '2021-12-25 12:24:24', '2021-12-25 12:24:24'); -INSERT INTO `eb_system_attachment` VALUES (248, '03d6b5c9c108421183e5d602271ee40fq02myezxqa.png', '', 'crmebimage/public/maintain/2021/12/25/7ccf9f4158794bf997d97b4e871dd34b4qy58l2fyg.png', '117604', 'png', 731, 1, '2021-12-25 12:25:58', '2021-12-25 12:25:58'); -INSERT INTO `eb_system_attachment` VALUES (249, '44456.jpg', '', 'crmebimage/public/operation/2021/12/25/0427b90c74b64a03ae3e7e5c628ef7d69038aimgou.jpg', '26852', 'jpeg', 721, 1, '2021-12-25 12:26:03', '2021-12-25 12:26:03'); -INSERT INTO `eb_system_attachment` VALUES (250, 'ccc58d3de5f34ede96cffede59557fc0ewrr7xtr9j.jpg', '', 'crmebimage/public/maintain/2021/12/25/49ae68efce4848a185a8ddcb4e5c95a2zl2dlwi77v.jpg', '19611', 'jpeg', 737, 1, '2021-12-25 12:48:21', '2021-12-25 12:48:21'); -INSERT INTO `eb_system_attachment` VALUES (251, '4ccb96471110987c.jpg', '', 'crmebimage/public/maintain/2021/12/25/fef1aee22a04466d93693f5791d44bfd2rsm469mcr.jpg', '80731', 'jpeg', 737, 1, '2021-12-25 12:48:22', '2021-12-25 12:48:22'); -INSERT INTO `eb_system_attachment` VALUES (252, '148fffc1ede348e389b3084c6886e006kvrdmkwo23.jpg', '', 'crmebimage/public/maintain/2021/12/25/63969148b6c4447d918124fd810c1da5m2h9aiylly.jpg', '41683', 'jpeg', 737, 1, '2021-12-25 12:48:22', '2021-12-25 12:48:22'); -INSERT INTO `eb_system_attachment` VALUES (253, '0e4236f72d684886afbaa633c0deced0om84pzuunn.jpg', '', 'crmebimage/public/maintain/2021/12/25/37382cca048b4011bdbacd3cbbe0814daw1o5x0tco.jpg', '109831', 'jpeg', 737, 1, '2021-12-25 12:48:22', '2021-12-25 12:48:22'); -INSERT INTO `eb_system_attachment` VALUES (254, 'c02cb52b0d44493199d179078698f1567zz3rxbdmc.jpg', '', 'crmebimage/public/maintain/2021/12/25/5486775d8cad4fd8adfc254d2e93857cn0wu5hq8f4.jpg', '65158', 'jpeg', 737, 1, '2021-12-25 12:48:22', '2021-12-25 12:48:22'); -INSERT INTO `eb_system_attachment` VALUES (255, '4b869e3bbd244ac28ba8523b4109a6570lumy6fnmo.jpg', '', 'crmebimage/public/maintain/2021/12/25/3ed152917e3f4f7faa9414050b6cab49vuadulntb8.jpg', '161671', 'jpeg', 737, 1, '2021-12-25 12:48:23', '2021-12-25 12:48:23'); -INSERT INTO `eb_system_attachment` VALUES (256, 'f3e2e78eb60092fb.jpg', '', 'crmebimage/public/maintain/2021/12/25/7a6475bba07c47bb98e5db0e0d21c8ebq5sw2kijlc.jpg', '120772', 'jpeg', 737, 1, '2021-12-25 12:48:23', '2021-12-25 12:48:23'); -INSERT INTO `eb_system_attachment` VALUES (257, 'ccf9090810934050a5b84f88b05678afay5uw5nj3d.jpg', '', 'crmebimage/public/maintain/2021/12/25/f65ef5469f3a479497a710fb288d115cvl5imkvpo8.jpg', '125421', 'jpeg', 737, 1, '2021-12-25 12:48:23', '2021-12-25 12:48:23'); -INSERT INTO `eb_system_attachment` VALUES (258, '0917635902ffe23fce240813503e45a5.jpg', '', 'crmebimage/public/store/2021/12/25/e7e312556bcb4084acf708f3a5210da7krs1pwq84o.jpg', '37172', 'jpeg', 738, 1, '2021-12-25 13:09:59', '2021-12-25 13:09:59'); -INSERT INTO `eb_system_attachment` VALUES (259, '1.jpeg', '', 'crmebimage/public/store/2021/12/25/ee26a9207f404a47851538c7dfd777a7ltlxg7tkrm.jpeg', '39695', 'jpeg', 738, 1, '2021-12-25 13:11:53', '2021-12-25 13:11:53'); -INSERT INTO `eb_system_attachment` VALUES (260, '2.jpeg', '', 'crmebimage/public/store/2021/12/25/489bd8c24e904f6d93a827ee0d051a52m796u5yxlu.jpeg', '41799', 'jpeg', 738, 1, '2021-12-25 13:12:32', '2021-12-25 13:12:32'); -INSERT INTO `eb_system_attachment` VALUES (261, '755bf516b1ca4b6db3bfeaa4dd5901cdh71kob20re.jpg', '', 'crmebimage/public/maintain/2021/12/25/2631ca1695464da982b202d239bdf717eunywwsimu.jpg', '129708', 'jpeg', 739, 1, '2021-12-25 14:17:15', '2021-12-25 14:17:15'); -INSERT INTO `eb_system_attachment` VALUES (262, '406d729b84ed4ec9a2171bfcf6fd0634ughzbz9kfi.jpg', '', 'crmebimage/public/maintain/2021/12/25/166caeeb0f234d5e93c4baebf533e3c6cpk8chqitx.jpg', '73725', 'jpeg', 739, 1, '2021-12-25 14:17:41', '2021-12-25 14:17:41'); -INSERT INTO `eb_system_attachment` VALUES (263, 'efb1e4e7fe604fe1988b4213ce08cb11tdsyijtd2r.jpg', '', 'crmebimage/public/maintain/2021/12/25/2a104b07589e45998fe604f81e56c216ozicop5k74.jpg', '80741', 'jpeg', 739, 1, '2021-12-25 14:17:41', '2021-12-25 14:17:41'); -INSERT INTO `eb_system_attachment` VALUES (264, '20210730115217.gif', '', 'crmebimage/public/maintain/2021/12/25/0eabacb2ab774f54bddd9b2b0ff212a49e7etvhouq.gif', '350370', 'gif', 740, 1, '2021-12-25 14:19:48', '2021-12-25 14:19:48'); -INSERT INTO `eb_system_attachment` VALUES (265, '20210730115217.gif', '', 'crmebimage/public/maintain/2021/12/25/1d14f2d2fa8f451a9d46fccacc3aa661tdwihn07he.gif', '350370', 'gif', 740, 1, '2021-12-25 14:21:30', '2021-12-25 14:21:30'); -INSERT INTO `eb_system_attachment` VALUES (266, '64edb94f67fd46dd9031995ef2be86fca3xpw8y5kz.jpg', '', 'crmebimage/public/maintain/2021/12/25/88cea6884f5e4ae48b8e407266fc03dbnqk5y6cdcv.jpg', '73292', 'jpeg', 732, 1, '2021-12-25 14:22:27', '2021-12-25 14:22:27'); -INSERT INTO `eb_system_attachment` VALUES (267, '20210730115215.gif', '', 'crmebimage/public/maintain/2021/12/25/9deb872da95c42d2bf8c432075153b1egrrxlb666p.gif', '410412', 'gif', 740, 1, '2021-12-25 14:23:16', '2021-12-25 14:23:16'); -INSERT INTO `eb_system_attachment` VALUES (268, '20210730115214.gif', '', 'crmebimage/public/maintain/2021/12/25/ca4e301ed76a44f8aa23e70b7df107b8v26l2p79u3.gif', '360926', 'gif', 740, 1, '2021-12-25 14:25:04', '2021-12-25 14:25:04'); -INSERT INTO `eb_system_attachment` VALUES (269, '20210730115213.gif', '', 'crmebimage/public/maintain/2021/12/25/96cff8171dc8423ebd23559d0b14c8e8mv9d8a0iqw.gif', '340527', 'gif', 740, 1, '2021-12-25 14:26:43', '2021-12-25 14:26:43'); -INSERT INTO `eb_system_attachment` VALUES (270, '微信图片_20211123105919.png', '', 'crmebimage/public/maintain/2021/12/30/6636e07d913c40638753f2141440b8667x3wjapar7.png', '372090', 'png', 0, 1, '2021-12-30 15:03:11', '2021-12-30 15:03:11'); -INSERT INTO `eb_system_attachment` VALUES (271, 'banner_.gif', '', 'crmebimage/public/maintain/2021/12/30/964c5c7f054341868eae1e897aeaeb79l1uwjxxw11.gif', '102097', 'gif', 0, 1, '2021-12-30 15:05:15', '2021-12-30 15:05:15'); -INSERT INTO `eb_system_attachment` VALUES (272, '微信图片_20211123105919.png', '', 'crmebimage/public/maintain/2021/12/30/a0015e0e7be446efb720879816e099d0qkmvy7t5bd.png', '372090', 'png', 0, 1, '2021-12-30 15:06:01', '2021-12-30 15:06:01'); - --- ---------------------------- --- Table structure for eb_system_city --- ---------------------------- -DROP TABLE IF EXISTS `eb_system_city`; -CREATE TABLE `eb_system_city` ( - `id` int(11) NOT NULL, - `city_id` int(11) NOT NULL DEFAULT 0 COMMENT '城市id', - `level` int(11) NOT NULL DEFAULT 0 COMMENT '省市级别', - `parent_id` int(11) NOT NULL DEFAULT 0 COMMENT '父级id', - `area_code` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '区号', - `name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '名称', - `merger_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '合并名称', - `lng` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '经度', - `lat` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '纬度', - `is_show` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否展示', - `create_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '城市表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of eb_system_city --- ---------------------------- -INSERT INTO `eb_system_city` VALUES (1, 1, 0, 0, '110000000000', '北京市', '北京', '116.407526', '39.904030', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2, 7362, 0, 0, '120000000000', '天津市', '天津', '117.200983', '39.084158', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3, 13267, 0, 0, '130000000000', '河北省', '河北', '114.468664', '38.037057', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (4, 67747, 0, 0, '140000000000', '山西省', '山西', '112.562398', '37.873531', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (5, 99537, 0, 0, '150000000000', '内蒙古自治区', '内蒙古', '111.765617', '40.817498', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (6, 115224, 0, 0, '210000000000', '辽宁省', '辽宁', '123.429440', '41.835441', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (7, 133208, 0, 0, '220000000000', '吉林省', '吉林', '125.325990', '43.896536', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (8, 145665, 0, 0, '230000000000', '黑龙江省', '黑龙江', '126.661669', '45.742347', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (9, 161792, 0, 0, '310000000000', '上海市', '上海', '121.473701', '31.230416', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (10, 167904, 0, 0, '320000000000', '江苏省', '江苏', '118.763232', '32.061707', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (11, 191019, 0, 0, '330000000000', '浙江省', '浙江', '120.152791', '30.267446', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (12, 224649, 0, 0, '340000000000', '安徽省', '安徽', '117.284922', '31.861184', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (13, 244377, 0, 0, '350000000000', '福建省', '福建', '119.295144', '26.100779', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (14, 262698, 0, 0, '360000000000', '江西省', '江西', '115.909228', '28.675696', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (15, 285860, 0, 0, '370000000000', '山东省', '山东', '117.020359', '36.668530', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (16, 367395, 0, 0, '410000000000', '河南省', '河南', '113.753602', '34.765515', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (17, 420824, 0, 0, '420000000000', '湖北省', '湖北', '114.341861', '30.546498', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (18, 452123, 0, 0, '430000000000', '湖南省', '湖南', '112.983810', '28.112444', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (19, 483250, 0, 0, '440000000000', '广东省', '广东', '113.266530', '23.132191', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (20, 511462, 0, 0, '450000000000', '广西壮族自治区', '广西', '108.327546', '22.815478', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (21, 529344, 0, 0, '460000000000', '海南省', '海南', '110.349228', '20.017377', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (22, 533328, 0, 0, '500000000000', '重庆市', '重庆', '106.551556', '29.563009', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (23, 545532, 0, 0, '510000000000', '四川省', '四川', '104.075931', '30.651651', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (24, 604131, 0, 0, '520000000000', '贵州省', '贵州', '106.707410', '26.598194', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (25, 624372, 0, 0, '530000000000', '云南省', '云南', '102.710002', '25.045806', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (26, 640332, 0, 0, '540000000000', '西藏自治区', '西藏', '91.117212', '29.646922', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (27, 646578, 0, 0, '610000000000', '陕西省', '陕西', '108.954239', '34.265472', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (28, 671119, 0, 0, '620000000000', '甘肃省', '甘肃', '103.826308', '36.059421', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (29, 690094, 0, 0, '630000000000', '青海省', '青海', '101.780199', '36.620901', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (30, 695259, 0, 0, '640000000000', '宁夏回族自治区', '宁夏', '106.258754', '38.471317', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (31, 698440, 0, 0, '650000000000', '新疆维吾尔自治区', '新疆', '87.627704', '43.793026', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (32, 714368, 0, 0, '0', '香港特别行政区', '香港', '114.173355', '22.320048', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (33, 714390, 0, 0, '0', '澳门特别行政区', '澳门', '113.549090', '22.198951', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (34, 714401, 0, 0, '0', '台湾', '台湾', '121.509062', '25.044332', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (35, 2, 1, 1, '110100000000', '北京市', '北京', '116.407526', '39.904030', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (36, 7363, 1, 7362, '120100000000', '天津市', '天津', '117.200983', '39.084158', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (37, 13268, 1, 13267, '130100000000', '石家庄市', '河北,石家庄', '114.514859', '38.042306', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (38, 18128, 1, 13267, '130200000000', '唐山市', '河北,唐山', '118.180193', '39.630867', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (39, 24371, 1, 13267, '130300000000', '秦皇岛市', '河北,秦皇岛', '119.600492', '39.935385', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (40, 26779, 1, 13267, '130400000000', '邯郸市', '河北,邯郸', '114.538961', '36.625657', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (41, 32688, 1, 13267, '130500000000', '邢台市', '河北,邢台', '114.504844', '37.070589', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (42, 38160, 1, 13267, '130600000000', '保定市', '河北,保定', '115.464806', '38.873891', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (43, 44570, 1, 13267, '130700000000', '张家口市', '河北,张家口', '114.887543', '40.824418', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (44, 49190, 1, 13267, '130800000000', '承德市', '河北,承德', '117.962410', '40.954071', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (45, 52018, 1, 13267, '130900000000', '沧州市', '河北,沧州', '116.838834', '38.304477', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (46, 58247, 1, 13267, '131000000000', '廊坊市', '河北,廊坊', '116.683752', '39.538047', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (47, 61804, 1, 13267, '131100000000', '衡水市', '河北,衡水', '115.670177', '37.738920', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (48, 66813, 1, 13267, '139000000000', '直辖县', '河北', '114.468664', '38.037057', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (49, 67748, 1, 67747, '140100000000', '太原市', '山西,太原', '112.548879', '37.870590', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (50, 69390, 1, 67747, '140200000000', '大同市', '山西,大同', '113.612440', '40.040295', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (51, 71850, 1, 67747, '140300000000', '阳泉市', '山西,阳泉', '113.580519', '37.856971', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (52, 72975, 1, 67747, '140400000000', '长治市', '山西,长治', '113.116255', '36.195386', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (53, 76726, 1, 67747, '140500000000', '晋城市', '山西,晋城', '112.851831', '35.490701', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (54, 79163, 1, 67747, '140600000000', '朔州市', '山西,朔州', '112.432825', '39.331595', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (55, 81000, 1, 67747, '140700000000', '晋中市', '山西,晋中', '112.752694', '37.687024', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (56, 84092, 1, 67747, '140800000000', '运城市', '山西,运城', '111.007528', '35.026412', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (57, 87613, 1, 67747, '140900000000', '忻州市', '山西,忻州', '112.734174', '38.416663', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (58, 92738, 1, 67747, '141000000000', '临汾市', '山西,临汾', '111.518976', '36.088005', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (59, 96064, 1, 67747, '141100000000', '吕梁市', '山西,吕梁', '111.144319', '37.518314', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (60, 99538, 1, 99537, '150100000000', '呼和浩特市', '内蒙古,呼和浩特', '111.749180', '40.842585', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (61, 100904, 1, 99537, '150200000000', '包头市', '内蒙古,包头', '109.840347', '40.657449', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (62, 101772, 1, 99537, '150300000000', '乌海市', '内蒙古,乌海', '106.794249', '39.655388', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (63, 101884, 1, 99537, '150400000000', '赤峰市', '内蒙古,赤峰', '118.886856', '42.257817', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (64, 104457, 1, 99537, '150500000000', '通辽市', '内蒙古,通辽', '122.243444', '43.652890', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (65, 107065, 1, 99537, '150600000000', '鄂尔多斯市', '内蒙古,鄂尔多斯', '109.781327', '39.608266', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (66, 108166, 1, 99537, '150700000000', '呼伦贝尔市', '内蒙古,呼伦贝尔', '119.765744', '49.211574', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (67, 109847, 1, 99537, '150800000000', '巴彦淖尔市', '内蒙古,巴彦淖尔', '107.387657', '40.743213', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (68, 110889, 1, 99537, '150900000000', '乌兰察布市', '内蒙古,乌兰察布', '113.132585', '40.994785', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (69, 112552, 1, 99537, '152200000000', '兴安盟', '内蒙古,兴安', '122.067042', '46.077561', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (70, 113777, 1, 99537, '152500000000', '锡林郭勒盟', '内蒙古,锡林郭勒', '116.048222', '43.933454', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (71, 114940, 1, 99537, '152900000000', '阿拉善盟', '内蒙古,阿拉善', '105.728969', '38.851892', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (72, 115225, 1, 115224, '210100000000', '沈阳市', '辽宁,沈阳', '123.431474', '41.805698', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (73, 117932, 1, 115224, '210200000000', '大连市', '辽宁,大连', '121.614682', '38.914003', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (74, 119789, 1, 115224, '210300000000', '鞍山市', '辽宁,鞍山', '122.994329', '41.108647', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (75, 121081, 1, 115224, '210400000000', '抚顺市', '辽宁,抚顺', '123.957208', '41.880872', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (76, 122142, 1, 115224, '210500000000', '本溪市', '辽宁,本溪', '123.766485', '41.294175', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (77, 122730, 1, 115224, '210600000000', '丹东市', '辽宁,丹东', '124.354706', '40.000499', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (78, 123698, 1, 115224, '210700000000', '锦州市', '辽宁,锦州', '121.127003', '41.095119', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (79, 125249, 1, 115224, '210800000000', '营口市', '辽宁,营口', '122.235417', '40.667012', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (80, 126156, 1, 115224, '210900000000', '阜新市', '辽宁,阜新', '121.670323', '42.021619', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (81, 127070, 1, 115224, '211000000000', '辽阳市', '辽宁,辽阳', '123.236944', '41.267244', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (82, 127834, 1, 115224, '211100000000', '盘锦市', '辽宁,盘锦', '122.070714', '41.119997', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (83, 128421, 1, 115224, '211200000000', '铁岭市', '辽宁,铁岭', '123.726166', '42.223769', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (84, 129977, 1, 115224, '211300000000', '朝阳市', '辽宁,朝阳', '120.389862', '41.497767', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (85, 131738, 1, 115224, '211400000000', '葫芦岛市', '辽宁,葫芦岛', '120.836932', '40.711052', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (86, 133209, 1, 133208, '220100000000', '长春市', '吉林,长春', '125.323544', '43.817071', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (87, 135392, 1, 133208, '220200000000', '吉林市', '吉林,吉林', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (88, 137206, 1, 133208, '220300000000', '四平市', '吉林,四平', '124.350398', '43.166419', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (89, 138721, 1, 133208, '220400000000', '辽源市', '吉林,辽源', '125.143532', '42.887918', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (90, 139340, 1, 133208, '220500000000', '通化市', '吉林,通化', '125.939697', '41.728401', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (91, 140601, 1, 133208, '220600000000', '白山市', '吉林,白山', '126.423587', '41.939994', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (92, 141361, 1, 133208, '220700000000', '松原市', '吉林,松原', '124.825117', '45.141789', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (93, 142786, 1, 133208, '220800000000', '白城市', '吉林,白城', '122.839024', '45.619641', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (94, 143990, 1, 133208, '222400000000', '延边朝鲜族自治州', '吉林,延边', '129.508946', '42.891253', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (95, 145666, 1, 145665, '230100000000', '哈尔滨市', '黑龙江,哈尔滨', '126.534967', '45.803775', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (96, 149079, 1, 145665, '230200000000', '齐齐哈尔市', '黑龙江,齐齐哈尔', '123.918186', '47.354348', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (97, 150915, 1, 145665, '230300000000', '鸡西市', '黑龙江,鸡西', '130.969333', '45.295075', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (98, 151830, 1, 145665, '230400000000', '鹤岗市', '黑龙江,鹤岗', '130.297964', '47.349916', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (99, 152413, 1, 145665, '230500000000', '双鸭山市', '黑龙江,双鸭山', '131.159133', '46.646508', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (100, 153313, 1, 145665, '230600000000', '大庆市', '黑龙江,大庆', '125.103784', '46.589309', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (101, 154201, 1, 145665, '230700000000', '伊春市', '黑龙江,伊春', '128.841147', '47.727536', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (102, 155076, 1, 145665, '230800000000', '佳木斯市', '黑龙江,佳木斯', '130.318917', '46.799922', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (103, 156713, 1, 145665, '230900000000', '七台河市', '黑龙江,七台河', '131.003138', '45.771726', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (104, 157130, 1, 145665, '231000000000', '牡丹江市', '黑龙江,牡丹江', '129.633168', '44.551653', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (105, 158623, 1, 145665, '231100000000', '黑河市', '黑龙江,黑河', '127.528560', '50.245329', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (106, 159769, 1, 145665, '231200000000', '绥化市', '黑龙江,绥化', '126.968887', '46.653845', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (107, 161651, 1, 145665, '232700000000', '大兴安岭地区', '黑龙江,大兴安岭', '124.711080', '52.335206', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (108, 161793, 1, 161792, '310100000000', '上海市', '上海', '121.473701', '31.230416', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (109, 167905, 1, 167904, '320100000000', '南京市', '江苏,南京', '118.796877', '32.060255', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (110, 169375, 1, 167904, '320200000000', '无锡市', '江苏,无锡', '120.311910', '31.491169', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (111, 170724, 1, 167904, '320300000000', '徐州市', '江苏,徐州', '117.284124', '34.205768', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (112, 173635, 1, 167904, '320400000000', '常州市', '江苏,常州', '119.973987', '31.810689', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (113, 174764, 1, 167904, '320500000000', '苏州市', '江苏,苏州', '120.585315', '31.298886', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (114, 176920, 1, 167904, '320600000000', '南通市', '江苏,南通', '120.894291', '31.980171', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (115, 178999, 1, 167904, '320700000000', '连云港市', '江苏,连云港', '119.221611', '34.596653', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (116, 180743, 1, 167904, '320800000000', '淮安市', '江苏,淮安', '119.015285', '33.610353', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (117, 182538, 1, 167904, '320900000000', '盐城市', '江苏,盐城', '120.163561', '33.347382', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (118, 185201, 1, 167904, '321000000000', '扬州市', '江苏,扬州', '119.412966', '32.394210', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (119, 186657, 1, 167904, '321100000000', '镇江市', '江苏,镇江', '119.425836', '32.187849', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (120, 187441, 1, 167904, '321200000000', '泰州市', '江苏,泰州', '119.923116', '32.455778', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (121, 189402, 1, 167904, '321300000000', '宿迁市', '江苏,宿迁', '118.275198', '33.963232', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (122, 191020, 1, 191019, '330100000000', '杭州市', '浙江,杭州', '120.155070', '30.274084', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (123, 194395, 1, 191019, '330200000000', '宁波市', '浙江,宁波', '121.550357', '29.874556', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (124, 197850, 1, 191019, '330300000000', '温州市', '浙江,温州', '120.699366', '27.994267', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (125, 203852, 1, 191019, '330400000000', '嘉兴市', '浙江,嘉兴', '120.755486', '30.746129', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (126, 205101, 1, 191019, '330500000000', '湖州市', '浙江,湖州', '120.086823', '30.894348', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (127, 206438, 1, 191019, '330600000000', '绍兴市', '浙江,绍兴', '120.580232', '30.029752', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (128, 209250, 1, 191019, '330700000000', '金华市', '浙江,金华', '119.647444', '29.079059', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (129, 214260, 1, 191019, '330800000000', '衢州市', '浙江,衢州', '118.859457', '28.970079', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (130, 215955, 1, 191019, '330900000000', '舟山市', '浙江,舟山', '122.207215', '29.985295', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (131, 216449, 1, 191019, '331000000000', '台州市', '浙江,台州', '121.420757', '28.656386', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (132, 221610, 1, 191019, '331100000000', '丽水市', '浙江,丽水', '119.922796', '28.467630', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (133, 224650, 1, 224649, '340100000000', '合肥市', '安徽,合肥', '117.227239', '31.820586', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (134, 226469, 1, 224649, '340200000000', '芜湖市', '安徽,芜湖', '118.432941', '31.352859', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (135, 227482, 1, 224649, '340300000000', '蚌埠市', '安徽,蚌埠', '117.389719', '32.916287', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (136, 228630, 1, 224649, '340400000000', '淮南市', '安徽,淮南', '116.999932', '32.625478', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (137, 229844, 1, 224649, '340500000000', '马鞍山市', '安徽,马鞍山', '118.506759', '31.670452', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (138, 230476, 1, 224649, '340600000000', '淮北市', '安徽,淮北', '116.798265', '33.955844', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (139, 230981, 1, 224649, '340700000000', '铜陵市', '安徽,铜陵', '117.812079', '30.945429', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (140, 231499, 1, 224649, '340800000000', '安庆市', '安徽,安庆', '117.063754', '30.543494', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (141, 233236, 1, 224649, '341000000000', '黄山市', '安徽,黄山', '118.337481', '29.714655', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (142, 234109, 1, 224649, '341100000000', '滁州市', '安徽,滁州', '118.317106', '32.301556', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (143, 235483, 1, 224649, '341200000000', '阜阳市', '安徽,阜阳', '115.814204', '32.890124', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (144, 237607, 1, 224649, '341300000000', '宿州市', '安徽,宿州', '116.964356', '33.646373', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (145, 239084, 1, 224649, '341500000000', '六安市', '安徽,六安', '116.521854', '31.733699', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (146, 241180, 1, 224649, '341600000000', '亳州市', '安徽,亳州', '115.778676', '33.844582', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (147, 242634, 1, 224649, '341700000000', '池州市', '安徽,池州', '117.491568', '30.664800', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (148, 243399, 1, 224649, '341800000000', '宣城市', '安徽,宣城', '118.758816', '30.940718', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (149, 244378, 1, 244377, '350100000000', '福州市', '福建,福州', '119.296494', '26.074507', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (150, 247478, 1, 244377, '350200000000', '厦门市', '福建,厦门', '118.089425', '24.479833', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (151, 248059, 1, 244377, '350300000000', '莆田市', '福建,莆田', '119.007777', '25.454084', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (152, 249098, 1, 244377, '350400000000', '三明市', '福建,三明', '117.638678', '26.263406', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (153, 251197, 1, 244377, '350500000000', '泉州市', '福建,泉州', '118.675675', '24.874132', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (154, 253905, 1, 244377, '350600000000', '漳州市', '福建,漳州', '117.647481', '24.512948', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (155, 256112, 1, 244377, '350700000000', '南平市', '福建,南平', '118.177708', '26.641768', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (156, 258160, 1, 244377, '350800000000', '龙岩市', '福建,龙岩', '117.017536', '25.075123', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (157, 260230, 1, 244377, '350900000000', '宁德市', '福建,宁德', '119.547932', '26.665617', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (158, 262699, 1, 262698, '360100000000', '南昌市', '江西,南昌', '115.858197', '28.682892', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (159, 264862, 1, 262698, '360200000000', '景德镇市', '江西,景德镇', '117.178419', '29.268835', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (160, 265677, 1, 262698, '360300000000', '萍乡市', '江西,萍乡', '113.854556', '27.622768', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (161, 266521, 1, 262698, '360400000000', '九江市', '江西,九江', '116.001930', '29.705077', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (162, 269107, 1, 262698, '360500000000', '新余市', '江西,新余', '114.917346', '27.817808', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (163, 269654, 1, 262698, '360600000000', '鹰潭市', '江西,鹰潭', '117.069202', '28.260189', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (164, 270222, 1, 262698, '360700000000', '赣州市', '江西,赣州', '114.935029', '25.831829', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (165, 274444, 1, 262698, '360800000000', '吉安市', '江西,吉安', '114.992509', '27.113443', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (166, 277615, 1, 262698, '360900000000', '宜春市', '江西,宜春', '114.416778', '27.815619', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (167, 280562, 1, 262698, '361000000000', '抚州市', '江西,抚州', '116.358181', '27.949217', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (168, 282841, 1, 262698, '361100000000', '上饶市', '江西,上饶', '117.943433', '28.454862', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (169, 285861, 1, 285860, '370100000000', '济南市', '山东,济南', '117.119999', '36.651216', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (170, 291235, 1, 285860, '370200000000', '青岛市', '山东,青岛', '120.382639', '36.067082', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (171, 298025, 1, 285860, '370300000000', '淄博市', '山东,淄博', '118.054927', '36.813487', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (172, 301711, 1, 285860, '370400000000', '枣庄市', '山东,枣庄', '117.323725', '34.810487', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (173, 304309, 1, 285860, '370500000000', '东营市', '山东,东营', '118.674767', '37.434751', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (174, 306339, 1, 285860, '370600000000', '烟台市', '山东,烟台', '121.447935', '37.463822', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (175, 313063, 1, 285860, '370700000000', '潍坊市', '山东,潍坊', '119.161755', '36.706774', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (176, 320179, 1, 285860, '370800000000', '济宁市', '山东,济宁', '116.587098', '35.414921', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (177, 326706, 1, 285860, '370900000000', '泰安市', '山东,泰安', '117.087614', '36.200252', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (178, 330547, 1, 285860, '371000000000', '威海市', '山东,威海', '122.120419', '37.513068', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (179, 333140, 1, 285860, '371100000000', '日照市', '山东,日照', '119.526888', '35.416377', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (180, 336050, 1, 285860, '371200000000', '莱芜市', '山东,莱芜', '117.676723', '36.213813', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (181, 337144, 1, 285860, '371300000000', '临沂市', '山东,临沂', '118.356448', '35.104672', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (182, 344133, 1, 285860, '371400000000', '德州市', '山东,德州', '116.357464', '37.434092', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (183, 349382, 1, 285860, '371500000000', '聊城市', '山东,聊城', '115.985371', '36.456703', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (184, 355972, 1, 285860, '371600000000', '滨州市', '山东,滨州', '117.970703', '37.381990', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (185, 361375, 1, 285860, '371700000000', '菏泽市', '山东,菏泽', '115.480656', '35.233750', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (186, 367396, 1, 367395, '410100000000', '郑州市', '河南,郑州', '113.625368', '34.746599', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (187, 370304, 1, 367395, '410200000000', '开封市', '河南,开封', '114.307581', '34.797239', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (188, 372971, 1, 367395, '410300000000', '洛阳市', '河南,洛阳', '112.454040', '34.619682', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (189, 376365, 1, 367395, '410400000000', '平顶山市', '河南,平顶山', '113.192661', '33.766169', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (190, 379245, 1, 367395, '410500000000', '安阳市', '河南,安阳', '114.392392', '36.097577', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (191, 382878, 1, 367395, '410600000000', '鹤壁市', '河南,鹤壁', '114.297272', '35.747225', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (192, 383890, 1, 367395, '410700000000', '新乡市', '河南,新乡', '113.926800', '35.303004', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (193, 387707, 1, 367395, '410800000000', '焦作市', '河南,焦作', '113.241823', '35.215892', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (194, 389719, 1, 367395, '410900000000', '濮阳市', '河南,濮阳', '115.029215', '35.761829', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (195, 392737, 1, 367395, '411000000000', '许昌市', '河南,许昌', '113.852640', '34.035506', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (196, 395254, 1, 367395, '411100000000', '漯河市', '河南,漯河', '114.016539', '33.581412', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (197, 396611, 1, 367395, '411200000000', '三门峡市', '河南,三门峡', '111.200135', '34.772493', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (198, 398169, 1, 367395, '411300000000', '南阳市', '河南,南阳', '112.528321', '32.990833', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (199, 403311, 1, 367395, '411400000000', '商丘市', '河南,商丘', '115.656370', '34.414172', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (200, 408287, 1, 367395, '411500000000', '信阳市', '河南,信阳', '114.091023', '32.146983', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (201, 411925, 1, 367395, '411600000000', '周口市', '河南,周口', '114.696951', '33.626149', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (202, 417174, 1, 367395, '411700000000', '驻马店市', '河南,驻马店', '114.022298', '33.011529', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (203, 420258, 1, 0, '419000000000', '直辖县', '河南', '113.753602', '34.765515', 1, '2021-07-16 11:33:35', '2021-08-16 11:51:05'); -INSERT INTO `eb_system_city` VALUES (204, 420825, 1, 420824, '420100000000', '武汉市', '湖北,武汉', '114.305392', '30.593098', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (205, 424449, 1, 420824, '420200000000', '黄石市', '湖北,黄石', '115.038520', '30.199652', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (206, 425508, 1, 420824, '420300000000', '十堰市', '湖北,十堰', '110.797990', '32.629397', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (207, 427710, 1, 420824, '420500000000', '宜昌市', '湖北,宜昌', '111.286471', '30.691967', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (208, 429501, 1, 420824, '420600000000', '襄阳市', '湖北,襄阳', '112.122414', '32.008986', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (209, 432415, 1, 420824, '420700000000', '鄂州市', '湖北,鄂州', '114.894843', '30.391940', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (210, 432829, 1, 420824, '420800000000', '荆门市', '湖北,荆门', '112.199265', '31.035423', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (211, 434548, 1, 420824, '420900000000', '孝感市', '湖北,孝感', '113.916902', '30.924568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (212, 437779, 1, 420824, '421000000000', '荆州市', '湖北,荆州', '112.239741', '30.335165', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (213, 440639, 1, 420824, '421100000000', '黄冈市', '湖北,黄冈', '114.872316', '30.453905', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (214, 445040, 1, 420824, '421200000000', '咸宁市', '湖北,咸宁', '114.322492', '29.841443', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (215, 446212, 1, 420824, '421300000000', '随州市', '湖北,随州', '113.382458', '31.690215', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (216, 447268, 1, 420824, '422800000000', '恩施土家族苗族自治州', '湖北,恩施', '109.488172', '30.272156', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (217, 449865, 1, 420824, '429000000000', '直辖县', '湖北', '114.341861', '30.546498', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (218, 452124, 1, 452123, '430100000000', '长沙市', '湖南,长沙', '112.938814', '28.228209', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (219, 453799, 1, 452123, '430200000000', '株洲市', '湖南,株洲', '113.134002', '27.827550', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (220, 455283, 1, 452123, '430300000000', '湘潭市', '湖南,湘潭', '112.944049', '27.829738', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (221, 456303, 1, 452123, '430400000000', '衡阳市', '湖南,衡阳', '112.571997', '26.893230', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (222, 459251, 1, 452123, '430500000000', '邵阳市', '湖南,邵阳', '111.467791', '27.238892', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (223, 463141, 1, 452123, '430600000000', '岳阳市', '湖南,岳阳', '113.128958', '29.357104', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (224, 465105, 1, 452123, '430700000000', '常德市', '湖南,常德', '111.698497', '29.031673', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (225, 467562, 1, 452123, '430800000000', '张家界市', '湖南,张家界', '110.479191', '29.117096', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (226, 468660, 1, 452123, '430900000000', '益阳市', '湖南,益阳', '112.355180', '28.553860', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (227, 470123, 1, 452123, '431000000000', '郴州市', '湖南,郴州', '113.014717', '25.770509', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (228, 472709, 1, 452123, '431100000000', '永州市', '湖南,永州', '111.613445', '26.420394', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (229, 476148, 1, 452123, '431200000000', '怀化市', '湖南,怀化', '109.998488', '27.554978', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (230, 479103, 1, 452123, '431300000000', '娄底市', '湖南,娄底', '111.993497', '27.700062', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (231, 481319, 1, 452123, '433100000000', '湘西土家族苗族自治州', '湖南,湘西', '109.739172', '28.311947', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (232, 483251, 1, 483250, '440100000000', '广州市', '广东,广州', '113.264434', '23.129162', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (233, 486129, 1, 483250, '440200000000', '韶关市', '广东,韶关', '113.597522', '24.810403', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (234, 487721, 1, 483250, '440300000000', '深圳市', '广东,深圳', '114.057868', '22.543099', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (235, 488589, 1, 483250, '440400000000', '珠海市', '广东,珠海', '113.576726', '22.270715', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (236, 488954, 1, 483250, '440500000000', '汕头市', '广东,汕头', '116.681972', '23.354091', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (237, 490106, 1, 483250, '440600000000', '佛山市', '广东,佛山', '113.121416', '23.021548', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (238, 490919, 1, 483250, '440700000000', '江门市', '广东,江门', '113.081901', '22.578738', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (239, 492341, 1, 483250, '440800000000', '湛江市', '广东,湛江', '110.359377', '21.270707', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (240, 494394, 1, 483250, '440900000000', '茂名市', '广东,茂名', '110.925456', '21.662999', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (241, 496438, 1, 483250, '441200000000', '肇庆市', '广东,肇庆', '112.465091', '23.047191', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (242, 498104, 1, 483250, '441300000000', '惠州市', '广东,惠州', '114.416196', '23.111847', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (243, 499489, 1, 483250, '441400000000', '梅州市', '广东,梅州', '116.122238', '24.288615', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (244, 501867, 1, 483250, '441500000000', '汕尾市', '广东,汕尾', '115.375278', '22.786211', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (245, 502828, 1, 483250, '441600000000', '河源市', '广东,河源', '114.700447', '23.743538', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (246, 504366, 1, 483250, '441700000000', '阳江市', '广东,阳江', '111.982232', '21.857958', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (247, 505298, 1, 483250, '441800000000', '清远市', '广东,清远', '113.056031', '23.681763', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (248, 506616, 1, 483250, '441900000000', '东莞市', '广东,东莞', '113.751765', '23.020536', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (249, 507255, 1, 483250, '442000000000', '中山市', '广东,中山', '113.392782', '22.517645', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (250, 507557, 1, 483250, '445100000000', '潮州市', '广东,潮州', '116.622603', '23.656950', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (251, 508648, 1, 483250, '445200000000', '揭阳市', '广东,揭阳', '116.372831', '23.549993', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (252, 510408, 1, 483250, '445300000000', '云浮市', '广东,云浮', '112.044491', '22.915094', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (253, 511463, 1, 511462, '450100000000', '南宁市', '广西,南宁', '108.366543', '22.817002', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (254, 513434, 1, 511462, '450200000000', '柳州市', '广西,柳州', '109.415953', '24.325502', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (255, 514790, 1, 511462, '450300000000', '桂林市', '广西,桂林', '110.290194', '25.273566', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (256, 516858, 1, 511462, '450400000000', '梧州市', '广西,梧州', '111.279115', '23.476962', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (257, 517933, 1, 511462, '450500000000', '北海市', '广西,北海', '109.119927', '21.481254', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (258, 518407, 1, 511462, '450600000000', '防城港市', '广西,防城港', '108.353846', '21.686860', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (259, 518808, 1, 511462, '450700000000', '钦州市', '广西,钦州', '108.654146', '21.979933', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (260, 519929, 1, 511462, '450800000000', '贵港市', '广西,贵港', '109.598926', '23.111530', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (261, 521166, 1, 511462, '450900000000', '玉林市', '广西,玉林', '110.164756', '22.636379', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (262, 522786, 1, 511462, '451000000000', '百色市', '广西,百色', '106.618201', '23.902333', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (263, 524814, 1, 511462, '451100000000', '贺州市', '广西,贺州', '111.566694', '24.403582', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (264, 525638, 1, 511462, '451200000000', '河池市', '广西,河池', '108.085261', '24.692931', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (265, 527443, 1, 511462, '451300000000', '来宾市', '广西,来宾', '109.221465', '23.750306', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (266, 528339, 1, 511462, '451400000000', '崇左市', '广西,崇左', '107.364711', '22.376532', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (267, 529345, 1, 529344, '460100000000', '海口市', '海南,海口', '110.198293', '20.044001', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (268, 529878, 1, 529344, '460200000000', '三亚市', '海南,三亚', '109.511909', '18.252847', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (269, 530060, 1, 529344, '460300000000', '三沙市', '海南,三沙', '112.338695', '16.831839', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (270, 530070, 1, 529344, '460400000000', '儋州市', '海南,儋州', '110.349228', '20.017377', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (271, 530468, 1, 529344, '469000000000', '省直辖县级行政区域', '海南', '110.349228', '20.017377', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (272, 533329, 1, 533328, '500100000000', '重庆市', '重庆', '106.551556', '29.563009', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (273, 540700, 1, 533328, '500200000000', '县', '重庆', '106.551556', '29.563009', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (274, 545533, 1, 545532, '510100000000', '成都市', '四川,成都', '104.066541', '30.572269', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (275, 550275, 1, 545532, '510300000000', '自贡市', '四川,自贡', '104.778442', '29.339030', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (276, 551809, 1, 545532, '510400000000', '攀枝花市', '四川,攀枝花', '101.718637', '26.582347', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (277, 552358, 1, 545532, '510500000000', '泸州市', '四川,泸州', '105.442258', '28.871810', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (278, 554142, 1, 545532, '510600000000', '德阳市', '四川,德阳', '104.397894', '31.126855', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (279, 556077, 1, 545532, '510700000000', '绵阳市', '四川,绵阳', '104.679114', '31.467450', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (280, 560191, 1, 545532, '510800000000', '广元市', '四川,广元', '105.843357', '32.435435', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (281, 563242, 1, 545532, '510900000000', '遂宁市', '四川,遂宁', '105.592898', '30.532847', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (282, 565735, 1, 545532, '511000000000', '内江市', '四川,内江', '105.058433', '29.580228', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (283, 568202, 1, 545532, '511100000000', '乐山市', '四川,乐山', '103.765568', '29.552106', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (284, 570733, 1, 545532, '511300000000', '南充市', '四川,南充', '106.110698', '30.837793', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (285, 576992, 1, 545532, '511400000000', '眉山市', '四川,眉山', '103.848538', '30.075439', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (286, 578485, 1, 545532, '511500000000', '宜宾市', '四川,宜宾', '104.643215', '28.751768', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (287, 581870, 1, 545532, '511600000000', '广安市', '四川,广安', '106.633212', '30.455961', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (288, 585049, 1, 545532, '511700000000', '达州市', '四川,达州', '107.468023', '31.209571', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (289, 588538, 1, 545532, '511800000000', '雅安市', '四川,雅安', '103.013261', '29.980537', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (290, 589779, 1, 545532, '511900000000', '巴中市', '四川,巴中', '106.747477', '31.867903', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (291, 592598, 1, 545532, '512000000000', '资阳市', '四川,资阳', '104.627636', '30.128901', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (292, 594864, 1, 545532, '513200000000', '阿坝藏族羌族自治州', '四川,阿坝', '102.224653', '31.899413', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (293, 596525, 1, 545532, '513300000000', '甘孜藏族自治州', '四川,甘孜', '101.962310', '30.049520', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (294, 599659, 1, 545532, '513400000000', '凉山彝族自治州', '四川,凉山', '102.267335', '27.881610', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (295, 604132, 1, 604131, '520100000000', '贵阳市', '贵州,贵阳', '106.630153', '26.647661', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (296, 605834, 1, 604131, '520200000000', '六盘水市', '贵州,六盘水', '104.830359', '26.592666', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (297, 607029, 1, 604131, '520300000000', '遵义市', '贵州,遵义', '106.927389', '27.725654', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (298, 609309, 1, 604131, '520400000000', '安顺市', '贵州,安顺', '105.947593', '26.253072', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (299, 610607, 1, 604131, '520500000000', '毕节市', '贵州,毕节', '105.283992', '27.302589', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (300, 614530, 1, 604131, '520600000000', '铜仁市', '贵州,铜仁', '109.189598', '27.731514', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (301, 617670, 1, 604131, '522300000000', '黔西南布依族苗族自治州', '贵州,黔西南', '104.906396', '25.087825', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (302, 619017, 1, 604131, '522600000000', '黔东南苗族侗族自治州', '贵州,黔东南', '107.982859', '26.583442', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (303, 622734, 1, 604131, '522700000000', '黔南布依族苗族自治州', '贵州,黔南', '107.522097', '26.254092', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (304, 624373, 1, 624372, '530100000000', '昆明市', '云南,昆明', '102.832891', '24.880095', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (305, 626181, 1, 624372, '530300000000', '曲靖市', '云南,曲靖', '103.796167', '25.489999', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (306, 627981, 1, 624372, '530400000000', '玉溪市', '云南,玉溪', '102.546543', '24.352036', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (307, 628776, 1, 624372, '530500000000', '保山市', '云南,保山', '99.161761', '25.112046', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (308, 629781, 1, 624372, '530600000000', '昭通市', '云南,昭通', '103.717465', '27.338257', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (309, 631276, 1, 624372, '530700000000', '丽江市', '云南,丽江', '100.227750', '26.855047', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (310, 631811, 1, 624372, '530800000000', '普洱市', '云南,普洱', '100.966512', '22.825065', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (311, 632971, 1, 624372, '530900000000', '临沧市', '云南,临沧', '100.079583', '23.877573', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (312, 634006, 1, 624372, '532300000000', '楚雄彝族自治州', '云南,楚雄', '101.528069', '25.045532', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (313, 635219, 1, 624372, '532500000000', '红河哈尼族彝族自治州', '云南,红河', '103.374799', '23.363130', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (314, 636688, 1, 624372, '532600000000', '文山壮族苗族自治州', '云南,文山', '104.216248', '23.400734', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (315, 637778, 1, 624372, '532800000000', '西双版纳傣族自治州', '云南,西双版纳', '100.797777', '22.007351', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (316, 638092, 1, 624372, '532900000000', '大理白族自治州', '云南,大理', '100.267639', '25.606485', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (317, 639368, 1, 624372, '533100000000', '德宏傣族景颇族自治州', '云南,德宏', '98.584895', '24.433353', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (318, 639802, 1, 624372, '533300000000', '怒江傈僳族自治州', '云南,怒江', '98.853097', '25.852547', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (319, 640107, 1, 624372, '533400000000', '迪庆藏族自治州', '云南,迪庆', '99.702234', '27.818882', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (320, 640333, 1, 640332, '540100000000', '拉萨市', '西藏,拉萨', '91.140856', '29.645554', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (321, 640675, 1, 640332, '540200000000', '日喀则市', '西藏,日喀则', '88.880583', '29.266869', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (322, 642571, 1, 640332, '540300000000', '昌都市', '西藏,昌都', '97.172020', '31.140969', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (323, 643863, 1, 640332, '540400000000', '林芝市', '西藏,林芝', '94.361490', '29.649128', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (324, 644423, 1, 640332, '540500000000', '山南市', '西藏,山南', '91.117212', '29.646922', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (325, 645076, 1, 640332, '542400000000', '那曲地区', '西藏,那曲', '92.051239', '31.476202', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (326, 646392, 1, 640332, '542500000000', '阿里地区', '西藏,阿里', '80.105804', '32.501111', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (327, 646579, 1, 646578, '610100000000', '西安市', '陕西,西安', '108.940174', '34.341568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (328, 649979, 1, 646578, '610200000000', '铜川市', '陕西,铜川', '108.945233', '34.896756', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (329, 650575, 1, 646578, '610300000000', '宝鸡市', '陕西,宝鸡', '107.237974', '34.361979', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (330, 652581, 1, 646578, '610400000000', '咸阳市', '陕西,咸阳', '108.708991', '34.329605', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (331, 655295, 1, 646578, '610500000000', '渭南市', '陕西,渭南', '109.509786', '34.499995', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (332, 657848, 1, 646578, '610600000000', '延安市', '陕西,延安', '109.489727', '36.585455', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (333, 660643, 1, 646578, '610700000000', '汉中市', '陕西,汉中', '107.023323', '33.067480', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (334, 663046, 1, 646578, '610800000000', '榆林市', '陕西,榆林', '109.734589', '38.285390', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (335, 667681, 1, 646578, '610900000000', '安康市', '陕西,安康', '109.029022', '32.684714', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (336, 669707, 1, 646578, '611000000000', '商洛市', '陕西,商洛', '109.940477', '33.870422', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (337, 671120, 1, 671119, '620100000000', '兰州市', '甘肃,兰州', '103.834303', '36.061089', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (338, 672330, 1, 671119, '620200000000', '嘉峪关市', '甘肃,嘉峪关', '98.289152', '39.773130', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (339, 672385, 1, 671119, '620300000000', '金昌市', '甘肃,金昌', '102.188043', '38.520089', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (340, 672577, 1, 671119, '620400000000', '白银市', '甘肃,白银', '104.138559', '36.544756', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (341, 673463, 1, 671119, '620500000000', '天水市', '甘肃,天水', '105.724947', '34.580863', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (342, 676215, 1, 671119, '620600000000', '武威市', '甘肃,武威', '102.638011', '37.928264', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (343, 677568, 1, 671119, '620700000000', '张掖市', '甘肃,张掖', '100.449818', '38.925875', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (344, 678560, 1, 671119, '620800000000', '平凉市', '甘肃,平凉', '106.665240', '35.543051', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (345, 680191, 1, 671119, '620900000000', '酒泉市', '甘肃,酒泉', '98.494483', '39.732410', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (346, 680815, 1, 671119, '621000000000', '庆阳市', '甘肃,庆阳', '107.643631', '35.709077', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (347, 682322, 1, 671119, '621100000000', '定西市', '甘肃,定西', '104.626282', '35.580662', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (348, 684415, 1, 671119, '621200000000', '陇南市', '甘肃,陇南', '104.921841', '33.400684', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (349, 687916, 1, 671119, '622900000000', '临夏回族自治州', '甘肃,临夏', '103.210538', '35.601182', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (350, 689265, 1, 671119, '623000000000', '甘南藏族自治州', '甘肃,甘南', '102.911027', '34.983385', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (351, 690095, 1, 690094, '630100000000', '西宁市', '青海,西宁', '101.778228', '36.617144', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (352, 691278, 1, 690094, '630200000000', '海东市', '青海,海东', '102.104287', '36.502039', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (353, 693040, 1, 690094, '632200000000', '海北藏族自治州', '青海,海北', '100.900997', '36.954413', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (354, 693342, 1, 690094, '632300000000', '黄南藏族自治州', '青海,黄南', '102.015248', '35.519548', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (355, 693672, 1, 690094, '632500000000', '海南藏族自治州', '青海,海南', '101.780199', '36.620901', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (356, 694220, 1, 690094, '632600000000', '果洛藏族自治州', '青海,果洛', '100.244808', '34.471431', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (357, 694478, 1, 690094, '632700000000', '玉树藏族自治州', '青海,玉树', '97.091934', '33.011674', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (358, 694846, 1, 690094, '632800000000', '海西蒙古族藏族自治州', '青海,海西', '97.369751', '37.377139', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (359, 695260, 1, 695259, '640100000000', '银川市', '宁夏,银川', '106.230909', '38.487193', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (360, 695883, 1, 695259, '640200000000', '石嘴山市', '宁夏,石嘴山', '106.383303', '38.983236', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (361, 696252, 1, 695259, '640300000000', '吴忠市', '宁夏,吴忠', '106.198393', '37.997460', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (362, 696928, 1, 695259, '640400000000', '固原市', '宁夏,固原', '106.242610', '36.015855', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (363, 697887, 1, 695259, '640500000000', '中卫市', '宁夏,中卫', '105.196902', '37.499972', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (364, 698441, 1, 698440, '650100000000', '乌鲁木齐市', '新疆,乌鲁木齐', '87.616848', '43.825592', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (365, 699583, 1, 698440, '650200000000', '克拉玛依市', '新疆,克拉玛依', '84.889207', '45.579888', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (366, 699773, 1, 698440, '650400000000', '吐鲁番市', '新疆,吐鲁番', '89.189655', '42.951384', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (367, 700070, 1, 698440, '650500000000', '哈密市', '新疆,哈密', '93.514916', '42.818501', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (368, 700489, 1, 698440, '652300000000', '昌吉回族自治州', '新疆,昌吉', '87.308224', '44.011182', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (369, 701559, 1, 698440, '652700000000', '博尔塔拉蒙古自治州', '新疆,博尔塔拉', '82.066159', '44.905588', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (370, 702104, 1, 698440, '652800000000', '巴音郭楞蒙古自治州', '新疆,巴音郭楞', '86.145298', '41.764115', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (371, 703119, 1, 698440, '652900000000', '阿克苏地区', '新疆,阿克苏', '80.260605', '41.168779', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (372, 704779, 1, 698440, '653000000000', '克孜勒苏柯尔克孜自治州', '新疆,克孜勒苏', '76.167819', '39.714526', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (373, 705145, 1, 698440, '653100000000', '喀什地区', '新疆,喀什', '75.989755', '39.470400', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (374, 708117, 1, 698440, '653200000000', '和田地区', '新疆,和田', '79.922211', '37.114157', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (375, 709792, 1, 698440, '654000000000', '伊犁哈萨克自治州', '新疆,伊犁', '81.324136', '43.916823', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (376, 711218, 1, 698440, '654200000000', '塔城地区', '新疆,塔城', '82.980316', '46.745364', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (377, 712893, 1, 698440, '654300000000', '阿勒泰地区', '新疆,阿勒泰', '88.141253', '47.844924', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (378, 713697, 1, 698440, '659000000000', '直辖县', '新疆', '87.627704', '43.793026', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (385, 714402, 1, 714401, '0', '彰化县', '台湾,彰化', '120.416000', '24.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (386, 717531, 1, 714401, '0', '新北市', '台湾,新北', '121.465746', '25.012366', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (387, 719868, 1, 714401, '0', '澎湖县', '台湾,澎湖', '119.566417', '23.569733', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (388, 720118, 1, 714401, '0', '屏东县', '台湾,屏东', '120.487928', '22.682802', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (389, 722024, 1, 714401, '0', '臺中市', '台湾,臺中', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (390, 725488, 1, 714401, '0', '臺南市', '台湾,臺南', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (391, 727730, 1, 714401, '0', '臺北市', '台湾,臺北', '121.517057', '25.048074', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (392, 729928, 1, 714401, '0', '臺东县', '台湾,臺东', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (393, 730843, 1, 714401, '0', '桃园市', '台湾,桃园', '121.083000', '25.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (394, 734179, 1, 714401, '0', '宜兰县', '台湾,宜兰', '121.500000', '24.600000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (395, 736051, 1, 714401, '0', '南投县', '台湾,南投', '120.830000', '23.830000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (396, 737856, 1, 714401, '0', '南海岛', '台湾,南海岛', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (397, 737861, 1, 714401, '0', '苗栗县', '台湾,苗栗', '120.818985', '24.561601', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (398, 739957, 1, 714401, '0', '嘉义市', '台湾,嘉义', '120.452538', '23.481568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (399, 740510, 1, 714401, '0', '嘉义县', '台湾,嘉义', '120.452538', '23.481568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (400, 742126, 1, 714401, '0', '新竹市', '台湾,新竹', '120.968798', '24.806738', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (401, 742636, 1, 714401, '0', '新竹县', '台湾,新竹', '120.968798', '24.806738', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (402, 743938, 1, 714401, '0', '花莲县', '台湾,花莲', '121.300000', '23.830000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (403, 745674, 1, 714401, '0', '高雄市', '台湾,高雄', '120.311922', '22.620856', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (404, 748553, 1, 714401, '0', '基隆市', '台湾,基隆', '121.746248', '25.130741', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (405, 749571, 1, 714401, '0', '金门县', '台湾,金门', '118.317089', '24.432706', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (406, 749930, 1, 714401, '0', '连江县', '台湾,连江', '119.539704', '26.197364', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (407, 749957, 1, 714401, '0', '云林县', '台湾,云林', '120.527173', '23.696887', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (408, 3, 2, 2, '110101000000', '东城区', '北京,东城', '116.416357', '39.928353', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (409, 203, 2, 2, '110102000000', '西城区', '北京,西城', '116.365868', '39.912289', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (410, 480, 2, 2, '110105000000', '朝阳区', '北京,朝阳', '116.443108', '39.921470', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (411, 1122, 2, 2, '110106000000', '丰台区', '北京,丰台', '116.287149', '39.858427', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (412, 1533, 2, 2, '110107000000', '石景山区', '北京,石景山', '116.222982', '39.906611', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (413, 1692, 2, 2, '110108000000', '海淀区', '北京,海淀', '116.298056', '39.959912', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (414, 2376, 2, 2, '110109000000', '门头沟区', '北京,门头沟', '116.102009', '39.940646', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (415, 2689, 2, 2, '110111000000', '房山区', '北京,房山', '116.143267', '39.749144', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (416, 3324, 2, 2, '110112000000', '通州区', '北京,通州', '116.656435', '39.909946', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (417, 3927, 2, 2, '110113000000', '顺义区', '北京,顺义', '116.654651', '40.130347', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (418, 4498, 2, 2, '110114000000', '昌平区', '北京,昌平', '116.231204', '40.220660', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (419, 5042, 2, 2, '110115000000', '大兴区', '北京,大兴', '116.341395', '39.726929', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (420, 5800, 2, 2, '110116000000', '怀柔区', '北京,怀柔', '116.642349', '40.315704', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (421, 6138, 2, 2, '110117000000', '平谷区', '北京,平谷', '117.121383', '40.140701', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (422, 6466, 2, 2, '110118000000', '密云区', '北京,密云', '116.843177', '40.376834', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (423, 6921, 2, 2, '110119000000', '延庆区', '北京,延庆', '115.974848', '40.456951', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (424, 7364, 2, 7363, '120101000000', '和平区', '天津,和平', '117.214510', '39.116949', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (425, 7434, 2, 7363, '120102000000', '河东区', '天津,河东', '117.251587', '39.128291', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (426, 7607, 2, 7363, '120103000000', '河西区', '天津,河西', '117.223372', '39.109563', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (427, 7763, 2, 7363, '120104000000', '南开区', '天津,南开', '117.150738', '39.138203', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (428, 7954, 2, 7363, '120105000000', '河北区', '天津,河北', '117.200983', '39.084158', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (429, 8079, 2, 7363, '120106000000', '红桥区', '天津,红桥', '117.151533', '39.167345', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (430, 8298, 2, 7363, '120110000000', '东丽区', '天津,东丽', '117.314324', '39.086569', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (431, 8563, 2, 7363, '120111000000', '西青区', '天津,西青', '117.008827', '39.141152', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (432, 8835, 2, 7363, '120112000000', '津南区', '天津,津南', '117.357260', '38.937928', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (433, 9102, 2, 7363, '120113000000', '北辰区', '天津,北辰', '117.135488', '39.224792', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (434, 9378, 2, 7363, '120114000000', '武清区', '天津,武清', '117.044388', '39.384119', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (435, 10143, 2, 7363, '120115000000', '宝坻区', '天津,宝坻', '117.309863', '39.717379', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (436, 10983, 2, 7363, '120116000000', '滨海新区', '天津,滨海', '117.517969', '38.719936', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (437, 11454, 2, 7363, '120117000000', '宁河区', '天津,宁河', '117.826625', '39.329858', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (438, 11795, 2, 7363, '120118000000', '静海区', '天津,静海', '116.974130', '38.947512', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (439, 12251, 2, 7363, '120119000000', '蓟州区', '天津,蓟州', '117.200983', '39.084158', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (440, 13269, 2, 13268, '130101000000', '市辖区', '河北,石家庄', '114.514859', '38.042306', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (441, 13270, 2, 0, '130102000000', '长安区', '河北,石家庄,长安', '114.539060', '38.036654', 1, '2021-07-16 11:33:35', '2021-08-16 11:50:45'); -INSERT INTO `eb_system_city` VALUES (442, 13444, 2, 13268, '130104000000', '桥西区', '河北,石家庄,桥西', '114.461154', '38.004043', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (443, 13601, 2, 13268, '130105000000', '新华区', '河北,石家庄,新华', '114.463347', '38.051060', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (444, 13728, 2, 13268, '130107000000', '井陉矿区', '河北,石家庄,井陉', '114.145240', '38.032148', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (445, 13788, 2, 13268, '130108000000', '裕华区', '河北,石家庄,裕华', '114.531362', '38.006453', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (446, 13895, 2, 13268, '130109000000', '藁城区', '河北,石家庄,藁城', '114.847075', '38.021567', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (447, 14142, 2, 13268, '130110000000', '鹿泉区', '河北,石家庄,鹿泉', '114.313724', '38.085958', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (448, 14377, 2, 13268, '130111000000', '栾城区', '河北,石家庄,栾城', '114.648318', '37.900200', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (449, 14562, 2, 13268, '130121000000', '井陉县', '河北,石家庄,井陉', '114.145240', '38.032148', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (450, 14902, 2, 13268, '130123000000', '正定县', '河北,石家庄,正定', '114.570941', '38.146445', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (451, 15100, 2, 13268, '130125000000', '行唐县', '河北,石家庄,行唐', '114.552692', '38.438411', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (452, 15447, 2, 13268, '130126000000', '灵寿县', '河北,石家庄,灵寿', '114.382645', '38.308628', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (453, 15747, 2, 13268, '130127000000', '高邑县', '河北,石家庄,高邑', '114.611433', '37.615159', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (454, 15860, 2, 13268, '130128000000', '深泽县', '河北,石家庄,深泽', '115.200910', '38.184072', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (455, 15993, 2, 13268, '130129000000', '赞皇县', '河北,石家庄,赞皇', '114.386155', '37.665576', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (456, 16218, 2, 13268, '130130000000', '无极县', '河北,石家庄,无极', '114.976337', '38.179141', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (457, 16447, 2, 13268, '130131000000', '平山县', '河北,石家庄,平山', '114.199134', '38.247144', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (458, 17188, 2, 13268, '130132000000', '元氏县', '河北,石家庄,元氏', '114.525580', '37.766651', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (459, 17417, 2, 13268, '130133000000', '赵县', '河北,石家庄,赵县', '114.776187', '37.756498', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (460, 17710, 2, 13268, '130183000000', '晋州市', '河北,石家庄,晋州', '115.044185', '38.033629', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (461, 17945, 2, 13268, '130184000000', '新乐市', '河北,石家庄,新乐', '114.684014', '38.343296', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (462, 18129, 2, 18128, '130201000000', '市辖区', '河北,唐山', '118.180193', '39.630867', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (463, 18130, 2, 18128, '130202000000', '路南区', '河北,唐山,路南', '118.154354', '39.625059', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (464, 18297, 2, 18128, '130203000000', '路北区', '河北,唐山,路北', '118.200692', '39.624437', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (465, 18542, 2, 18128, '130204000000', '古冶区', '河北,唐山,古冶', '118.447635', '39.733578', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (466, 18754, 2, 18128, '130205000000', '开平区', '河北,唐山,开平', '118.261842', '39.671001', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (467, 18938, 2, 18128, '130207000000', '丰南区', '河北,唐山,丰南', '118.085169', '39.576031', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (468, 19436, 2, 18128, '130208000000', '丰润区', '河北,唐山,丰润', '118.162216', '39.832582', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (469, 19987, 2, 18128, '130209000000', '曹妃甸区', '河北,唐山,曹妃甸', '118.460379', '39.273070', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (470, 20152, 2, 18128, '130223000000', '滦县', '河北,唐山,滦县', '118.703598', '39.740593', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (471, 20696, 2, 18128, '130224000000', '滦南县', '河北,唐山,滦南', '118.682379', '39.518997', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (472, 21321, 2, 18128, '130225000000', '乐亭县', '河北,唐山,乐亭', '118.912571', '39.425608', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (473, 21825, 2, 18128, '130227000000', '迁西县', '河北,唐山,迁西', '118.314715', '40.141500', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (474, 22273, 2, 18128, '130229000000', '玉田县', '河北,唐山,玉田', '117.738658', '39.900401', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (475, 23067, 2, 18128, '130281000000', '遵化市', '河北,唐山,遵化', '117.965892', '40.189202', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (476, 23787, 2, 18128, '130283000000', '迁安市', '河北,唐山,迁安', '118.701144', '39.999175', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (477, 24372, 2, 24371, '130301000000', '市辖区', '河北,秦皇岛', '119.600492', '39.935385', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (478, 24373, 2, 24371, '130302000000', '海港区', '河北,秦皇岛,海港', '119.564962', '39.947560', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (479, 24760, 2, 24371, '130303000000', '山海关区', '河北,秦皇岛,山海关', '119.775799', '39.978849', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (480, 24891, 2, 24371, '130304000000', '北戴河区', '河北,秦皇岛,北戴河', '119.488914', '39.834751', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (481, 24951, 2, 24371, '130306000000', '抚宁区', '河北,秦皇岛,抚宁', '119.244848', '39.876254', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (482, 25332, 2, 24371, '130321000000', '青龙满族自治县', '河北,秦皇岛,青龙', '118.949684', '40.407578', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (483, 25758, 2, 24371, '130322000000', '昌黎县', '河北,秦皇岛,昌黎', '119.162694', '39.712813', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (484, 26216, 2, 24371, '130324000000', '卢龙县', '河北,秦皇岛,卢龙', '118.892986', '39.891947', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (485, 26780, 2, 26779, '130401000000', '市辖区', '河北,邯郸', '114.538961', '36.625657', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (486, 26781, 2, 26779, '130402000000', '邯山区', '河北,邯郸,邯山', '114.490431', '36.580358', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (487, 26877, 2, 26779, '130403000000', '丛台区', '河北,邯郸,丛台', '114.492897', '36.636410', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (488, 27018, 2, 26779, '130404000000', '复兴区', '河北,邯郸,复兴', '114.462058', '36.639022', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (489, 27135, 2, 26779, '130406000000', '峰峰矿区', '河北,邯郸,峰峰', '114.214634', '36.472281', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (490, 27372, 2, 26779, '130421000000', '邯郸县', '河北,邯郸,邯郸', '114.530925', '36.593881', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (491, 27538, 2, 26779, '130423000000', '临漳县', '河北,邯郸,临漳', '114.619544', '36.335300', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (492, 27978, 2, 26779, '130424000000', '成安县', '河北,邯郸,成安', '114.670032', '36.444317', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (493, 28222, 2, 26779, '130425000000', '大名县', '河北,邯郸,大名', '115.147814', '36.285616', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (494, 28894, 2, 26779, '130426000000', '涉县', '河北,邯郸,涉县', '113.691401', '36.584995', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (495, 29226, 2, 26779, '130427000000', '磁县', '河北,邯郸,磁县', '114.373947', '36.374012', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (496, 29613, 2, 26779, '130428000000', '肥乡县', '河北,邯郸,肥乡', '114.800166', '36.548132', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (497, 29888, 2, 26779, '130429000000', '永年县', '河北,邯郸,永年', '114.543804', '36.744120', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (498, 30335, 2, 26779, '130430000000', '邱县', '河北,邯郸,邱县', '115.186792', '36.811133', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (499, 30568, 2, 26779, '130431000000', '鸡泽县', '河北,邯郸,鸡泽', '114.878299', '36.920350', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (500, 30747, 2, 26779, '130432000000', '广平县', '河北,邯郸,广平', '114.948607', '36.483484', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (501, 30924, 2, 26779, '130433000000', '馆陶县', '河北,邯郸,馆陶', '115.282468', '36.547557', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (502, 31210, 2, 26779, '130434000000', '魏县', '河北,邯郸,魏县', '114.938921', '36.359869', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (503, 31793, 2, 26779, '130435000000', '曲周县', '河北,邯郸,曲周', '114.945113', '36.780175', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (504, 32146, 2, 26779, '130481000000', '武安市', '河北,邯郸,武安', '114.203697', '36.696506', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (505, 32689, 2, 32688, '130501000000', '市辖区', '河北,邢台', '114.504844', '37.070589', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (506, 32690, 2, 32688, '130502000000', '桥东区', '河北,邢台,桥东', '114.507254', '37.068017', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (507, 32795, 2, 32688, '130503000000', '桥西区', '河北,邢台,桥西', '114.468435', '37.059882', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (508, 32922, 2, 32688, '130521000000', '邢台县', '河北,邢台,邢台', '114.561132', '37.050730', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (509, 33459, 2, 32688, '130522000000', '临城县', '河北,邢台,临城', '114.498762', '37.444499', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (510, 33688, 2, 32688, '130523000000', '内丘县', '河北,邢台,内丘', '114.512128', '37.286669', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (511, 34011, 2, 32688, '130524000000', '柏乡县', '河北,邢台,柏乡', '114.693426', '37.482423', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (512, 34139, 2, 32688, '130525000000', '隆尧县', '河北,邢台,隆尧', '114.770419', '37.350173', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (513, 34431, 2, 32688, '130526000000', '任县', '河北,邢台,任县', '114.671936', '37.120983', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (514, 34635, 2, 32688, '130527000000', '南和县', '河北,邢台,南和', '114.683762', '37.005041', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (515, 34866, 2, 32688, '130528000000', '宁晋县', '河北,邢台,宁晋', '114.919301', '37.619886', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (516, 35240, 2, 32688, '130529000000', '巨鹿县', '河北,邢台,巨鹿', '115.037478', '37.221112', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (517, 35542, 2, 32688, '130530000000', '新河县', '河北,邢台,新河', '115.242070', '37.528719', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (518, 35718, 2, 32688, '130531000000', '广宗县', '河北,邢台,广宗', '115.142607', '37.074660', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (519, 35940, 2, 32688, '130532000000', '平乡县', '河北,邢台,平乡', '115.030076', '37.063148', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (520, 36202, 2, 32688, '130533000000', '威县', '河北,邢台,威县', '115.266780', '36.975377', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (521, 36748, 2, 32688, '130534000000', '清河县', '河北,邢台,清河', '115.667576', '37.040087', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (522, 37086, 2, 32688, '130535000000', '临西县', '河北,邢台,临西', '115.501048', '36.870813', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (523, 37403, 2, 32688, '130581000000', '南宫市', '河北,邢台,南宫', '115.408748', '37.359264', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (524, 37883, 2, 32688, '130582000000', '沙河市', '河北,邢台,沙河', '114.503335', '36.854922', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (525, 38161, 2, 38160, '130601000000', '市辖区', '河北,保定', '115.464806', '38.873891', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (526, 38162, 2, 38160, '130602000000', '竞秀区', '河北,保定,竞秀', '115.458669', '38.877561', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (527, 38327, 2, 38160, '130606000000', '莲池区', '河北,保定,莲池', '115.497342', '38.883209', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (528, 38578, 2, 38160, '130607000000', '满城区', '河北,保定,满城', '115.322351', '38.948955', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (529, 38786, 2, 38160, '130608000000', '清苑区', '河北,保定,清苑', '115.489968', '38.765041', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (530, 39082, 2, 38160, '130609000000', '徐水区', '河北,保定,徐水', '115.655778', '39.018737', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (531, 39426, 2, 38160, '130623000000', '涞水县', '河北,保定,涞水', '115.713905', '39.394317', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (532, 39736, 2, 38160, '130624000000', '阜平县', '河北,保定,阜平', '114.195104', '38.849152', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (533, 39960, 2, 38160, '130626000000', '定兴县', '河北,保定,定兴', '115.808175', '39.263018', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (534, 40258, 2, 38160, '130627000000', '唐县', '河北,保定,唐县', '114.982972', '38.748204', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (535, 40632, 2, 38160, '130628000000', '高阳县', '河北,保定,高阳', '115.778965', '38.700088', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (536, 40825, 2, 38160, '130629000000', '容城县', '河北,保定,容城', '115.861657', '39.042784', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (537, 40961, 2, 38160, '130630000000', '涞源县', '河北,保定,涞源', '114.694284', '39.360247', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (538, 41272, 2, 38160, '130631000000', '望都县', '河北,保定,望都', '115.154511', '38.695736', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (539, 41433, 2, 38160, '130632000000', '安新县', '河北,保定,安新', '115.935603', '38.935369', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (540, 41658, 2, 38160, '130633000000', '易县', '河北,保定,易县', '115.497457', '39.349393', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (541, 42155, 2, 38160, '130634000000', '曲阳县', '河北,保定,曲阳', '114.744926', '38.622244', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (542, 42550, 2, 38160, '130635000000', '蠡县', '河北,保定,蠡县', '115.583855', '38.488056', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (543, 42802, 2, 38160, '130636000000', '顺平县', '河北,保定,顺平', '115.135470', '38.837487', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (544, 43054, 2, 38160, '130637000000', '博野县', '河北,保定,博野', '115.464380', '38.457364', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (545, 43196, 2, 38160, '130638000000', '雄县', '河北,保定,雄县', '116.108650', '38.994550', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (546, 43441, 2, 38160, '130681000000', '涿州市', '河北,保定,涿州', '115.974422', '39.485283', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (547, 43905, 2, 38160, '130683000000', '安国市', '河北,保定,安国', '115.326647', '38.418440', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (548, 44124, 2, 38160, '130684000000', '高碑店市', '河北,保定,高碑店', '115.873758', '39.326521', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (549, 44571, 2, 44570, '130701000000', '市辖区', '河北,张家口', '114.887543', '40.824418', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (550, 44572, 2, 44570, '130702000000', '桥东区', '河北,张家口,桥东', '114.894341', '40.788457', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (551, 44634, 2, 44570, '130703000000', '桥西区', '河北,张家口,桥西', '114.869407', '40.819564', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (552, 44704, 2, 44570, '130705000000', '宣化区', '河北,张家口,宣化', '115.099510', '40.608726', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (553, 45133, 2, 44570, '130706000000', '下花园区', '河北,张家口,下花园', '115.287352', '40.502652', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (554, 45197, 2, 44570, '130708000000', '万全区', '河北,张家口,万全', '114.740560', '40.766898', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (555, 45395, 2, 44570, '130709000000', '崇礼区', '河北,张家口,崇礼', '115.282669', '40.974676', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (556, 45623, 2, 44570, '130722000000', '张北县', '河北,张家口,张北', '114.720086', '41.158557', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (557, 46018, 2, 44570, '130723000000', '康保县', '河北,张家口,康保', '114.600404', '41.852368', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (558, 46371, 2, 44570, '130724000000', '沽源县', '河北,张家口,沽源', '115.688692', '41.669668', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (559, 46619, 2, 44570, '130725000000', '尚义县', '河北,张家口,尚义', '113.969619', '41.076227', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (560, 46812, 2, 44570, '130726000000', '蔚县', '河北,张家口,蔚县', '114.588903', '39.840843', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (561, 47396, 2, 44570, '130727000000', '阳原县', '河北,张家口,阳原', '114.150388', '40.103742', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (562, 47718, 2, 44570, '130728000000', '怀安县', '河北,张家口,怀安', '114.385791', '40.674193', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (563, 48013, 2, 44570, '130730000000', '怀来县', '河北,张家口,怀来', '115.517862', '40.415343', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (564, 48331, 2, 44570, '130731000000', '涿鹿县', '河北,张家口,涿鹿', '115.205345', '40.379563', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (565, 48731, 2, 44570, '130732000000', '赤城县', '河北,张家口,赤城', '115.831499', '40.912921', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (566, 49191, 2, 49190, '130801000000', '市辖区', '河北,承德', '117.962410', '40.954071', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (567, 49192, 2, 49190, '130802000000', '双桥区', '河北,承德,双桥', '117.943348', '40.974650', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (568, 49328, 2, 49190, '130803000000', '双滦区', '河北,承德,双滦', '117.799912', '40.959196', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (569, 49425, 2, 49190, '130804000000', '鹰手营子矿区', '河北,承德,鹰手营子', '117.663471', '40.546436', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (570, 49456, 2, 49190, '130821000000', '承德县', '河北,承德,承德', '118.173825', '40.768238', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (571, 49866, 2, 49190, '130822000000', '兴隆县', '河北,承德,兴隆', '117.500558', '40.417358', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (572, 50185, 2, 49190, '130823000000', '平泉县', '河北,承德,平泉', '118.701951', '41.018405', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (573, 50455, 2, 49190, '130824000000', '滦平县', '河北,承德,滦平', '117.332801', '40.941482', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (574, 50690, 2, 49190, '130825000000', '隆化县', '河北,承德,隆化', '117.738938', '41.313791', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (575, 51081, 2, 49190, '130826000000', '丰宁满族自治县', '河北,承德,丰宁', '117.962410', '40.954071', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (576, 51428, 2, 49190, '130827000000', '宽城满族自治县', '河北,承德,宽城', '118.485313', '40.611391', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (577, 51657, 2, 49190, '130828000000', '围场满族蒙古族自治县', '河北,承德,围场', '117.760159', '41.938529', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (578, 52019, 2, 52018, '130901000000', '市辖区', '河北,沧州', '116.838834', '38.304477', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (579, 52020, 2, 52018, '130902000000', '新华区', '河北,沧州,新华', '116.866284', '38.314416', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (580, 52086, 2, 52018, '130903000000', '运河区', '河北,沧州,运河', '116.832276', '38.310143', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (581, 52214, 2, 52018, '130921000000', '沧县', '河北,沧州,沧县', '117.007478', '38.219856', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (582, 52753, 2, 52018, '130922000000', '青县', '河北,沧州,青县', '116.804306', '38.583021', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (583, 53128, 2, 52018, '130923000000', '东光县', '河北,沧州,东光', '116.537067', '37.888248', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (584, 53595, 2, 52018, '130924000000', '海兴县', '河北,沧州,海兴', '117.496606', '38.141582', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (585, 53810, 2, 52018, '130925000000', '盐山县', '河北,沧州,盐山', '117.230603', '38.058088', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (586, 54277, 2, 52018, '130926000000', '肃宁县', '河北,沧州,肃宁', '115.829758', '38.422802', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (587, 54547, 2, 52018, '130927000000', '南皮县', '河北,沧州,南皮', '116.708104', '38.038584', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (588, 54875, 2, 52018, '130928000000', '吴桥县', '河北,沧州,吴桥', '116.391508', '37.627661', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (589, 55369, 2, 52018, '130929000000', '献县', '河北,沧州,献县', '116.122802', '38.190144', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (590, 55902, 2, 52018, '130930000000', '孟村回族自治县', '河北,沧州,孟村', '117.104298', '38.053409', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (591, 56037, 2, 52018, '130981000000', '泊头市', '河北,沧州,泊头', '116.578368', '38.083437', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (592, 56764, 2, 52018, '130982000000', '任丘市', '河北,沧州,任丘', '116.082918', '38.683592', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (593, 57238, 2, 52018, '130983000000', '黄骅市', '河北,沧州,黄骅', '117.330048', '38.371383', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (594, 57596, 2, 52018, '130984000000', '河间市', '河北,沧州,河间', '116.099518', '38.446624', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (595, 58248, 2, 58247, '131001000000', '市辖区', '河北,廊坊', '116.683752', '39.538047', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (596, 58249, 2, 58247, '131002000000', '安次区', '河北,廊坊,安次', '116.694544', '39.502569', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (597, 58567, 2, 58247, '131003000000', '广阳区', '河北,廊坊,广阳', '116.710690', '39.522786', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (598, 58789, 2, 58247, '131022000000', '固安县', '河北,廊坊,固安', '116.298657', '39.438214', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (599, 59228, 2, 58247, '131023000000', '永清县', '河北,廊坊,永清', '116.499028', '39.321794', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (600, 59639, 2, 58247, '131024000000', '香河县', '河北,廊坊,香河', '117.006093', '39.761424', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (601, 59963, 2, 58247, '131025000000', '大城县', '河北,廊坊,大城', '116.653794', '38.705449', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (602, 60378, 2, 58247, '131026000000', '文安县', '河北,廊坊,文安', '116.457858', '38.873281', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (603, 60784, 2, 58247, '131028000000', '大厂回族自治县', '河北,廊坊,大厂', '116.970154', '39.897785', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (604, 60904, 2, 58247, '131081000000', '霸州市', '河北,廊坊,霸州', '116.391386', '39.125898', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (605, 61311, 2, 58247, '131082000000', '三河市', '河北,廊坊,三河', '117.078295', '39.982718', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (606, 61805, 2, 61804, '131101000000', '市辖区', '河北,衡水', '115.670177', '37.738920', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (607, 61806, 2, 61804, '131102000000', '桃城区', '河北,衡水,桃城', '115.675422', '37.735369', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (608, 62086, 2, 61804, '131103000000', '冀州区', '河北,衡水,冀州', '115.670177', '37.738920', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (609, 62479, 2, 61804, '131121000000', '枣强县', '河北,衡水,枣强', '115.724260', '37.513417', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (610, 63050, 2, 61804, '131122000000', '武邑县', '河北,衡水,武邑', '115.887655', '37.801658', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (611, 63584, 2, 61804, '131123000000', '武强县', '河北,衡水,武强', '115.982461', '38.041368', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (612, 63832, 2, 61804, '131124000000', '饶阳县', '河北,衡水,饶阳', '115.725833', '38.235892', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (613, 64040, 2, 61804, '131125000000', '安平县', '河北,衡水,安平', '115.519216', '38.234510', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (614, 64281, 2, 61804, '131126000000', '故城县', '河北,衡水,故城', '115.965874', '37.347410', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (615, 64833, 2, 61804, '131127000000', '景县', '河北,衡水,景县', '116.270648', '37.692290', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (616, 65702, 2, 61804, '131128000000', '阜城县', '河北,衡水,阜城', '116.144418', '37.868872', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (617, 66323, 2, 61804, '131182000000', '深州市', '河北,衡水,深州', '115.559574', '38.001536', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (618, 66814, 2, 66813, '139001000000', '定州市', '河北,定州', '114.990159', '38.516174', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (619, 67371, 2, 66813, '139002000000', '辛集市', '河北,辛集', '115.218057', '37.943315', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (620, 67749, 2, 67748, '140101000000', '市辖区', '山西,太原', '112.548879', '37.870590', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (621, 67750, 2, 67748, '140105000000', '小店区', '山西,太原,小店', '112.565659', '37.736526', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (622, 67921, 2, 67748, '140106000000', '迎泽区', '山西,太原,迎泽', '112.563400', '37.863451', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (623, 68043, 2, 67748, '140107000000', '杏花岭区', '山西,太原,杏花岭', '112.570605', '37.893955', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (624, 68203, 2, 67748, '140108000000', '尖草坪区', '山西,太原,尖草坪', '112.486691', '37.940387', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (625, 68368, 2, 67748, '140109000000', '万柏林区', '山西,太原,万柏林', '112.515748', '37.859447', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (626, 68542, 2, 67748, '140110000000', '晋源区', '山西,太原,晋源', '112.477940', '37.715193', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (627, 68671, 2, 67748, '140121000000', '清徐县', '山西,太原,清徐', '112.358667', '37.607443', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (628, 68893, 2, 67748, '140122000000', '阳曲县', '山西,太原,阳曲', '112.672953', '38.058489', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (629, 69032, 2, 67748, '140123000000', '娄烦县', '山西,太原,娄烦', '111.797083', '38.067932', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (630, 69190, 2, 67748, '140181000000', '古交市', '山西,太原,古交', '112.175875', '37.907109', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (631, 69391, 2, 69390, '140201000000', '市辖区', '山西,大同', '113.612440', '40.040295', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (632, 69392, 2, 69390, '140202000000', '城区', '山西,大同,城区', '113.298027', '40.075667', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (633, 69546, 2, 69390, '140203000000', '矿区', '山西,大同,矿区', '113.612440', '40.040295', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (634, 69691, 2, 69390, '140211000000', '南郊区', '山西,大同,南郊', '113.149693', '40.005405', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (635, 69891, 2, 69390, '140212000000', '新荣区', '山西,大同,新荣', '113.140005', '40.255866', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (636, 70045, 2, 69390, '140221000000', '阳高县', '山西,大同,阳高', '113.748945', '40.361060', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (637, 70336, 2, 69390, '140222000000', '天镇县', '山西,大同,天镇', '114.090867', '40.420237', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (638, 70582, 2, 69390, '140223000000', '广灵县', '山西,大同,广灵', '114.282758', '39.760281', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (639, 70778, 2, 69390, '140224000000', '灵丘县', '山西,大同,灵丘', '114.234350', '39.442406', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (640, 71059, 2, 69390, '140225000000', '浑源县', '山西,大同,浑源', '113.699475', '39.693407', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (641, 71402, 2, 69390, '140226000000', '左云县', '山西,大同,左云', '112.703008', '40.013442', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (642, 71649, 2, 69390, '140227000000', '大同县', '山西,大同,大同', '113.397170', '40.067276', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (643, 71851, 2, 71850, '140301000000', '市辖区', '山西,阳泉', '113.580519', '37.856971', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (644, 71852, 2, 71850, '140302000000', '城区', '山西,阳泉,城区', '113.600670', '37.847437', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (645, 71905, 2, 71850, '140303000000', '矿区', '山西,阳泉,矿区', '113.580519', '37.856971', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (646, 71950, 2, 71850, '140311000000', '郊区', '山西,阳泉,郊区', '113.594164', '37.944679', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (647, 72145, 2, 71850, '140321000000', '平定县', '山西,阳泉,平定', '113.657841', '37.786653', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (648, 72497, 2, 71850, '140322000000', '盂县', '山西,阳泉,盂县', '113.412330', '38.085619', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (649, 72976, 2, 72975, '140401000000', '市辖区', '山西,长治', '113.116255', '36.195386', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (650, 72977, 2, 72975, '140402000000', '城区', '山西,长治,城区', '113.123085', '36.203519', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (651, 73071, 2, 72975, '140411000000', '郊区', '山西,长治,郊区', '113.101211', '36.218388', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (652, 73222, 2, 72975, '140421000000', '长治县', '山西,长治,长治', '113.051407', '36.052858', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (653, 73495, 2, 72975, '140423000000', '襄垣县', '山西,长治,襄垣', '113.051491', '36.535817', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (654, 73840, 2, 72975, '140424000000', '屯留县', '山西,长治,屯留', '112.892151', '36.315929', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (655, 74151, 2, 72975, '140425000000', '平顺县', '山西,长治,平顺', '113.435961', '36.200179', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (656, 74429, 2, 72975, '140426000000', '黎城县', '山西,长治,黎城', '113.387155', '36.502328', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (657, 74694, 2, 72975, '140427000000', '壶关县', '山西,长治,壶关', '113.207049', '36.115449', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (658, 75101, 2, 72975, '140428000000', '长子县', '山西,长治,长子', '112.877900', '36.122334', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (659, 75515, 2, 72975, '140429000000', '武乡县', '山西,长治,武乡', '112.864562', '36.837625', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (660, 75911, 2, 72975, '140430000000', '沁县', '山西,长治,沁县', '112.699226', '36.756064', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (661, 76237, 2, 72975, '140431000000', '沁源县', '山西,长治,沁源', '112.337446', '36.500200', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (662, 76512, 2, 72975, '140481000000', '潞城市', '山西,长治,潞城', '113.228852', '36.334104', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (663, 76727, 2, 76726, '140501000000', '市辖区', '山西,晋城', '112.851831', '35.490701', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (664, 76728, 2, 76726, '140502000000', '城区', '山西,晋城,城区', '112.853555', '35.501572', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (665, 76874, 2, 76726, '140521000000', '沁水县', '山西,晋城,沁水', '112.186739', '35.690141', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (666, 77140, 2, 76726, '140522000000', '阳城县', '山西,晋城,阳城', '112.414738', '35.486029', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (667, 77632, 2, 76726, '140524000000', '陵川县', '山西,晋城,陵川', '113.280688', '35.775685', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (668, 78024, 2, 76726, '140525000000', '泽州县', '山西,晋城,泽州', '112.899137', '35.617221', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (669, 78678, 2, 76726, '140581000000', '高平市', '山西,晋城,高平', '112.923920', '35.797997', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (670, 79164, 2, 79163, '140601000000', '市辖区', '山西,朔州', '112.432825', '39.331595', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (671, 79165, 2, 79163, '140602000000', '朔城区', '山西,朔州,朔城', '112.432250', '39.318940', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (672, 79533, 2, 79163, '140603000000', '平鲁区', '山西,朔州,平鲁', '112.288331', '39.512155', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (673, 79843, 2, 79163, '140621000000', '山阴县', '山西,朔州,山阴', '112.816600', '39.526227', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (674, 80134, 2, 79163, '140622000000', '应县', '山西,朔州,应县', '113.191099', '39.554247', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (675, 80454, 2, 79163, '140623000000', '右玉县', '山西,朔州,右玉', '112.466989', '39.989064', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (676, 80799, 2, 79163, '140624000000', '怀仁县', '山西,朔州,怀仁', '113.099958', '39.827916', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (677, 81001, 2, 81000, '140701000000', '市辖区', '山西,晋中', '112.752694', '37.687024', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (678, 81002, 2, 81000, '140702000000', '榆次区', '山西,晋中,榆次', '112.708241', '37.697792', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (679, 81361, 2, 81000, '140721000000', '榆社县', '山西,晋中,榆社', '112.975287', '37.070788', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (680, 81649, 2, 81000, '140722000000', '左权县', '山西,晋中,左权', '113.379372', '37.082681', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (681, 81872, 2, 81000, '140723000000', '和顺县', '山西,晋中,和顺', '113.570438', '37.329664', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (682, 82183, 2, 81000, '140724000000', '昔阳县', '山西,晋中,昔阳', '113.706875', '37.611210', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (683, 82535, 2, 81000, '140725000000', '寿阳县', '山西,晋中,寿阳', '113.176434', '37.895325', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (684, 82765, 2, 81000, '140726000000', '太谷县', '山西,晋中,太谷', '112.551357', '37.421308', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (685, 82986, 2, 81000, '140727000000', '祁县', '山西,晋中,祁县', '112.335297', '37.358317', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (686, 83165, 2, 81000, '140728000000', '平遥县', '山西,晋中,平遥', '112.176273', '37.189559', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (687, 83472, 2, 81000, '140729000000', '灵石县', '山西,晋中,灵石', '111.778685', '36.847860', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (688, 83810, 2, 81000, '140781000000', '介休市', '山西,晋中,介休', '111.916712', '37.026945', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (689, 84093, 2, 84092, '140801000000', '市辖区', '山西,运城', '111.007528', '35.026412', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (690, 84094, 2, 84092, '140802000000', '盐湖区', '山西,运城,盐湖', '111.007528', '35.026412', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (691, 84483, 2, 84092, '140821000000', '临猗县', '山西,运城,临猗', '110.774547', '35.144277', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (692, 84893, 2, 84092, '140822000000', '万荣县', '山西,运城,万荣', '110.838024', '35.415254', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (693, 85194, 2, 84092, '140823000000', '闻喜县', '山西,运城,闻喜', '111.224720', '35.356644', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (694, 85569, 2, 84092, '140824000000', '稷山县', '山西,运城,稷山', '110.983333', '35.604025', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (695, 85780, 2, 84092, '140825000000', '新绛县', '山西,运城,新绛', '111.224778', '35.616288', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (696, 86023, 2, 84092, '140826000000', '绛县', '山西,运城,绛县', '111.568236', '35.491190', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (697, 86238, 2, 84092, '140827000000', '垣曲县', '山西,运城,垣曲', '111.669917', '35.297620', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (698, 86448, 2, 84092, '140828000000', '夏县', '山西,运城,夏县', '111.220456', '35.141363', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (699, 86706, 2, 84092, '140829000000', '平陆县', '山西,运城,平陆', '111.194133', '34.829260', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (700, 86949, 2, 84092, '140830000000', '芮城县', '山西,运城,芮城', '110.694369', '34.693580', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (701, 87129, 2, 84092, '140881000000', '永济市', '山西,运城,永济', '110.447549', '34.867050', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (702, 87434, 2, 84092, '140882000000', '河津市', '山西,运城,河津', '110.712063', '35.596383', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (703, 87614, 2, 87613, '140901000000', '市辖区', '山西,忻州', '112.734174', '38.416663', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (704, 87615, 2, 87613, '140902000000', '忻府区', '山西,忻州,忻府', '112.746046', '38.404243', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (705, 88061, 2, 87613, '140921000000', '定襄县', '山西,忻州,定襄', '112.957215', '38.473548', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (706, 88227, 2, 87613, '140922000000', '五台县', '山西,忻州,五台', '113.255309', '38.728315', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (707, 88754, 2, 87613, '140923000000', '代县', '山西,忻州,代县', '112.960282', '39.066917', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (708, 89144, 2, 87613, '140924000000', '繁峙县', '山西,忻州,繁峙', '113.265564', '39.188811', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (709, 89570, 2, 87613, '140925000000', '宁武县', '山西,忻州,宁武', '112.304722', '39.001524', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (710, 90066, 2, 87613, '140926000000', '静乐县', '山西,忻州,静乐', '111.939440', '38.359036', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (711, 90462, 2, 87613, '140927000000', '神池县', '山西,忻州,神池', '112.211297', '39.090553', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (712, 90715, 2, 87613, '140928000000', '五寨县', '山西,忻州,五寨', '111.846905', '38.910726', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (713, 90978, 2, 87613, '140929000000', '岢岚县', '山西,忻州,岢岚', '111.572850', '38.704180', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (714, 91193, 2, 87613, '140930000000', '河曲县', '山西,忻州,河曲', '111.138472', '39.384482', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (715, 91548, 2, 87613, '140931000000', '保德县', '山西,忻州,保德', '111.086564', '39.022488', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (716, 91912, 2, 87613, '140932000000', '偏关县', '山西,忻州,偏关', '111.508831', '39.436306', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (717, 92172, 2, 87613, '140981000000', '原平市', '山西,忻州,原平', '112.711059', '38.731402', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (718, 92739, 2, 92738, '141001000000', '市辖区', '山西,临汾', '111.518976', '36.088005', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (719, 92740, 2, 92738, '141002000000', '尧都区', '山西,临汾,尧都', '111.579554', '36.078841', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (720, 93208, 2, 92738, '141021000000', '曲沃县', '山西,临汾,曲沃', '111.475861', '35.641087', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (721, 93375, 2, 92738, '141022000000', '翼城县', '山西,临汾,翼城', '111.718951', '35.738576', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (722, 93604, 2, 92738, '141023000000', '襄汾县', '山西,临汾,襄汾', '111.441725', '35.876293', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (723, 93972, 2, 92738, '141024000000', '洪洞县', '山西,临汾,洪洞', '111.674966', '36.253748', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (724, 94457, 2, 92738, '141025000000', '古县', '山西,临汾,古县', '111.920466', '36.266914', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (725, 94580, 2, 92738, '141026000000', '安泽县', '山西,临汾,安泽', '112.250144', '36.147787', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (726, 94696, 2, 92738, '141027000000', '浮山县', '山西,临汾,浮山', '111.848883', '35.968124', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (727, 94893, 2, 92738, '141028000000', '吉县', '山西,临汾,吉县', '110.681763', '36.098188', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (728, 94981, 2, 92738, '141029000000', '乡宁县', '山西,临汾,乡宁', '110.847021', '35.970389', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (729, 95181, 2, 92738, '141030000000', '大宁县', '山西,临汾,大宁', '110.752903', '36.465133', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (730, 95272, 2, 92738, '141031000000', '隰县', '山西,临汾,隰县', '110.940638', '36.693331', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (731, 95381, 2, 92738, '141032000000', '永和县', '山西,临汾,永和', '110.632007', '36.759507', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (732, 95472, 2, 92738, '141033000000', '蒲县', '山西,临汾,蒲县', '111.096439', '36.411827', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (733, 95579, 2, 92738, '141034000000', '汾西县', '山西,临汾,汾西', '111.563951', '36.652854', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (734, 95715, 2, 92738, '141081000000', '侯马市', '山西,临汾,侯马', '111.372002', '35.619105', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (735, 95828, 2, 92738, '141082000000', '霍州市', '山西,临汾,霍州', '111.755398', '36.568931', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (736, 96065, 2, 96064, '141101000000', '市辖区', '山西,吕梁', '111.144319', '37.518314', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (737, 96066, 2, 96064, '141102000000', '离石区', '山西,吕梁,离石', '111.150733', '37.517641', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (738, 96332, 2, 96064, '141121000000', '文水县', '山西,吕梁,文水', '112.028866', '37.438102', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (739, 96548, 2, 96064, '141122000000', '交城县', '山西,吕梁,交城', '112.155841', '37.551970', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (740, 96711, 2, 96064, '141123000000', '兴县', '山西,吕梁,兴县', '111.127668', '38.462390', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (741, 97113, 2, 96064, '141124000000', '临县', '山西,吕梁,临县', '110.992094', '37.950758', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (742, 97779, 2, 96064, '141125000000', '柳林县', '山西,吕梁,柳林', '110.889071', '37.429832', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (743, 98056, 2, 96064, '141126000000', '石楼县', '山西,吕梁,石楼', '110.834561', '36.997412', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (744, 98201, 2, 96064, '141127000000', '岚县', '山西,吕梁,岚县', '111.671917', '38.279299', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (745, 98383, 2, 96064, '141128000000', '方山县', '山西,吕梁,方山', '111.244098', '37.894631', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (746, 98562, 2, 96064, '141129000000', '中阳县', '山西,吕梁,中阳', '111.179657', '37.357058', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (747, 98670, 2, 96064, '141130000000', '交口县', '山西,吕梁,交口', '111.181151', '36.982186', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (748, 98774, 2, 96064, '141181000000', '孝义市', '山西,吕梁,孝义', '111.778818', '37.146294', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (749, 99219, 2, 96064, '141182000000', '汾阳市', '山西,吕梁,汾阳', '111.769894', '37.261564', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (750, 99539, 2, 99538, '150101000000', '市辖区', '内蒙古,呼和浩特', '111.749180', '40.842585', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (751, 99540, 2, 99538, '150102000000', '新城区', '内蒙古,呼和浩特,新城', '111.665544', '40.858289', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (752, 99624, 2, 99538, '150103000000', '回民区', '内蒙古,呼和浩特,回民', '111.623692', '40.808608', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (753, 99696, 2, 99538, '150104000000', '玉泉区', '内蒙古,呼和浩特,玉泉', '111.673881', '40.753655', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (754, 99807, 2, 99538, '150105000000', '赛罕区', '内蒙古,呼和浩特,赛罕', '111.701857', '40.792097', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (755, 100011, 2, 99538, '150121000000', '土默特左旗', '内蒙古,呼和浩特,土默特左旗', '111.163902', '40.729573', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (756, 100358, 2, 99538, '150122000000', '托克托县', '内蒙古,呼和浩特,托克托', '111.194313', '40.277431', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (757, 100502, 2, 99538, '150123000000', '和林格尔县', '内蒙古,呼和浩特,和林格尔', '111.821843', '40.378787', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (758, 100672, 2, 99538, '150124000000', '清水河县', '内蒙古,呼和浩特,清水河', '111.647609', '39.921095', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (759, 100790, 2, 99538, '150125000000', '武川县', '内蒙古,呼和浩特,武川', '111.451303', '41.096471', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (760, 100905, 2, 100904, '150201000000', '市辖区', '内蒙古,包头', '109.840347', '40.657449', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (761, 100906, 2, 100904, '150202000000', '东河区', '内蒙古,包头,东河', '110.044142', '40.575948', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (762, 101033, 2, 100904, '150203000000', '昆都仑区', '内蒙古,包头,昆都仑', '109.838178', '40.642236', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (763, 101148, 2, 100904, '150204000000', '青山区', '内蒙古,包头,青山', '109.901572', '40.643246', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (764, 101235, 2, 100904, '150205000000', '石拐区', '内蒙古,包头,石拐', '110.060686', '40.676645', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (765, 101268, 2, 100904, '150206000000', '白云鄂博矿区', '内蒙古,包头,白云鄂博', '109.840347', '40.657449', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (766, 101275, 2, 100904, '150207000000', '九原区', '内蒙古,包头,九原', '109.968122', '40.600581', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (767, 101359, 2, 100904, '150221000000', '土默特右旗', '内蒙古,包头,土默特右旗', '110.524263', '40.569426', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (768, 101583, 2, 100904, '150222000000', '固阳县', '内蒙古,包头,固阳', '110.060514', '41.034106', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (769, 101673, 2, 100904, '150223000000', '达尔罕茂明安联合旗', '内蒙古,包头,达尔罕茂明安联合旗', '110.432626', '41.698992', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (770, 101773, 2, 101772, '150301000000', '市辖区', '内蒙古,乌海', '106.794249', '39.655388', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (771, 101774, 2, 101772, '150302000000', '海勃湾区', '内蒙古,乌海,海勃湾', '106.822779', '39.691156', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (772, 101824, 2, 101772, '150303000000', '海南区', '内蒙古,乌海,海南', '106.891424', '39.441364', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (773, 101850, 2, 101772, '150304000000', '乌达区', '内蒙古,乌海,乌达', '106.726099', '39.505925', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (774, 101885, 2, 101884, '150401000000', '市辖区', '内蒙古,赤峰', '118.886856', '42.257817', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (775, 101886, 2, 101884, '150402000000', '红山区', '内蒙古,赤峰,红山', '118.955528', '42.295818', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (776, 101986, 2, 101884, '150403000000', '元宝山区', '内蒙古,赤峰,元宝山', '119.288611', '42.038902', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (777, 102110, 2, 101884, '150404000000', '松山区', '内蒙古,赤峰,松山', '118.931962', '42.286873', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (778, 102434, 2, 101884, '150421000000', '阿鲁科尔沁旗', '内蒙古,赤峰,阿鲁科尔沁旗', '120.065700', '43.872299', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (779, 102714, 2, 101884, '150422000000', '巴林左旗', '内蒙古,赤峰,巴林左旗', '119.379490', '43.971126', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (780, 102913, 2, 101884, '150423000000', '巴林右旗', '内蒙古,赤峰,巴林右旗', '118.665180', '43.534414', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (781, 103097, 2, 101884, '150424000000', '林西县', '内蒙古,赤峰,林西', '118.055450', '43.618120', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (782, 103225, 2, 101884, '150425000000', '克什克腾旗', '内蒙古,赤峰,克什克腾旗', '117.545798', '43.264989', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (783, 103385, 2, 101884, '150426000000', '翁牛特旗', '内蒙古,赤峰,翁牛特旗', '119.006580', '42.936188', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (784, 103647, 2, 101884, '150428000000', '喀喇沁旗', '内蒙古,赤峰,喀喇沁旗', '118.701938', '41.927364', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (785, 103835, 2, 101884, '150429000000', '宁城县', '内蒙古,赤峰,宁城', '119.318876', '41.601375', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (786, 104189, 2, 101884, '150430000000', '敖汉旗', '内蒙古,赤峰,敖汉旗', '119.921604', '42.290782', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (787, 104458, 2, 104457, '150501000000', '市辖区', '内蒙古,通辽', '122.243444', '43.652890', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (788, 104459, 2, 104457, '150502000000', '科尔沁区', '内蒙古,通辽,科尔沁', '122.255675', '43.623077', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (789, 104954, 2, 104457, '150521000000', '科尔沁左翼中旗', '内蒙古,通辽,科尔沁左翼中旗', '123.312265', '44.126626', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (790, 105531, 2, 104457, '150522000000', '科尔沁左翼后旗', '内蒙古,通辽,科尔沁左翼后旗', '122.356749', '42.935159', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (791, 105865, 2, 104457, '150523000000', '开鲁县', '内蒙古,通辽,开鲁', '121.319309', '43.601244', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (792, 106150, 2, 104457, '150524000000', '库伦旗', '内蒙古,通辽,库伦旗', '121.810701', '42.735657', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (793, 106356, 2, 104457, '150525000000', '奈曼旗', '内蒙古,通辽,奈曼旗', '120.658283', '42.867226', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (794, 106746, 2, 104457, '150526000000', '扎鲁特旗', '内蒙古,通辽,扎鲁特旗', '120.911676', '44.556389', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (795, 107028, 2, 104457, '150581000000', '霍林郭勒市', '内蒙古,通辽,霍林郭勒', '119.663534', '45.531726', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (796, 107066, 2, 107065, '150601000000', '市辖区', '内蒙古,鄂尔多斯', '109.781327', '39.608266', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (797, 107067, 2, 107065, '150602000000', '东胜区', '内蒙古,鄂尔多斯,东胜', '109.963339', '39.822507', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (798, 107193, 2, 107065, '150603000000', '康巴什区', '内蒙古,鄂尔多斯,康巴什', '109.999325', '39.809941', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (799, 107213, 2, 107065, '150621000000', '达拉特旗', '内蒙古,鄂尔多斯,达拉特旗', '110.033833', '40.412438', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (800, 107388, 2, 107065, '150622000000', '准格尔旗', '内蒙古,鄂尔多斯,准格尔旗', '111.240171', '39.864362', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (801, 107593, 2, 107065, '150623000000', '鄂托克前旗', '内蒙古,鄂尔多斯,鄂托克前旗', '107.477515', '38.182362', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (802, 107684, 2, 107065, '150624000000', '鄂托克旗', '内蒙古,鄂尔多斯,鄂托克旗', '107.976161', '39.089650', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (803, 107792, 2, 107065, '150625000000', '杭锦旗', '内蒙古,鄂尔多斯,杭锦旗', '108.736208', '39.833309', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (804, 107892, 2, 107065, '150626000000', '乌审旗', '内蒙古,鄂尔多斯,乌审旗', '108.817607', '38.604136', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (805, 107982, 2, 107065, '150627000000', '伊金霍洛旗', '内蒙古,鄂尔多斯,伊金霍洛旗', '109.747740', '39.564660', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (806, 108167, 2, 108166, '150701000000', '市辖区', '内蒙古,呼伦贝尔', '119.765744', '49.211574', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (807, 108168, 2, 108166, '150702000000', '海拉尔区', '内蒙古,呼伦贝尔,海拉尔', '119.736279', '49.212189', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (808, 108232, 2, 108166, '150703000000', '扎赉诺尔区', '内蒙古,呼伦贝尔,扎赉诺尔', '117.670248', '49.510375', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (809, 108260, 2, 108166, '150721000000', '阿荣旗', '内蒙古,呼伦贝尔,阿荣旗', '123.459050', '48.126585', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (810, 108483, 2, 108166, '150722000000', '莫力达瓦达斡尔族自治旗', '内蒙古,呼伦贝尔,莫力达瓦', '123.810423', '48.852112', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (811, 108785, 2, 108166, '150723000000', '鄂伦春自治旗', '内蒙古,呼伦贝尔,鄂伦春自治旗', '123.726201', '50.591842', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (812, 109030, 2, 108166, '150724000000', '鄂温克族自治旗', '内蒙古,呼伦贝尔,鄂温克族自治旗', '119.755213', '49.146588', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (813, 109113, 2, 108166, '150725000000', '陈巴尔虎旗', '内蒙古,呼伦贝尔,陈巴尔虎旗', '119.424026', '49.328916', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (814, 109205, 2, 108166, '150726000000', '新巴尔虎左旗', '内蒙古,呼伦贝尔,新巴尔虎左旗', '118.269820', '48.218241', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (815, 109281, 2, 108166, '150727000000', '新巴尔虎右旗', '内蒙古,呼伦贝尔,新巴尔虎右旗', '116.823690', '48.672101', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (816, 109355, 2, 108166, '150781000000', '满洲里市', '内蒙古,呼伦贝尔,满洲里', '117.378530', '49.597841', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (817, 109393, 2, 108166, '150782000000', '牙克石市', '内蒙古,呼伦贝尔,牙克石', '120.711770', '49.285568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (818, 109490, 2, 108166, '150783000000', '扎兰屯市', '内蒙古,呼伦贝尔,扎兰屯', '122.737467', '48.013733', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (819, 109738, 2, 108166, '150784000000', '额尔古纳市', '内蒙古,呼伦贝尔,额尔古纳', '120.180506', '50.243102', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (820, 109813, 2, 108166, '150785000000', '根河市', '内蒙古,呼伦贝尔,根河', '121.520388', '50.780345', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (821, 109848, 2, 109847, '150801000000', '市辖区', '内蒙古,巴彦淖尔', '107.387657', '40.743213', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (822, 109849, 2, 109847, '150802000000', '临河区', '内蒙古,巴彦淖尔,临河', '107.363919', '40.751187', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (823, 110095, 2, 109847, '150821000000', '五原县', '内蒙古,巴彦淖尔,五原', '108.267562', '41.088422', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (824, 110255, 2, 109847, '150822000000', '磴口县', '内蒙古,巴彦淖尔,磴口', '107.008248', '40.330524', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (825, 110372, 2, 109847, '150823000000', '乌拉特前旗', '内蒙古,巴彦淖尔,乌拉特前旗', '108.652119', '40.737030', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (826, 110557, 2, 109847, '150824000000', '乌拉特中旗', '内蒙古,巴彦淖尔,乌拉特中旗', '108.513645', '41.587732', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (827, 110676, 2, 109847, '150825000000', '乌拉特后旗', '内蒙古,巴彦淖尔,乌拉特后旗', '107.074621', '41.084283', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (828, 110743, 2, 109847, '150826000000', '杭锦后旗', '内蒙古,巴彦淖尔,杭锦后旗', '107.150909', '40.885896', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (829, 110890, 2, 110889, '150901000000', '市辖区', '内蒙古,乌兰察布', '113.132585', '40.994785', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (830, 110891, 2, 110889, '150902000000', '集宁区', '内蒙古,乌兰察布,集宁', '113.123779', '40.990689', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (831, 110998, 2, 110889, '150921000000', '卓资县', '内蒙古,乌兰察布,卓资', '112.577528', '40.894692', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (832, 111127, 2, 110889, '150922000000', '化德县', '内蒙古,乌兰察布,化德', '114.010438', '41.904560', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (833, 111237, 2, 110889, '150923000000', '商都县', '内蒙古,乌兰察布,商都', '113.577816', '41.562113', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (834, 111481, 2, 110889, '150924000000', '兴和县', '内蒙古,乌兰察布,兴和', '113.834173', '40.872301', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (835, 111666, 2, 110889, '150925000000', '凉城县', '内蒙古,乌兰察布,凉城', '112.503971', '40.531555', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (836, 111824, 2, 110889, '150926000000', '察哈尔右翼前旗', '内蒙古,乌兰察布,察哈尔右翼前旗', '113.214733', '40.785631', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (837, 111969, 2, 110889, '150927000000', '察哈尔右翼中旗', '内蒙古,乌兰察布,察哈尔右翼中旗', '112.635577', '41.277462', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (838, 112164, 2, 110889, '150928000000', '察哈尔右翼后旗', '内蒙古,乌兰察布,察哈尔右翼后旗', '113.191035', '41.436069', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (839, 112277, 2, 110889, '150929000000', '四子王旗', '内蒙古,乌兰察布,四子王旗', '111.706618', '41.533462', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (840, 112427, 2, 110889, '150981000000', '丰镇市', '内蒙古,乌兰察布,丰镇', '113.109892', '40.436983', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (841, 112553, 2, 112552, '152201000000', '乌兰浩特市', '内蒙古,兴安,乌兰浩特', '122.093123', '46.072732', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (842, 112694, 2, 112552, '152202000000', '阿尔山市', '内蒙古,兴安,阿尔山', '119.943575', '47.177440', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (843, 112734, 2, 112552, '152221000000', '科尔沁右翼前旗', '内蒙古,兴安,科尔沁右翼前旗', '121.952550', '46.079810', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (844, 113051, 2, 112552, '152222000000', '科尔沁右翼中旗', '内蒙古,兴安,科尔沁右翼中旗', '121.476530', '45.060837', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (845, 113294, 2, 112552, '152223000000', '扎赉特旗', '内蒙古,兴安,扎赉特旗', '122.899656', '46.723237', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (846, 113554, 2, 112552, '152224000000', '突泉县', '内蒙古,兴安,突泉', '121.593799', '45.381930', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (847, 113778, 2, 113777, '152501000000', '二连浩特市', '内蒙古,锡林郭勒,二连浩特', '111.977943', '43.653170', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (848, 113796, 2, 113777, '152502000000', '锡林浩特市', '内蒙古,锡林郭勒,锡林浩特', '116.086032', '43.933411', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (849, 113912, 2, 113777, '152522000000', '阿巴嘎旗', '内蒙古,锡林郭勒,阿巴嘎旗', '114.950248', '44.022995', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (850, 113999, 2, 113777, '152523000000', '苏尼特左旗', '内蒙古,锡林郭勒,苏尼特左旗', '113.667248', '43.859880', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (851, 114065, 2, 113777, '152524000000', '苏尼特右旗', '内蒙古,锡林郭勒,苏尼特右旗', '112.641783', '42.742892', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (852, 114152, 2, 113777, '152525000000', '东乌珠穆沁旗', '内蒙古,锡林郭勒,东乌珠穆沁旗', '116.974494', '45.498221', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (853, 114239, 2, 113777, '152526000000', '西乌珠穆沁旗', '内蒙古,锡林郭勒,西乌珠穆沁旗', '117.608911', '44.587882', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (854, 114358, 2, 113777, '152527000000', '太仆寺旗', '内蒙古,锡林郭勒,太仆寺旗', '115.282986', '41.877136', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (855, 114557, 2, 113777, '152528000000', '镶黄旗', '内蒙古,锡林郭勒,镶黄旗', '113.847287', '42.232371', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (856, 114628, 2, 113777, '152529000000', '正镶白旗', '内蒙古,锡林郭勒,正镶白旗', '115.029849', '42.287471', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (857, 114722, 2, 113777, '152530000000', '正蓝旗', '内蒙古,锡林郭勒,正蓝旗', '115.992470', '42.241638', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (858, 114859, 2, 113777, '152531000000', '多伦县', '内蒙古,锡林郭勒,多伦', '116.485556', '42.203591', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (859, 114941, 2, 114940, '152921000000', '阿拉善左旗', '内蒙古,阿拉善,阿拉善左旗', '105.666293', '38.833411', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (860, 115132, 2, 114940, '152922000000', '阿拉善右旗', '内蒙古,阿拉善,阿拉善右旗', '101.666917', '39.216186', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (861, 115189, 2, 114940, '152923000000', '额济纳旗', '内蒙古,阿拉善,额济纳旗', '101.055590', '41.954347', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (862, 115226, 2, 115225, '210101000000', '市辖区', '辽宁,沈阳', '123.431474', '41.805698', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (863, 115227, 2, 115225, '210102000000', '和平区', '辽宁,沈阳,和平', '123.420382', '41.789809', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (864, 115347, 2, 115225, '210103000000', '沈河区', '辽宁,沈阳,沈河', '123.458897', '41.795655', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (865, 115474, 2, 115225, '210104000000', '大东区', '辽宁,沈阳,大东', '123.469949', '41.805137', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (866, 115612, 2, 115225, '210105000000', '皇姑区', '辽宁,沈阳,皇姑', '123.441970', '41.824796', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (867, 115752, 2, 115225, '210106000000', '铁西区', '辽宁,沈阳,铁西', '123.376301', '41.802914', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (868, 115964, 2, 115225, '210111000000', '苏家屯区', '辽宁,沈阳,苏家屯', '123.344031', '41.664757', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (869, 116159, 2, 115225, '210112000000', '浑南区', '辽宁,沈阳,浑南', '123.449715', '41.714914', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (870, 116399, 2, 115225, '210113000000', '沈北新区', '辽宁,沈阳,沈北', '123.431474', '41.805698', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (871, 116614, 2, 115225, '210114000000', '于洪区', '辽宁,沈阳,于洪', '123.308136', '41.793743', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (872, 116820, 2, 115225, '210115000000', '辽中区', '辽宁,沈阳,辽中', '122.765409', '41.516827', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (873, 117075, 2, 115225, '210123000000', '康平县', '辽宁,沈阳,康平', '123.355701', '42.741005', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (874, 117268, 2, 115225, '210124000000', '法库县', '辽宁,沈阳,法库', '123.440495', '42.500730', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (875, 117530, 2, 115225, '210181000000', '新民市', '辽宁,沈阳,新民', '122.836726', '41.985193', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (876, 117933, 2, 117932, '210201000000', '市辖区', '辽宁,大连', '121.614682', '38.914003', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (877, 117934, 2, 117932, '210202000000', '中山区', '辽宁,大连,中山', '121.644927', '38.918574', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (878, 117997, 2, 117932, '210203000000', '西岗区', '辽宁,大连,西岗', '121.612325', '38.914687', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (879, 118050, 2, 117932, '210204000000', '沙河口区', '辽宁,大连,沙河口', '121.594200', '38.904808', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (880, 118150, 2, 117932, '210211000000', '甘井子区', '辽宁,大连,甘井子', '121.525461', '38.953351', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (881, 118405, 2, 117932, '210212000000', '旅顺口区', '辽宁,大连,旅顺口', '121.261953', '38.851705', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (882, 118523, 2, 117932, '210213000000', '金州区', '辽宁,大连,金州', '121.782769', '39.050460', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (883, 118884, 2, 117932, '210214000000', '普兰店区', '辽宁,大连,普兰店', '121.970512', '39.401551', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (884, 119090, 2, 117932, '210224000000', '长海县', '辽宁,大连,长海', '122.588494', '39.272728', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (885, 119126, 2, 117932, '210281000000', '瓦房店市', '辽宁,大连,瓦房店', '121.979603', '39.627114', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (886, 119483, 2, 117932, '210283000000', '庄河市', '辽宁,大连,庄河', '122.967328', '39.680811', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (887, 119790, 2, 119789, '210301000000', '市辖区', '辽宁,鞍山', '122.994329', '41.108647', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (888, 119791, 2, 119789, '210302000000', '铁东区', '辽宁,鞍山,铁东', '122.991052', '41.089933', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (889, 119915, 2, 119789, '210303000000', '铁西区', '辽宁,鞍山,铁西', '122.969630', '41.119885', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (890, 120021, 2, 119789, '210304000000', '立山区', '辽宁,鞍山,立山', '123.029091', '41.150401', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (891, 120150, 2, 119789, '210311000000', '千山区', '辽宁,鞍山,千山', '122.949298', '41.068909', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (892, 120221, 2, 119789, '210321000000', '台安县', '辽宁,鞍山,台安', '122.436196', '41.412768', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (893, 120401, 2, 119789, '210323000000', '岫岩满族自治县', '辽宁,鞍山,岫岩', '123.280935', '40.290880', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (894, 120634, 2, 119789, '210381000000', '海城市', '辽宁,鞍山,海城', '122.685217', '40.882377', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (895, 121082, 2, 121081, '210401000000', '市辖区', '辽宁,抚顺', '123.957208', '41.880872', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (896, 121083, 2, 121081, '210402000000', '新抚区', '辽宁,抚顺,新抚', '123.912861', '41.862080', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (897, 121181, 2, 121081, '210403000000', '东洲区', '辽宁,抚顺,东洲', '124.038685', '41.853192', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (898, 121326, 2, 121081, '210404000000', '望花区', '辽宁,抚顺,望花', '123.784206', '41.853646', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (899, 121484, 2, 121081, '210411000000', '顺城区', '辽宁,抚顺,顺城', '123.945040', '41.883375', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (900, 121604, 2, 121081, '210421000000', '抚顺县', '辽宁,抚顺,抚顺', '124.097979', '41.922644', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (901, 121710, 2, 121081, '210422000000', '新宾满族自治县', '辽宁,抚顺,新宾', '125.039978', '41.734256', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (902, 121920, 2, 121081, '210423000000', '清原满族自治县', '辽宁,抚顺,清原', '124.924083', '42.100539', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (903, 122143, 2, 122142, '210501000000', '市辖区', '辽宁,本溪', '123.766485', '41.294175', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (904, 122144, 2, 122142, '210502000000', '平山区', '辽宁,本溪,平山', '123.768926', '41.299702', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (905, 122216, 2, 122142, '210503000000', '溪湖区', '辽宁,本溪,溪湖', '123.767647', '41.329219', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (906, 122310, 2, 122142, '210504000000', '明山区', '辽宁,本溪,明山', '123.817212', '41.308710', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (907, 122400, 2, 122142, '210505000000', '南芬区', '辽宁,本溪,南芬', '123.744802', '41.100445', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (908, 122444, 2, 122142, '210521000000', '本溪满族自治县', '辽宁,本溪,本溪', '124.120436', '41.301892', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (909, 122591, 2, 122142, '210522000000', '桓仁满族自治县', '辽宁,本溪,桓仁', '125.361007', '41.267128', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (910, 122731, 2, 122730, '210601000000', '市辖区', '辽宁,丹东', '124.354706', '40.000499', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (911, 122732, 2, 122730, '210602000000', '元宝区', '辽宁,丹东,元宝', '124.395757', '40.136520', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (912, 122785, 2, 122730, '210603000000', '振兴区', '辽宁,丹东,振兴', '124.360264', '40.105194', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (913, 122886, 2, 122730, '210604000000', '振安区', '辽宁,丹东,振安', '124.428162', '40.158267', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (914, 122958, 2, 122730, '210624000000', '宽甸满族自治县', '辽宁,丹东,宽甸', '124.783660', '40.731317', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (915, 123177, 2, 122730, '210681000000', '东港市', '辽宁,丹东,东港', '124.152705', '39.863008', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (916, 123438, 2, 122730, '210682000000', '凤城市', '辽宁,丹东,凤城', '124.066919', '40.452298', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (917, 123699, 2, 123698, '210701000000', '市辖区', '辽宁,锦州', '121.127003', '41.095119', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (918, 123700, 2, 123698, '210702000000', '古塔区', '辽宁,锦州,古塔', '121.128279', '41.117245', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (919, 123778, 2, 123698, '210703000000', '凌河区', '辽宁,锦州,凌河', '121.150877', '41.114990', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (920, 123869, 2, 123698, '210711000000', '太和区', '辽宁,锦州,太和', '121.103892', '41.109147', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (921, 124044, 2, 123698, '210726000000', '黑山县', '辽宁,锦州,黑山', '122.123443', '41.666028', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (922, 124398, 2, 123698, '210727000000', '义县', '辽宁,锦州,义县', '121.239080', '41.533087', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (923, 124670, 2, 123698, '210781000000', '凌海市', '辽宁,锦州,凌海', '121.357730', '41.173400', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (924, 124980, 2, 123698, '210782000000', '北镇市', '辽宁,锦州,北镇', '121.795962', '41.598764', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (925, 125250, 2, 125249, '210801000000', '市辖区', '辽宁,营口', '122.235417', '40.667012', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (926, 125251, 2, 125249, '210802000000', '站前区', '辽宁,营口,站前', '122.258961', '40.672670', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (927, 125305, 2, 125249, '210803000000', '西市区', '辽宁,营口,西市', '122.206414', '40.666408', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (928, 125353, 2, 125249, '210804000000', '鲅鱼圈区', '辽宁,营口,鲅鱼圈', '122.107814', '40.230636', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (929, 125454, 2, 125249, '210811000000', '老边区', '辽宁,营口,老边', '122.379967', '40.680303', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (930, 125520, 2, 125249, '210881000000', '盖州市', '辽宁,营口,盖州', '122.348936', '40.400611', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (931, 125849, 2, 125249, '210882000000', '大石桥市', '辽宁,营口,大石桥', '122.509131', '40.644622', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (932, 126157, 2, 126156, '210901000000', '市辖区', '辽宁,阜新', '121.670323', '42.021619', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (933, 126158, 2, 126156, '210902000000', '海州区', '辽宁,阜新,海州', '121.656255', '42.013242', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (934, 126236, 2, 126156, '210903000000', '新邱区', '辽宁,阜新,新邱', '121.792535', '42.087632', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (935, 126264, 2, 126156, '210904000000', '太平区', '辽宁,阜新,太平', '121.678512', '42.010600', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (936, 126314, 2, 126156, '210905000000', '清河门区', '辽宁,阜新,清河门', '121.416105', '41.783100', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (937, 126349, 2, 126156, '210911000000', '细河区', '辽宁,阜新,细河', '121.680540', '42.025495', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (938, 126417, 2, 126156, '210921000000', '阜新蒙古族自治县', '辽宁,阜新,阜新', '121.757901', '42.065175', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (939, 126845, 2, 126156, '210922000000', '彰武县', '辽宁,阜新,彰武', '122.538793', '42.386544', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (940, 127071, 2, 127070, '211001000000', '市辖区', '辽宁,辽阳', '123.236944', '41.267244', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (941, 127072, 2, 127070, '211002000000', '白塔区', '辽宁,辽阳,白塔', '123.174325', '41.270347', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (942, 127152, 2, 127070, '211003000000', '文圣区', '辽宁,辽阳,文圣', '123.185386', '41.262608', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (943, 127218, 2, 127070, '211004000000', '宏伟区', '辽宁,辽阳,宏伟', '123.196672', '41.217649', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (944, 127266, 2, 127070, '211005000000', '弓长岭区', '辽宁,辽阳,弓长岭', '123.419804', '41.151847', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (945, 127305, 2, 127070, '211011000000', '太子河区', '辽宁,辽阳,太子河', '123.181782', '41.253277', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (946, 127386, 2, 127070, '211021000000', '辽阳县', '辽宁,辽阳,辽阳', '123.105695', '41.205329', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (947, 127612, 2, 127070, '211081000000', '灯塔市', '辽宁,辽阳,灯塔', '123.339312', '41.426372', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (948, 127835, 2, 127834, '211101000000', '市辖区', '辽宁,盘锦', '122.070714', '41.119997', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (949, 127836, 2, 127834, '211102000000', '双台子区', '辽宁,盘锦,双台子', '122.060112', '41.190606', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (950, 127896, 2, 127834, '211103000000', '兴隆台区', '辽宁,盘锦,兴隆台', '122.069897', '41.158678', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (951, 128037, 2, 127834, '211104000000', '大洼区', '辽宁,盘锦,大洼', '122.082575', '41.002279', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (952, 128231, 2, 127834, '211122000000', '盘山县', '辽宁,盘锦,盘山', '121.996499', '41.242873', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (953, 128422, 2, 128421, '211201000000', '市辖区', '辽宁,铁岭', '123.726166', '42.223769', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (954, 128423, 2, 128421, '211202000000', '银州区', '辽宁,铁岭,银州', '123.842305', '42.286130', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (955, 128530, 2, 128421, '211204000000', '清河区', '辽宁,铁岭,清河', '123.726166', '42.223769', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (956, 128591, 2, 128421, '211221000000', '铁岭县', '辽宁,铁岭,铁岭', '123.729004', '42.223383', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (957, 128839, 2, 128421, '211223000000', '西丰县', '辽宁,铁岭,西丰', '124.727393', '42.738030', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (958, 129043, 2, 128421, '211224000000', '昌图县', '辽宁,铁岭,昌图', '124.111100', '42.785791', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (959, 129592, 2, 128421, '211281000000', '调兵山市', '辽宁,铁岭,调兵山', '123.567117', '42.467521', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (960, 129661, 2, 128421, '211282000000', '开原市', '辽宁,铁岭,开原', '124.038268', '42.546307', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (961, 129978, 2, 129977, '211301000000', '市辖区', '辽宁,朝阳', '120.389862', '41.497767', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (962, 129979, 2, 129977, '211302000000', '双塔区', '辽宁,朝阳,双塔', '120.453744', '41.565628', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (963, 130102, 2, 129977, '211303000000', '龙城区', '辽宁,朝阳,龙城', '120.413376', '41.576749', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (964, 130205, 2, 129977, '211321000000', '朝阳县', '辽宁,朝阳,朝阳', '120.389862', '41.497767', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (965, 130534, 2, 129977, '211322000000', '建平县', '辽宁,朝阳,建平', '119.643280', '41.403128', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (966, 130860, 2, 129977, '211324000000', '喀喇沁左翼蒙古族自治县', '辽宁,朝阳,喀喇沁左翼', '120.389862', '41.497767', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (967, 131089, 2, 129977, '211381000000', '北票市', '辽宁,朝阳,北票', '120.770730', '41.800684', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (968, 131425, 2, 129977, '211382000000', '凌源市', '辽宁,朝阳,凌源', '119.401574', '41.245445', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (969, 131739, 2, 131738, '211401000000', '市辖区', '辽宁,葫芦岛', '120.836932', '40.711052', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (970, 131740, 2, 131738, '211402000000', '连山区', '辽宁,葫芦岛,连山', '120.869231', '40.774461', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (971, 131976, 2, 131738, '211403000000', '龙港区', '辽宁,葫芦岛,龙港', '120.893786', '40.735519', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (972, 132073, 2, 131738, '211404000000', '南票区', '辽宁,葫芦岛,南票', '120.749728', '41.107108', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (973, 132258, 2, 131738, '211421000000', '绥中县', '辽宁,葫芦岛,绥中', '120.344229', '40.325659', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (974, 132590, 2, 131738, '211422000000', '建昌县', '辽宁,葫芦岛,建昌', '119.837124', '40.824368', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (975, 132912, 2, 131738, '211481000000', '兴城市', '辽宁,葫芦岛,兴城', '120.728310', '40.614762', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (976, 133210, 2, 86, '220101000000', '市辖区', '吉林,长春', '125.323544', '43.817071', 1, '2021-07-16 11:33:35', '2021-08-16 10:51:30'); -INSERT INTO `eb_system_city` VALUES (977, 133211, 2, 133209, '220102000000', '南关区', '吉林,长春,南关', '125.350173', '43.863989', 1, '2021-07-16 11:33:35', '2021-08-16 14:35:25'); -INSERT INTO `eb_system_city` VALUES (978, 133289, 2, 133209, '220103000000', '宽城区', '吉林,长春,宽城', '125.326578', '43.943614', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (979, 133453, 2, 133209, '220104000000', '朝阳区', '吉林,长春,朝阳', '125.288319', '43.833513', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (980, 133543, 2, 133209, '220105000000', '二道区', '吉林,长春,二道', '125.374217', '43.865596', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (981, 133631, 2, 133209, '220106000000', '绿园区', '吉林,长春,绿园', '125.256136', '43.880975', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (982, 133719, 2, 133209, '220112000000', '双阳区', '吉林,长春,双阳', '125.664662', '43.525311', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (983, 133881, 2, 133209, '220113000000', '九台区', '吉林,长春,九台', '125.839574', '44.151742', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (984, 134236, 2, 133209, '220122000000', '农安县', '吉林,长春,农安', '125.184742', '44.432889', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (985, 134628, 2, 133209, '220182000000', '榆树市', '吉林,长春,榆树', '126.533146', '44.840288', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (986, 135061, 2, 133209, '220183000000', '德惠市', '吉林,长春,德惠', '125.728620', '44.521785', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (987, 135393, 2, 135392, '220201000000', '市辖区', '吉林,吉林', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (988, 135394, 2, 135392, '220202000000', '昌邑区', '吉林,吉林,昌邑', '126.574710', '43.881818', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (989, 135568, 2, 135392, '220203000000', '龙潭区', '吉林,吉林,龙潭', '126.562197', '43.910803', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (990, 135755, 2, 135392, '220204000000', '船营区', '吉林,吉林,船营', '126.540966', '43.833445', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (991, 135885, 2, 135392, '220211000000', '丰满区', '吉林,吉林,丰满', '126.562274', '43.821601', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (992, 135986, 2, 135392, '220221000000', '永吉县', '吉林,吉林,永吉', '126.497741', '43.672582', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (993, 136136, 2, 135392, '220281000000', '蛟河市', '吉林,吉林,蛟河', '127.344501', '43.723713', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (994, 136439, 2, 135392, '220282000000', '桦甸市', '吉林,吉林,桦甸', '126.746310', '42.972097', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (995, 136629, 2, 135392, '220283000000', '舒兰市', '吉林,吉林,舒兰', '126.965607', '44.406106', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (996, 136889, 2, 135392, '220284000000', '磐石市', '吉林,吉林,磐石', '126.060427', '42.946285', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (997, 137207, 2, 137206, '220301000000', '市辖区', '吉林,四平', '124.350398', '43.166419', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (998, 137208, 2, 137206, '220302000000', '铁西区', '吉林,四平,铁西', '124.345722', '43.146155', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (999, 137275, 2, 137206, '220303000000', '铁东区', '吉林,四平,铁东', '124.409622', '43.162048', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1000, 137386, 2, 137206, '220322000000', '梨树县', '吉林,四平,梨树', '124.335390', '43.307060', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1001, 137756, 2, 137206, '220323000000', '伊通满族自治县', '吉林,四平,伊通', '125.305394', '43.345754', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1002, 137973, 2, 137206, '220381000000', '公主岭市', '吉林,四平,公主岭', '124.822830', '43.504687', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1003, 138477, 2, 137206, '220382000000', '双辽市', '吉林,四平,双辽', '123.502724', '43.518302', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1004, 138722, 2, 138721, '220401000000', '市辖区', '吉林,辽源', '125.143532', '42.887918', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1005, 138723, 2, 138721, '220402000000', '龙山区', '吉林,辽源,龙山', '125.136452', '42.901534', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1006, 138780, 2, 138721, '220403000000', '西安区', '吉林,辽源,西安', '125.149283', '42.927265', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1007, 138818, 2, 138721, '220421000000', '东丰县', '吉林,辽源,东丰', '125.530991', '42.676935', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1008, 139072, 2, 138721, '220422000000', '东辽县', '吉林,辽源,东辽', '124.991521', '42.926331', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1009, 139341, 2, 139340, '220501000000', '市辖区', '吉林,通化', '125.939697', '41.728401', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1010, 139342, 2, 139340, '220502000000', '东昌区', '吉林,通化,东昌', '125.955102', '41.728498', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1011, 139405, 2, 139340, '220503000000', '二道江区', '吉林,通化,二道江', '126.042535', '41.774053', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1012, 139453, 2, 139340, '220521000000', '通化县', '吉林,通化,通化', '125.759259', '41.679808', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1013, 139654, 2, 139340, '220523000000', '辉南县', '吉林,通化,辉南', '126.046912', '42.684993', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1014, 139824, 2, 139340, '220524000000', '柳河县', '吉林,通化,柳河', '125.744735', '42.284606', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1015, 140077, 2, 139340, '220581000000', '梅河口市', '吉林,通化,梅河口', '125.683832', '42.530341', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1016, 140432, 2, 139340, '220582000000', '集安市', '吉林,通化,集安', '126.194031', '41.125307', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1017, 140602, 2, 140601, '220601000000', '市辖区', '吉林,白山', '126.423587', '41.939994', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1018, 140603, 2, 140601, '220602000000', '浑江区', '吉林,白山,浑江', '126.416094', '41.945409', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1019, 140714, 2, 140601, '220605000000', '江源区', '吉林,白山,江源', '126.591144', '42.056773', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1020, 140816, 2, 140601, '220621000000', '抚松县', '吉林,白山,抚松', '127.449764', '42.221208', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1021, 141003, 2, 140601, '220622000000', '靖宇县', '吉林,白山,靖宇', '126.813625', '42.388760', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1022, 141140, 2, 140601, '220623000000', '长白朝鲜族自治县', '吉林,白山,长白', '128.200789', '41.420018', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1023, 141237, 2, 140601, '220681000000', '临江市', '吉林,白山,临江', '126.918087', '41.811979', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1024, 141362, 2, 141361, '220701000000', '市辖区', '吉林,松原', '124.825117', '45.141789', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1025, 141363, 2, 141361, '220702000000', '宁江区', '吉林,松原,宁江', '124.817054', '45.171792', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1026, 141560, 2, 141361, '220721000000', '前郭尔罗斯蒙古族自治县', '吉林,松原,前郭尔罗斯', '124.823242', '45.118030', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1027, 141870, 2, 141361, '220722000000', '长岭县', '吉林,松原,长岭', '123.967484', '44.275895', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1028, 142157, 2, 141361, '220723000000', '乾安县', '吉林,松原,乾安', '124.041139', '45.003774', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1029, 142353, 2, 141361, '220781000000', '扶余市', '吉林,松原,扶余', '126.049774', '44.988449', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1030, 142787, 2, 142786, '220801000000', '市辖区', '吉林,白城', '122.839024', '45.619641', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1031, 142788, 2, 142786, '220802000000', '洮北区', '吉林,白城,洮北', '122.851029', '45.621716', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1032, 143021, 2, 142786, '220821000000', '镇赉县', '吉林,白城,镇赉', '123.199890', '45.847435', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1033, 143209, 2, 142786, '220822000000', '通榆县', '吉林,白城,通榆', '123.088239', '44.812911', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1034, 143428, 2, 142786, '220881000000', '洮南市', '吉林,白城,洮南', '122.783779', '45.339113', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1035, 143702, 2, 142786, '220882000000', '大安市', '吉林,白城,大安', '124.292626', '45.506996', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1036, 143991, 2, 143990, '222401000000', '延吉市', '吉林,延边,延吉', '129.508946', '42.891255', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1037, 144147, 2, 143990, '222402000000', '图们市', '吉林,延边,图们', '129.843710', '42.968044', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1038, 144226, 2, 143990, '222403000000', '敦化市', '吉林,延边,敦化', '128.232013', '43.372413', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1039, 144665, 2, 143990, '222404000000', '珲春市', '吉林,延边,珲春', '130.366036', '42.862821', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1040, 144844, 2, 143990, '222405000000', '龙井市', '吉林,延边,龙井', '129.427066', '42.766311', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1041, 144953, 2, 143990, '222406000000', '和龙市', '吉林,延边,和龙', '129.010106', '42.546675', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1042, 145096, 2, 143990, '222424000000', '汪清县', '吉林,延边,汪清', '129.771607', '43.312522', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1043, 145421, 2, 143990, '222426000000', '安图县', '吉林,延边,安图', '128.899807', '43.111964', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1044, 145667, 2, 145666, '230101000000', '市辖区', '黑龙江,哈尔滨', '126.534967', '45.803775', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1045, 145668, 2, 145666, '230102000000', '道里区', '黑龙江,哈尔滨,道里', '126.616957', '45.755777', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1046, 145864, 2, 145666, '230103000000', '南岗区', '黑龙江,哈尔滨,南岗', '126.668788', '45.759970', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1047, 146071, 2, 145666, '230104000000', '道外区', '黑龙江,哈尔滨,道外', '126.649451', '45.792113', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1048, 146266, 2, 145666, '230108000000', '平房区', '黑龙江,哈尔滨,平房', '126.534967', '45.803775', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1049, 146313, 2, 145666, '230109000000', '松北区', '黑龙江,哈尔滨,松北', '126.510275', '45.802756', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1050, 146399, 2, 145666, '230110000000', '香坊区', '黑龙江,哈尔滨,香坊', '126.662593', '45.707716', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1051, 146587, 2, 145666, '230111000000', '呼兰区', '黑龙江,哈尔滨,呼兰', '126.587709', '45.889427', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1052, 146825, 2, 145666, '230112000000', '阿城区', '黑龙江,哈尔滨,阿城', '126.958098', '45.548670', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1053, 147032, 2, 145666, '230113000000', '双城区', '黑龙江,哈尔滨,双城', '126.312745', '45.383263', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1054, 147391, 2, 145666, '230123000000', '依兰县', '黑龙江,哈尔滨,依兰', '129.567985', '46.324534', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1055, 147571, 2, 145666, '230124000000', '方正县', '黑龙江,哈尔滨,方正', '128.829536', '45.851695', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1056, 147676, 2, 145666, '230125000000', '宾县', '黑龙江,哈尔滨,宾县', '127.466634', '45.745918', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1057, 147884, 2, 145666, '230126000000', '巴彦县', '黑龙江,哈尔滨,巴彦', '127.403182', '46.085379', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1058, 148060, 2, 145666, '230127000000', '木兰县', '黑龙江,哈尔滨,木兰', '128.043466', '45.950582', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1059, 148178, 2, 145666, '230128000000', '通河县', '黑龙江,哈尔滨,通河', '128.749352', '45.972425', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1060, 148351, 2, 145666, '230129000000', '延寿县', '黑龙江,哈尔滨,延寿', '128.331644', '45.451897', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1061, 148502, 2, 145666, '230183000000', '尚志市', '黑龙江,哈尔滨,尚志', '128.009895', '45.209586', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1062, 148755, 2, 145666, '230184000000', '五常市', '黑龙江,哈尔滨,五常', '127.167619', '44.931992', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1063, 149080, 2, 149079, '230201000000', '市辖区', '黑龙江,齐齐哈尔', '123.918186', '47.354348', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1064, 149081, 2, 149079, '230202000000', '龙沙区', '黑龙江,齐齐哈尔,龙沙', '123.957531', '47.317309', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1065, 149129, 2, 149079, '230203000000', '建华区', '黑龙江,齐齐哈尔,建华', '123.955464', '47.354364', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1066, 149173, 2, 149079, '230204000000', '铁锋区', '黑龙江,齐齐哈尔,铁锋', '123.978293', '47.340518', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1067, 149231, 2, 149079, '230205000000', '昂昂溪区', '黑龙江,齐齐哈尔,昂昂溪', '123.822401', '47.155160', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1068, 149266, 2, 149079, '230206000000', '富拉尔基区', '黑龙江,齐齐哈尔,富拉尔基', '123.629190', '47.208843', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1069, 149317, 2, 149079, '230207000000', '碾子山区', '黑龙江,齐齐哈尔,碾子山', '122.887775', '47.516872', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1070, 149338, 2, 149079, '230208000000', '梅里斯达斡尔族区', '黑龙江,齐齐哈尔,梅里斯', '123.752910', '47.309537', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1071, 149404, 2, 149079, '230221000000', '龙江县', '黑龙江,齐齐哈尔,龙江', '123.205323', '47.338665', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1072, 149588, 2, 149079, '230223000000', '依安县', '黑龙江,齐齐哈尔,依安', '125.306279', '47.893548', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1073, 149767, 2, 149079, '230224000000', '泰来县', '黑龙江,齐齐哈尔,泰来', '123.416631', '46.393694', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1074, 149896, 2, 149079, '230225000000', '甘南县', '黑龙江,齐齐哈尔,甘南', '123.507429', '47.922406', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1075, 150046, 2, 149079, '230227000000', '富裕县', '黑龙江,齐齐哈尔,富裕', '124.473793', '47.774347', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1076, 150168, 2, 149079, '230229000000', '克山县', '黑龙江,齐齐哈尔,克山', '125.875705', '48.037031', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1077, 150337, 2, 149079, '230230000000', '克东县', '黑龙江,齐齐哈尔,克东', '126.248721', '48.042060', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1078, 150471, 2, 149079, '230231000000', '拜泉县', '黑龙江,齐齐哈尔,拜泉', '126.100213', '47.595851', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1079, 150680, 2, 149079, '230281000000', '讷河市', '黑龙江,齐齐哈尔,讷河', '124.884244', '48.484099', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1080, 150916, 2, 150915, '230301000000', '市辖区', '黑龙江,鸡西', '130.969333', '45.295075', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1081, 150917, 2, 150915, '230302000000', '鸡冠区', '黑龙江,鸡西,鸡冠', '130.980894', '45.304073', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1082, 150984, 2, 150915, '230303000000', '恒山区', '黑龙江,鸡西,恒山', '130.904963', '45.210668', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1083, 151039, 2, 150915, '230304000000', '滴道区', '黑龙江,鸡西,滴道', '130.843613', '45.348764', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1084, 151084, 2, 150915, '230305000000', '梨树区', '黑龙江,鸡西,梨树', '130.696990', '45.092046', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1085, 151113, 2, 150915, '230306000000', '城子河区', '黑龙江,鸡西,城子河', '131.011304', '45.336970', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1086, 151154, 2, 150915, '230307000000', '麻山区', '黑龙江,鸡西,麻山', '130.478187', '45.212088', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1087, 151177, 2, 150915, '230321000000', '鸡东县', '黑龙江,鸡西,鸡东', '131.124080', '45.260412', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1088, 151347, 2, 150915, '230381000000', '虎林市', '黑龙江,鸡西,虎林', '132.937210', '45.762686', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1089, 151577, 2, 150915, '230382000000', '密山市', '黑龙江,鸡西,密山', '131.846636', '45.529775', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1090, 151831, 2, 151830, '230401000000', '市辖区', '黑龙江,鹤岗', '130.297964', '47.349916', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1091, 151832, 2, 151830, '230402000000', '向阳区', '黑龙江,鹤岗,向阳', '130.294309', '47.342478', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1092, 151855, 2, 151830, '230403000000', '工农区', '黑龙江,鹤岗,工农', '130.274684', '47.318781', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1093, 151880, 2, 151830, '230404000000', '南山区', '黑龙江,鹤岗,南山', '130.287057', '47.315127', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1094, 151912, 2, 151830, '230405000000', '兴安区', '黑龙江,鹤岗,兴安', '130.239245', '47.252850', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1095, 151947, 2, 151830, '230406000000', '东山区', '黑龙江,鹤岗,东山', '130.317062', '47.338535', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1096, 152026, 2, 151830, '230407000000', '兴山区', '黑龙江,鹤岗,兴山', '130.303574', '47.357666', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1097, 152047, 2, 151830, '230421000000', '萝北县', '黑龙江,鹤岗,萝北', '130.828626', '47.577495', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1098, 152237, 2, 151830, '230422000000', '绥滨县', '黑龙江,鹤岗,绥滨', '131.852759', '47.289116', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1099, 152414, 2, 152413, '230501000000', '市辖区', '黑龙江,双鸭山', '131.159133', '46.646508', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1100, 152415, 2, 152413, '230502000000', '尖山区', '黑龙江,双鸭山,尖山', '131.158416', '46.646350', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1101, 152469, 2, 152413, '230503000000', '岭东区', '黑龙江,双鸭山,岭东', '131.164724', '46.592721', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1102, 152508, 2, 152413, '230505000000', '四方台区', '黑龙江,双鸭山,四方台', '131.334503', '46.594316', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1103, 152544, 2, 152413, '230506000000', '宝山区', '黑龙江,双鸭山,宝山', '131.401589', '46.577167', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1104, 152590, 2, 152413, '230521000000', '集贤县', '黑龙江,双鸭山,集贤', '131.140483', '46.728377', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1105, 152810, 2, 152413, '230522000000', '友谊县', '黑龙江,双鸭山,友谊', '131.808064', '46.767299', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1106, 152910, 2, 152413, '230523000000', '宝清县', '黑龙江,双鸭山,宝清', '132.197243', '46.326925', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1107, 153142, 2, 152413, '230524000000', '饶河县', '黑龙江,双鸭山,饶河', '134.013872', '46.798164', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1108, 153314, 2, 153313, '230601000000', '市辖区', '黑龙江,大庆', '125.103784', '46.589309', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1109, 153315, 2, 153313, '230602000000', '萨尔图区', '黑龙江,大庆,萨尔图', '125.114643', '46.596356', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1110, 153371, 2, 153313, '230603000000', '龙凤区', '黑龙江,大庆,龙凤', '125.135326', '46.562247', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1111, 153423, 2, 153313, '230604000000', '让胡路区', '黑龙江,大庆,让胡路', '124.870597', '46.652358', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1112, 153513, 2, 153313, '230605000000', '红岗区', '黑龙江,大庆,红岗', '124.891039', '46.398418', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1113, 153561, 2, 153313, '230606000000', '大同区', '黑龙江,大庆,大同', '124.812364', '46.039828', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1114, 153659, 2, 153313, '230621000000', '肇州县', '黑龙江,大庆,肇州', '125.268643', '45.699066', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1115, 153791, 2, 153313, '230622000000', '肇源县', '黑龙江,大庆,肇源', '125.078223', '45.519320', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1116, 153974, 2, 153313, '230623000000', '林甸县', '黑龙江,大庆,林甸', '124.863603', '47.171717', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1117, 154082, 2, 153313, '230624000000', '杜尔伯特蒙古族自治县', '黑龙江,大庆,杜尔伯特', '124.446705', '46.866580', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1118, 154202, 2, 154201, '230701000000', '市辖区', '黑龙江,伊春', '128.841147', '47.727536', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1119, 154203, 2, 154201, '230702000000', '伊春区', '黑龙江,伊春,伊春', '128.907303', '47.728171', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1120, 154252, 2, 154201, '230703000000', '南岔区', '黑龙江,伊春,南岔', '129.283467', '47.138035', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1121, 154342, 2, 154201, '230704000000', '友好区', '黑龙江,伊春,友好', '128.840750', '47.853778', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1122, 154389, 2, 154201, '230705000000', '西林区', '黑龙江,伊春,西林', '129.312851', '47.480735', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1123, 154404, 2, 154201, '230706000000', '翠峦区', '黑龙江,伊春,翠峦', '128.669859', '47.726728', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1124, 154434, 2, 154201, '230707000000', '新青区', '黑龙江,伊春,新青', '129.533600', '48.290455', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1125, 154473, 2, 154201, '230708000000', '美溪区', '黑龙江,伊春,美溪', '129.129314', '47.635090', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1126, 154511, 2, 154201, '230709000000', '金山屯区', '黑龙江,伊春,金山屯', '129.429117', '47.413074', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1127, 154547, 2, 154201, '230710000000', '五营区', '黑龙江,伊春,五营', '129.245344', '48.107910', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1128, 154579, 2, 154201, '230711000000', '乌马河区', '黑龙江,伊春,乌马河', '128.799478', '47.727687', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1129, 154616, 2, 154201, '230712000000', '汤旺河区', '黑龙江,伊春,汤旺河', '129.571108', '48.454651', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1130, 154659, 2, 154201, '230713000000', '带岭区', '黑龙江,伊春,带岭', '129.020793', '47.028397', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1131, 154695, 2, 154201, '230714000000', '乌伊岭区', '黑龙江,伊春,乌伊岭', '129.437920', '48.590323', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1132, 154729, 2, 154201, '230715000000', '红星区', '黑龙江,伊春,红星', '129.390983', '48.239432', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1133, 154759, 2, 154201, '230716000000', '上甘岭区', '黑龙江,伊春,上甘岭', '129.024260', '47.974708', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1134, 154793, 2, 154201, '230722000000', '嘉荫县', '黑龙江,伊春,嘉荫', '130.403564', '48.889109', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1135, 154899, 2, 154201, '230781000000', '铁力市', '黑龙江,伊春,铁力', '128.032422', '46.986640', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1136, 155077, 2, 155076, '230801000000', '市辖区', '黑龙江,佳木斯', '130.318917', '46.799922', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1137, 155078, 2, 155076, '230803000000', '向阳区', '黑龙江,佳木斯,向阳', '130.365346', '46.807790', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1138, 155166, 2, 155076, '230804000000', '前进区', '黑龙江,佳木斯,前进', '130.375063', '46.814103', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1139, 155191, 2, 155076, '230805000000', '东风区', '黑龙江,佳木斯,东风', '130.403664', '46.822572', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1140, 155254, 2, 155076, '230811000000', '郊区', '黑龙江,佳木斯,郊区', '130.327195', '46.810086', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1141, 155435, 2, 155076, '230822000000', '桦南县', '黑龙江,佳木斯,桦南', '130.553343', '46.239185', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1142, 155702, 2, 155076, '230826000000', '桦川县', '黑龙江,佳木斯,桦川', '130.719081', '47.023001', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1143, 155838, 2, 155076, '230828000000', '汤原县', '黑龙江,佳木斯,汤原', '129.905072', '46.730706', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1144, 156034, 2, 155076, '230881000000', '同江市', '黑龙江,佳木斯,同江', '132.510919', '47.642707', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1145, 156209, 2, 155076, '230882000000', '富锦市', '黑龙江,佳木斯,富锦', '132.037686', '47.250108', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1146, 156599, 2, 155076, '230883000000', '抚远市', '黑龙江,佳木斯,抚远', '134.307884', '48.364687', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1147, 156714, 2, 156713, '230901000000', '市辖区', '黑龙江,七台河', '131.003138', '45.771726', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1148, 156715, 2, 156713, '230902000000', '新兴区', '黑龙江,七台河,新兴', '130.932143', '45.815930', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1149, 156815, 2, 156713, '230903000000', '桃山区', '黑龙江,七台河,桃山', '131.020275', '45.765594', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1150, 156865, 2, 156713, '230904000000', '茄子河区', '黑龙江,七台河,茄子河', '131.068075', '45.785215', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1151, 156956, 2, 156713, '230921000000', '勃利县', '黑龙江,七台河,勃利', '130.592093', '45.755507', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1152, 157131, 2, 157130, '231001000000', '市辖区', '黑龙江,牡丹江', '129.633168', '44.551653', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1153, 157132, 2, 157130, '231002000000', '东安区', '黑龙江,牡丹江,东安', '129.626642', '44.581360', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1154, 157170, 2, 157130, '231003000000', '阳明区', '黑龙江,牡丹江,阳明', '129.635615', '44.596104', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1155, 157273, 2, 157130, '231004000000', '爱民区', '黑龙江,牡丹江,爱民', '129.591657', '44.596053', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1156, 157321, 2, 157130, '231005000000', '西安区', '黑龙江,牡丹江,西安', '129.616121', '44.577625', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1157, 157406, 2, 157130, '231025000000', '林口县', '黑龙江,牡丹江,林口', '130.284033', '45.278046', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1158, 157646, 2, 157130, '231081000000', '绥芬河市', '黑龙江,牡丹江,绥芬河', '131.152546', '44.412309', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1159, 157678, 2, 157130, '231083000000', '海林市', '黑龙江,牡丹江,海林', '129.380482', '44.594213', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1160, 157911, 2, 157130, '231084000000', '宁安市', '黑龙江,牡丹江,宁安', '129.482851', '44.340720', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1161, 158233, 2, 157130, '231085000000', '穆棱市', '黑龙江,牡丹江,穆棱', '130.524437', '44.918813', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1162, 158470, 2, 157130, '231086000000', '东宁市', '黑龙江,牡丹江,东宁', '131.122915', '44.087585', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1163, 158624, 2, 158623, '231101000000', '市辖区', '黑龙江,黑河', '127.528560', '50.245329', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1164, 158625, 2, 158623, '231102000000', '爱辉区', '黑龙江,黑河,爱辉', '127.500451', '50.252106', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1165, 158797, 2, 158623, '231121000000', '嫩江县', '黑龙江,黑河,嫩江', '125.221192', '49.185766', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1166, 159105, 2, 158623, '231123000000', '逊克县', '黑龙江,黑河,逊克', '128.478750', '49.564252', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1167, 159220, 2, 158623, '231124000000', '孙吴县', '黑龙江,黑河,孙吴', '127.336304', '49.425652', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1168, 159359, 2, 158623, '231181000000', '北安市', '黑龙江,黑河,北安', '126.491199', '48.241374', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1169, 159526, 2, 158623, '231182000000', '五大连池市', '黑龙江,黑河,五大连池', '126.205516', '48.517257', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1170, 159770, 2, 159769, '231201000000', '市辖区', '黑龙江,绥化', '126.968887', '46.653845', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1171, 159771, 2, 159769, '231202000000', '北林区', '黑龙江,绥化,北林', '126.985593', '46.637344', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1172, 159985, 2, 159769, '231221000000', '望奎县', '黑龙江,绥化,望奎', '126.486076', '46.832719', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1173, 160128, 2, 159769, '231222000000', '兰西县', '黑龙江,绥化,兰西', '126.288113', '46.252447', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1174, 160271, 2, 159769, '231223000000', '青冈县', '黑龙江,绥化,青冈', '126.113860', '46.689671', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1175, 160478, 2, 159769, '231224000000', '庆安县', '黑龙江,绥化,庆安', '127.507825', '46.880102', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1176, 160610, 2, 159769, '231225000000', '明水县', '黑龙江,绥化,明水', '125.906301', '47.173426', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1177, 160744, 2, 159769, '231226000000', '绥棱县', '黑龙江,绥化,绥棱', '127.114832', '47.236015', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1178, 160910, 2, 159769, '231281000000', '安达市', '黑龙江,绥化,安达', '125.352188', '46.423508', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1179, 161079, 2, 159769, '231282000000', '肇东市', '黑龙江,绥化,肇东', '125.961814', '46.051126', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1180, 161331, 2, 159769, '231283000000', '海伦市', '黑龙江,绥化,海伦', '126.973143', '47.461971', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1181, 161652, 2, 161651, '232721000000', '呼玛县', '黑龙江,大兴安岭,呼玛', '126.665319', '51.725637', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1182, 161720, 2, 161651, '232722000000', '塔河县', '黑龙江,大兴安岭,塔河', '124.709996', '52.334457', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1183, 161754, 2, 161651, '232723000000', '漠河县', '黑龙江,大兴安岭,漠河', '122.538592', '52.972272', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1184, 161794, 2, 161793, '310101000000', '黄浦区', '上海,黄浦', '121.484443', '31.231763', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1185, 161988, 2, 161793, '310104000000', '徐汇区', '上海,徐汇', '121.436525', '31.188523', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1186, 162309, 2, 161793, '310105000000', '长宁区', '上海,长宁', '121.424624', '31.220367', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1187, 162505, 2, 161793, '310106000000', '静安区', '上海,静安', '121.459384', '31.247105', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1188, 162794, 2, 161793, '310107000000', '普陀区', '上海,普陀', '121.395555', '31.249840', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1189, 163069, 2, 161793, '310109000000', '虹口区', '上海,虹口', '121.505133', '31.264600', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1190, 163290, 2, 161793, '310110000000', '杨浦区', '上海,杨浦', '121.526077', '31.259541', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1191, 163621, 2, 161793, '310112000000', '闵行区', '上海,闵行', '121.381709', '31.112813', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1192, 164194, 2, 161793, '310113000000', '宝山区', '上海,宝山', '121.489612', '31.405457', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1193, 164682, 2, 161793, '310114000000', '嘉定区', '上海,嘉定', '121.265300', '31.375602', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1194, 165026, 2, 161793, '310115000000', '浦东新区', '上海,浦东', '121.544379', '31.221517', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1195, 166350, 2, 161793, '310116000000', '金山区', '上海,金山', '121.341970', '30.741991', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1196, 166585, 2, 161793, '310117000000', '松江区', '上海,松江', '121.227747', '31.032243', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1197, 166927, 2, 161793, '310118000000', '青浦区', '上海,青浦', '121.124178', '31.150681', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1198, 167228, 2, 161793, '310120000000', '奉贤区', '上海,奉贤', '121.474042', '30.917795', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1199, 167533, 2, 161793, '310151000000', '崇明区', '上海,崇明', '121.473701', '31.230416', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1200, 167906, 2, 167905, '320101000000', '市辖区', '江苏,南京', '118.796877', '32.060255', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1201, 167907, 2, 167905, '320102000000', '玄武区', '江苏,南京,玄武', '118.797861', '32.048687', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1202, 167974, 2, 167905, '320104000000', '秦淮区', '江苏,南京,秦淮', '118.794744', '32.039133', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1203, 168104, 2, 167905, '320105000000', '建邺区', '江苏,南京,建邺', '118.731694', '32.003552', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1204, 168174, 2, 167905, '320106000000', '鼓楼区', '江苏,南京,鼓楼', '118.769790', '32.066336', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1205, 168310, 2, 167905, '320111000000', '浦口区', '江苏,南京,浦口', '118.627895', '32.059093', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1206, 168451, 2, 167905, '320113000000', '栖霞区', '江苏,南京,栖霞', '118.909246', '32.096228', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1207, 168604, 2, 167905, '320114000000', '雨花台区', '江苏,南京,雨花台', '118.779073', '31.991347', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1208, 168704, 2, 167905, '320115000000', '江宁区', '江苏,南京,江宁', '118.839685', '31.953702', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1209, 168925, 2, 167905, '320116000000', '六合区', '江苏,南京,六合', '118.821401', '32.322247', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1210, 169096, 2, 167905, '320117000000', '溧水区', '江苏,南京,溧水', '119.028296', '31.651125', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1211, 169214, 2, 167905, '320118000000', '高淳区', '江苏,南京,高淳', '118.892085', '31.328471', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1212, 169376, 2, 169375, '320201000000', '市辖区', '江苏,无锡', '120.311910', '31.491169', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1213, 169377, 2, 169375, '320205000000', '锡山区', '江苏,无锡,锡山', '120.357858', '31.589715', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1214, 169507, 2, 169375, '320206000000', '惠山区', '江苏,无锡,惠山', '120.298500', '31.681012', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1215, 169628, 2, 169375, '320211000000', '滨湖区', '江苏,无锡,滨湖', '120.282692', '31.527954', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1216, 169751, 2, 169375, '320213000000', '梁溪区', '江苏,无锡,梁溪', '120.296591', '31.575719', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1217, 169924, 2, 169375, '320214000000', '新吴区', '江苏,无锡,新吴', '120.352778', '31.550957', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1218, 170064, 2, 169375, '320281000000', '江阴市', '江苏,无锡,江阴', '120.284939', '31.920658', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1219, 170390, 2, 169375, '320282000000', '宜兴市', '江苏,无锡,宜兴', '119.823308', '31.340637', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1220, 170725, 2, 170724, '320301000000', '市辖区', '江苏,徐州', '117.284124', '34.205768', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1221, 170726, 2, 170724, '320302000000', '鼓楼区', '江苏,徐州,鼓楼', '117.185591', '34.288511', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1222, 170800, 2, 170724, '320303000000', '云龙区', '江苏,徐州,云龙', '117.251560', '34.253167', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1223, 170886, 2, 170724, '320305000000', '贾汪区', '江苏,徐州,贾汪', '117.466687', '34.435506', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1224, 171049, 2, 170724, '320311000000', '泉山区', '江苏,徐州,泉山', '117.193805', '34.244258', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1225, 171182, 2, 170724, '320312000000', '铜山区', '江苏,徐州,铜山', '117.169421', '34.180700', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1226, 171537, 2, 170724, '320321000000', '丰县', '江苏,徐州,丰县', '116.595391', '34.693906', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1227, 171966, 2, 170724, '320322000000', '沛县', '江苏,徐州,沛县', '116.937532', '34.721656', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1228, 172381, 2, 170724, '320324000000', '睢宁县', '江苏,徐州,睢宁', '117.941563', '33.912598', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1229, 172804, 2, 170724, '320381000000', '新沂市', '江苏,徐州,新沂', '118.354537', '34.369580', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1230, 173105, 2, 170724, '320382000000', '邳州市', '江苏,徐州,邳州', '118.012531', '34.338888', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1231, 173636, 2, 173635, '320401000000', '市辖区', '江苏,常州', '119.973987', '31.810689', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1232, 173637, 2, 173635, '320402000000', '天宁区', '江苏,常州,天宁', '119.974991', '31.779619', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1233, 173773, 2, 173635, '320404000000', '钟楼区', '江苏,常州,钟楼', '119.902112', '31.802192', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1234, 173891, 2, 173635, '320411000000', '新北区', '江苏,常州,新北', '119.972182', '31.830641', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1235, 174038, 2, 173635, '320412000000', '武进区', '江苏,常州,武进', '119.942437', '31.701188', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1236, 174347, 2, 173635, '320413000000', '金坛区', '江苏,常州,金坛', '119.597897', '31.723247', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1237, 174508, 2, 173635, '320481000000', '溧阳市', '江苏,常州,溧阳', '119.484211', '31.416911', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1238, 174765, 2, 174764, '320501000000', '市辖区', '江苏,苏州', '120.585315', '31.298886', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1239, 174766, 2, 174764, '320505000000', '虎丘区', '江苏,苏州,虎丘', '120.566833', '31.294845', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1240, 174872, 2, 174764, '320506000000', '吴中区', '江苏,苏州,吴中', '120.631898', '31.264212', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1241, 175088, 2, 174764, '320507000000', '相城区', '江苏,苏州,相城', '120.642663', '31.369088', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1242, 175247, 2, 174764, '320508000000', '姑苏区', '江苏,苏州,姑苏', '120.617296', '31.336392', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1243, 175444, 2, 174764, '320509000000', '吴江区', '江苏,苏州,吴江', '120.645158', '31.138677', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1244, 175765, 2, 174764, '320581000000', '常熟市', '江苏,苏州,常熟', '120.752481', '31.654376', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1245, 176120, 2, 174764, '320582000000', '张家港市', '江苏,苏州,张家港', '120.553200', '31.870405', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1246, 176424, 2, 174764, '320583000000', '昆山市', '江苏,苏州,昆山', '120.980737', '31.385598', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1247, 176763, 2, 174764, '320585000000', '太仓市', '江苏,苏州,太仓', '121.130550', '31.457735', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1248, 176921, 2, 176920, '320601000000', '市辖区', '江苏,南通', '120.894291', '31.980171', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1249, 176922, 2, 176920, '320602000000', '崇川区', '江苏,南通,崇川', '120.857434', '32.009875', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1250, 177040, 2, 176920, '320611000000', '港闸区', '江苏,南通,港闸', '120.818527', '32.032442', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1251, 177119, 2, 176920, '320612000000', '通州区', '江苏,南通,通州', '121.075087', '32.064161', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1252, 177415, 2, 176920, '320621000000', '海安县', '江苏,南通,海安', '120.467370', '32.533549', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1253, 177665, 2, 176920, '320623000000', '如东县', '江苏,南通,如东', '121.185201', '32.331766', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1254, 177946, 2, 176920, '320681000000', '启东市', '江苏,南通,启东', '121.657441', '31.808026', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1255, 178291, 2, 176920, '320682000000', '如皋市', '江苏,南通,如皋', '120.574946', '32.370557', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1256, 178669, 2, 176920, '320684000000', '海门市', '江苏,南通,海门', '121.181615', '31.871173', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1257, 179000, 2, 178999, '320701000000', '市辖区', '江苏,连云港', '119.221611', '34.596653', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1258, 179001, 2, 178999, '320703000000', '连云区', '江苏,连云港,连云', '119.338788', '34.760249', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1259, 179081, 2, 178999, '320706000000', '海州区', '江苏,连云港,海州', '119.193710', '34.606756', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1260, 179296, 2, 178999, '320707000000', '赣榆区', '江苏,连云港,赣榆', '119.173331', '34.841349', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1261, 179786, 2, 178999, '320722000000', '东海县', '江苏,连云港,东海', '118.752842', '34.542309', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1262, 180136, 2, 178999, '320723000000', '灌云县', '江苏,连云港,灌云', '119.239381', '34.284381', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1263, 180493, 2, 178999, '320724000000', '灌南县', '江苏,连云港,灌南', '119.315651', '34.087135', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1264, 180744, 2, 180743, '320801000000', '市辖区', '江苏,淮安', '119.015285', '33.610353', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1265, 180745, 2, 180743, '320803000000', '淮安区', '江苏,淮安,淮安', '119.141099', '33.502869', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1266, 181117, 2, 180743, '320804000000', '淮阴区', '江苏,淮安,淮阴', '119.034725', '33.631893', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1267, 181401, 2, 180743, '320812000000', '清江浦区', '江苏,淮安,清江浦', '119.028099', '33.624341', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1268, 181547, 2, 180743, '320813000000', '洪泽区', '江苏,淮安,洪泽', '119.015285', '33.610353', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1269, 181681, 2, 180743, '320826000000', '涟水县', '江苏,淮安,涟水', '119.260335', '33.780960', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1270, 182092, 2, 180743, '320830000000', '盱眙县', '江苏,淮安,盱眙', '118.544360', '33.011971', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1271, 182372, 2, 180743, '320831000000', '金湖县', '江苏,淮安,金湖', '119.020585', '33.025433', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1272, 182539, 2, 182538, '320901000000', '市辖区', '江苏,盐城', '120.163561', '33.347382', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1273, 182540, 2, 182538, '320902000000', '亭湖区', '江苏,盐城,亭湖', '120.197358', '33.390536', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1274, 182762, 2, 182538, '320903000000', '盐都区', '江苏,盐城,盐都', '120.153898', '33.338094', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1275, 183048, 2, 182538, '320904000000', '大丰区', '江苏,盐城,大丰', '120.500858', '33.200331', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1276, 183334, 2, 182538, '320921000000', '响水县', '江苏,盐城,响水', '119.578364', '34.199479', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1277, 183510, 2, 182538, '320922000000', '滨海县', '江苏,盐城,滨海', '119.820831', '33.990334', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1278, 183829, 2, 182538, '320923000000', '阜宁县', '江苏,盐城,阜宁', '119.802527', '33.759325', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1279, 184188, 2, 182538, '320924000000', '射阳县', '江苏,盐城,射阳', '120.258053', '33.774806', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1280, 184485, 2, 182538, '320925000000', '建湖县', '江苏,盐城,建湖', '119.798581', '33.464204', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1281, 184748, 2, 182538, '320981000000', '东台市', '江苏,盐城,东台', '120.320331', '32.868440', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1282, 185202, 2, 185201, '321001000000', '市辖区', '江苏,扬州', '119.412966', '32.394210', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1283, 185203, 2, 185201, '321002000000', '广陵区', '江苏,扬州,广陵', '119.431849', '32.394720', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1284, 185360, 2, 185201, '321003000000', '邗江区', '江苏,扬州,邗江', '119.398015', '32.377528', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1285, 185555, 2, 185201, '321012000000', '江都区', '江苏,扬州,江都', '119.569989', '32.434672', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1286, 185905, 2, 185201, '321023000000', '宝应县', '江苏,扬州,宝应', '119.360729', '33.240392', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1287, 186203, 2, 185201, '321081000000', '仪征市', '江苏,扬州,仪征', '119.184766', '32.272258', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1288, 186414, 2, 185201, '321084000000', '高邮市', '江苏,扬州,高邮', '119.459161', '32.781659', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1289, 186658, 2, 186657, '321101000000', '市辖区', '江苏,镇江', '119.425836', '32.187849', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1290, 186659, 2, 186657, '321102000000', '京口区', '江苏,镇江,京口', '119.470160', '32.198280', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1291, 186734, 2, 186657, '321111000000', '润州区', '江苏,镇江,润州', '119.411945', '32.195333', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1292, 186817, 2, 186657, '321112000000', '丹徒区', '江苏,镇江,丹徒', '119.433854', '32.131962', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1293, 186919, 2, 186657, '321181000000', '丹阳市', '江苏,镇江,丹阳', '119.606536', '32.010117', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1294, 187149, 2, 186657, '321182000000', '扬中市', '江苏,镇江,扬中', '119.797635', '32.234831', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1295, 187235, 2, 186657, '321183000000', '句容市', '江苏,镇江,句容', '119.168695', '31.944999', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1296, 187442, 2, 187441, '321201000000', '市辖区', '江苏,泰州', '119.923116', '32.455778', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1297, 187443, 2, 187441, '321202000000', '海陵区', '江苏,泰州,海陵', '119.919425', '32.491016', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1298, 187593, 2, 187441, '321203000000', '高港区', '江苏,泰州,高港', '119.881717', '32.318822', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1299, 187693, 2, 187441, '321204000000', '姜堰区', '江苏,泰州,姜堰', '120.127934', '32.509155', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1300, 188035, 2, 187441, '321281000000', '兴化市', '江苏,泰州,兴化', '119.852541', '32.910459', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1301, 188752, 2, 187441, '321282000000', '靖江市', '江苏,泰州,靖江', '120.277138', '31.982751', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1302, 189026, 2, 187441, '321283000000', '泰兴市', '江苏,泰州,泰兴', '120.051744', '32.171854', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1303, 189403, 2, 189402, '321301000000', '市辖区', '江苏,宿迁', '118.275198', '33.963232', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1304, 189404, 2, 189402, '321302000000', '宿城区', '江苏,宿迁,宿城', '118.242534', '33.963029', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1305, 189637, 2, 189402, '321311000000', '宿豫区', '江苏,宿迁,宿豫', '118.330782', '33.946822', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1306, 189850, 2, 189402, '321322000000', '沭阳县', '江苏,宿迁,沭阳', '118.804784', '34.111022', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1307, 190377, 2, 189402, '321323000000', '泗阳县', '江苏,宿迁,泗阳', '118.703038', '33.723140', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1308, 190642, 2, 189402, '321324000000', '泗洪县', '江苏,宿迁,泗洪', '118.223591', '33.476051', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1309, 191021, 2, 191020, '330101000000', '市辖区', '浙江,杭州', '120.155070', '30.274084', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1310, 191022, 2, 191020, '330102000000', '上城区', '浙江,杭州,上城', '120.169329', '30.242312', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1311, 191083, 2, 191020, '330103000000', '下城区', '浙江,杭州,下城', '120.180895', '30.281714', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1312, 191166, 2, 191020, '330104000000', '江干区', '浙江,杭州,江干', '120.205001', '30.257012', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1313, 191360, 2, 191020, '330105000000', '拱墅区', '浙江,杭州,拱墅', '120.141406', '30.319037', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1314, 191479, 2, 191020, '330106000000', '西湖区', '浙江,杭州,西湖', '120.130203', '30.259324', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1315, 191693, 2, 191020, '330108000000', '滨江区', '浙江,杭州,滨江', '120.211816', '30.208560', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1316, 191756, 2, 191020, '330109000000', '萧山区', '浙江,杭州,萧山', '120.264253', '30.183806', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1317, 192388, 2, 191020, '330110000000', '余杭区', '浙江,杭州,余杭', '120.299402', '30.419045', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1318, 192753, 2, 191020, '330111000000', '富阳区', '浙江,杭州,富阳', '119.960076', '30.048692', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1319, 193085, 2, 191020, '330122000000', '桐庐县', '浙江,杭州,桐庐', '119.691434', '29.793535', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1320, 193304, 2, 191020, '330127000000', '淳安县', '浙江,杭州,淳安', '119.041864', '29.608772', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1321, 193766, 2, 191020, '330182000000', '建德市', '浙江,杭州,建德', '119.281164', '29.474871', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1322, 194060, 2, 191020, '330185000000', '临安市', '浙江,杭州,临安', '119.724733', '30.233873', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1323, 194396, 2, 194395, '330201000000', '市辖区', '浙江,宁波', '121.550357', '29.874556', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1324, 194397, 2, 194395, '330203000000', '海曙区', '浙江,宁波,海曙', '121.551066', '29.859772', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1325, 194484, 2, 194395, '330204000000', '江东区', '浙江,宁波,江东', '121.570383', '29.866819', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1326, 194568, 2, 194395, '330205000000', '江北区', '浙江,宁波,江北', '121.555227', '29.886757', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1327, 194747, 2, 194395, '330206000000', '北仑区', '浙江,宁波,北仑', '121.844618', '29.899044', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1328, 195023, 2, 194395, '330211000000', '镇海区', '浙江,宁波,镇海', '121.716540', '29.948998', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1329, 195132, 2, 194395, '330212000000', '鄞州区', '浙江,宁波,鄞州', '121.546603', '29.816511', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1330, 195703, 2, 194395, '330225000000', '象山县', '浙江,宁波,象山', '121.869339', '29.476705', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1331, 196257, 2, 194395, '330226000000', '宁海县', '浙江,宁波,宁海', '121.429477', '29.287939', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1332, 196686, 2, 194395, '330281000000', '余姚市', '浙江,宁波,余姚', '121.154634', '30.037192', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1333, 197031, 2, 194395, '330282000000', '慈溪市', '浙江,宁波,慈溪', '121.266579', '30.169665', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1334, 197440, 2, 194395, '330283000000', '奉化市', '浙江,宁波,奉化', '121.406995', '29.655143', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1335, 197851, 2, 197850, '330301000000', '市辖区', '浙江,温州', '120.699366', '27.994267', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1336, 197852, 2, 197850, '330302000000', '鹿城区', '浙江,温州,鹿城', '120.655135', '28.015455', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1337, 198091, 2, 197850, '330303000000', '龙湾区', '浙江,温州,龙湾', '120.811213', '27.932747', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1338, 198210, 2, 197850, '330304000000', '瓯海区', '浙江,温州,瓯海', '120.614910', '27.966844', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1339, 198508, 2, 197850, '330305000000', '洞头区', '浙江,温州,洞头', '121.157249', '27.836154', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1340, 198619, 2, 197850, '330324000000', '永嘉县', '浙江,温州,永嘉', '120.682144', '28.150591', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1341, 199581, 2, 197850, '330326000000', '平阳县', '浙江,温州,平阳', '120.565793', '27.661918', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1342, 200239, 2, 197850, '330327000000', '苍南县', '浙江,温州,苍南', '120.425766', '27.518280', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1343, 201140, 2, 197850, '330328000000', '文成县', '浙江,温州,文成', '120.091498', '27.786996', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1344, 201556, 2, 197850, '330329000000', '泰顺县', '浙江,温州,泰顺', '119.717649', '27.556884', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1345, 201882, 2, 197850, '330381000000', '瑞安市', '浙江,温州,瑞安', '120.655148', '27.778657', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1346, 202864, 2, 197850, '330382000000', '乐清市', '浙江,温州,乐清', '120.967147', '28.116083', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1347, 203853, 2, 203852, '330401000000', '市辖区', '浙江,嘉兴', '120.755486', '30.746129', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1348, 203854, 2, 203852, '330402000000', '南湖区', '浙江,嘉兴,南湖', '120.783025', '30.747842', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1349, 204008, 2, 203852, '330411000000', '秀洲区', '浙江,嘉兴,秀洲', '120.709018', '30.765168', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1350, 204177, 2, 203852, '330421000000', '嘉善县', '浙江,嘉兴,嘉善', '120.925850', '30.830898', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1351, 204341, 2, 203852, '330424000000', '海盐县', '浙江,嘉兴,海盐', '120.946263', '30.526436', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1352, 204486, 2, 203852, '330481000000', '海宁市', '浙江,嘉兴,海宁', '120.680757', '30.510659', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1353, 204723, 2, 203852, '330482000000', '平湖市', '浙江,嘉兴,平湖', '121.015142', '30.677233', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1354, 204877, 2, 203852, '330483000000', '桐乡市', '浙江,嘉兴,桐乡', '120.565099', '30.630173', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1355, 205102, 2, 205101, '330501000000', '市辖区', '浙江,湖州', '120.086823', '30.894348', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1356, 205103, 2, 205101, '330502000000', '吴兴区', '浙江,湖州,吴兴', '120.185838', '30.857151', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1357, 205449, 2, 205101, '330503000000', '南浔区', '浙江,湖州,南浔', '120.418512', '30.849690', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1358, 205717, 2, 205101, '330521000000', '德清县', '浙江,湖州,德清', '119.977401', '30.542510', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1359, 205910, 2, 205101, '330522000000', '长兴县', '浙江,湖州,长兴', '119.910952', '31.026666', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1360, 206213, 2, 205101, '330523000000', '安吉县', '浙江,湖州,安吉', '119.680353', '30.638675', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1361, 206439, 2, 206438, '330601000000', '市辖区', '浙江,绍兴', '120.580232', '30.029752', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1362, 206440, 2, 206438, '330602000000', '越城区', '浙江,绍兴,越城', '120.582633', '29.988245', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1363, 206875, 2, 206438, '330603000000', '柯桥区', '浙江,绍兴,柯桥', '120.495065', '30.081942', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1364, 207247, 2, 206438, '330604000000', '上虞区', '浙江,绍兴,上虞', '120.868122', '30.033121', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1365, 207715, 2, 206438, '330624000000', '新昌县', '浙江,绍兴,新昌', '120.903866', '29.499832', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1366, 208171, 2, 206438, '330681000000', '诸暨市', '浙江,绍兴,诸暨', '120.246863', '29.708692', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1367, 208733, 2, 206438, '330683000000', '嵊州市', '浙江,绍兴,嵊州', '120.831025', '29.561410', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1368, 209251, 2, 209250, '330701000000', '市辖区', '浙江,金华', '119.647444', '29.079059', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1369, 209252, 2, 209250, '330702000000', '婺城区', '浙江,金华,婺城', '119.571633', '29.086221', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1370, 209949, 2, 209250, '330703000000', '金东区', '浙江,金华,金东', '119.692862', '29.099122', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1371, 210474, 2, 209250, '330723000000', '武义县', '浙江,金华,武义', '119.816318', '28.892721', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1372, 211047, 2, 209250, '330726000000', '浦江县', '浙江,金华,浦江', '119.892222', '29.452477', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1373, 211492, 2, 209250, '330727000000', '磐安县', '浙江,金华,磐安', '120.450178', '29.054048', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1374, 211883, 2, 209250, '330781000000', '兰溪市', '浙江,金华,兰溪', '119.460526', '29.208919', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1375, 212256, 2, 209250, '330782000000', '义乌市', '浙江,金华,义乌', '120.075058', '29.306841', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1376, 213076, 2, 209250, '330783000000', '东阳市', '浙江,金华,东阳', '120.241566', '29.289648', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1377, 213485, 2, 209250, '330784000000', '永康市', '浙江,金华,永康', '120.047651', '28.888555', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1378, 214261, 2, 214260, '330801000000', '市辖区', '浙江,衢州', '118.859457', '28.970079', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1379, 214262, 2, 214260, '330802000000', '柯城区', '浙江,衢州,柯城', '118.871333', '28.968504', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1380, 214536, 2, 214260, '330803000000', '衢江区', '浙江,衢州,衢江', '118.959460', '28.979780', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1381, 214843, 2, 214260, '330822000000', '常山县', '浙江,衢州,常山', '118.511287', '28.901343', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1382, 215051, 2, 214260, '330824000000', '开化县', '浙江,衢州,开化', '118.415495', '29.137337', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1383, 215332, 2, 214260, '330825000000', '龙游县', '浙江,衢州,龙游', '119.172304', '29.028319', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1384, 215624, 2, 214260, '330881000000', '江山市', '浙江,衢州,江山', '118.626974', '28.737223', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1385, 215956, 2, 215955, '330901000000', '市辖区', '浙江,舟山', '122.207215', '29.985295', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1386, 215957, 2, 215955, '330902000000', '定海区', '浙江,舟山,定海', '122.106773', '30.019858', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1387, 216139, 2, 215955, '330903000000', '普陀区', '浙江,舟山,普陀', '122.323867', '29.971760', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1388, 216290, 2, 215955, '330921000000', '岱山县', '浙江,舟山,岱山', '122.226237', '30.264139', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1389, 216394, 2, 215955, '330922000000', '嵊泗县', '浙江,舟山,嵊泗', '122.451382', '30.725686', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1390, 216450, 2, 216449, '331001000000', '市辖区', '浙江,台州', '121.420757', '28.656386', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1391, 216451, 2, 216449, '331002000000', '椒江区', '浙江,台州,椒江', '121.442676', '28.673726', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1392, 216788, 2, 216449, '331003000000', '黄岩区', '浙江,台州,黄岩', '121.261893', '28.650117', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1393, 217324, 2, 216449, '331004000000', '路桥区', '浙江,台州,路桥', '121.365123', '28.582655', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1394, 217666, 2, 216449, '331021000000', '玉环县', '浙江,台州,玉环', '121.231805', '28.135930', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1395, 217998, 2, 216449, '331022000000', '三门县', '浙江,台州,三门', '121.395777', '29.104873', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1396, 218534, 2, 216449, '331023000000', '天台县', '浙江,台州,天台', '121.006725', '29.144079', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1397, 219162, 2, 216449, '331024000000', '仙居县', '浙江,台州,仙居', '120.735081', '28.849213', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1398, 219609, 2, 216449, '331081000000', '温岭市', '浙江,台州,温岭', '121.385604', '28.372506', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1399, 220555, 2, 216449, '331082000000', '临海市', '浙江,台州,临海', '121.145047', '28.858457', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1400, 221611, 2, 221610, '331101000000', '市辖区', '浙江,丽水', '119.922796', '28.467630', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1401, 221612, 2, 221610, '331102000000', '莲都区', '浙江,丽水,莲都', '119.912612', '28.445836', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1402, 221903, 2, 221610, '331121000000', '青田县', '浙江,丽水,青田', '120.289597', '28.139059', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1403, 222380, 2, 221610, '331122000000', '缙云县', '浙江,丽水,缙云', '120.091573', '28.659279', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1404, 222658, 2, 221610, '331123000000', '遂昌县', '浙江,丽水,遂昌', '119.276104', '28.592119', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1405, 222890, 2, 221610, '331124000000', '松阳县', '浙江,丽水,松阳', '119.482015', '28.449171', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1406, 223324, 2, 221610, '331125000000', '云和县', '浙江,丽水,云和', '119.573397', '28.115790', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1407, 223512, 2, 221610, '331126000000', '庆元县', '浙江,丽水,庆元', '119.062590', '27.619220', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1408, 223885, 2, 221610, '331127000000', '景宁畲族自治县', '浙江,丽水,景宁', '119.635697', '27.973312', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1409, 224172, 2, 221610, '331181000000', '龙泉市', '浙江,丽水,龙泉', '119.141461', '28.074623', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1410, 224651, 2, 224650, '340101000000', '市辖区', '安徽,合肥', '117.227239', '31.820586', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1411, 224652, 2, 224650, '340102000000', '瑶海区', '安徽,合肥,瑶海', '117.309229', '31.858048', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1412, 224755, 2, 224650, '340103000000', '庐阳区', '安徽,合肥,庐阳', '117.264595', '31.878641', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1413, 224838, 2, 224650, '340104000000', '蜀山区', '安徽,合肥,蜀山', '117.260536', '31.851158', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1414, 224946, 2, 224650, '340111000000', '包河区', '安徽,合肥,包河', '117.309658', '31.793093', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1415, 225062, 2, 224650, '340121000000', '长丰县', '安徽,合肥,长丰', '117.167564', '32.478018', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1416, 225352, 2, 224650, '340122000000', '肥东县', '安徽,合肥,肥东', '117.469383', '31.887940', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1417, 225705, 2, 224650, '340123000000', '肥西县', '安徽,合肥,肥西', '117.157981', '31.706810', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1418, 225998, 2, 224650, '340124000000', '庐江县', '安徽,合肥,庐江', '117.287800', '31.255550', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1419, 226249, 2, 224650, '340181000000', '巢湖市', '安徽,合肥,巢湖', '117.861800', '31.598628', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1420, 226470, 2, 226469, '340201000000', '市辖区', '安徽,芜湖', '118.432941', '31.352859', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1421, 226471, 2, 226469, '340202000000', '镜湖区', '安徽,芜湖,镜湖', '118.385146', '31.340404', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1422, 226550, 2, 226469, '340203000000', '弋江区', '安徽,芜湖,弋江', '118.372655', '31.311757', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1423, 226612, 2, 226469, '340207000000', '鸠江区', '安徽,芜湖,鸠江', '118.391734', '31.369373', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1424, 226735, 2, 226469, '340208000000', '三山区', '安徽,芜湖,三山', '118.268101', '31.219568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1425, 226786, 2, 226469, '340221000000', '芜湖县', '安徽,芜湖,芜湖', '118.576124', '31.134809', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1426, 226891, 2, 226469, '340222000000', '繁昌县', '安徽,芜湖,繁昌', '118.201349', '31.080896', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1427, 226995, 2, 226469, '340223000000', '南陵县', '安徽,芜湖,南陵', '118.334360', '30.914923', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1428, 227183, 2, 226469, '340225000000', '无为县', '安徽,芜湖,无为', '117.902366', '31.303168', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1429, 227483, 2, 227482, '340301000000', '市辖区', '安徽,蚌埠', '117.389719', '32.916287', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1430, 227484, 2, 227482, '340302000000', '龙子湖区', '安徽,蚌埠,龙子湖', '117.393790', '32.943014', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1431, 227551, 2, 227482, '340303000000', '蚌山区', '安徽,蚌埠,蚌山', '117.367614', '32.944198', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1432, 227598, 2, 227482, '340304000000', '禹会区', '安徽,蚌埠,禹会', '117.342451', '32.929711', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1433, 227677, 2, 227482, '340311000000', '淮上区', '安徽,蚌埠,淮上', '117.359331', '32.965435', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1434, 227769, 2, 227482, '340321000000', '怀远县', '安徽,蚌埠,怀远', '117.205234', '32.970031', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1435, 228155, 2, 227482, '340322000000', '五河县', '安徽,蚌埠,五河', '117.879486', '33.127823', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1436, 228388, 2, 227482, '340323000000', '固镇县', '安徽,蚌埠,固镇', '117.316955', '33.316899', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1437, 228631, 2, 228630, '340401000000', '市辖区', '安徽,淮南', '116.999932', '32.625478', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1438, 228632, 2, 228630, '340402000000', '大通区', '安徽,淮南,大通', '117.053273', '32.631533', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1439, 228710, 2, 228630, '340403000000', '田家庵区', '安徽,淮南,田家庵', '117.017409', '32.647155', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1440, 228853, 2, 228630, '340404000000', '谢家集区', '安徽,淮南,谢家集', '116.859048', '32.599901', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1441, 228960, 2, 228630, '340405000000', '八公山区', '安徽,淮南,八公山', '116.833490', '32.631379', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1442, 229029, 2, 228630, '340406000000', '潘集区', '安徽,淮南,潘集', '116.834716', '32.772080', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1443, 229221, 2, 228630, '340421000000', '凤台县', '安徽,淮南,凤台', '116.711051', '32.709445', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1444, 229527, 2, 228630, '340422000000', '寿县', '安徽,淮南,寿县', '116.787141', '32.573306', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1445, 229845, 2, 229844, '340501000000', '市辖区', '安徽,马鞍山', '118.506759', '31.670452', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1446, 229846, 2, 229844, '340503000000', '花山区', '安徽,马鞍山,花山', '118.492562', '31.719710', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1447, 229922, 2, 229844, '340504000000', '雨山区', '安徽,马鞍山,雨山', '118.498560', '31.682208', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1448, 229992, 2, 229844, '340506000000', '博望区', '安徽,马鞍山,博望', '118.844538', '31.558471', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1449, 230041, 2, 229844, '340521000000', '当涂县', '安徽,马鞍山,当涂', '118.497972', '31.571213', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1450, 230213, 2, 229844, '340522000000', '含山县', '安徽,马鞍山,含山', '118.101421', '31.735599', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1451, 230345, 2, 229844, '340523000000', '和县', '安徽,马鞍山,和县', '118.351405', '31.741794', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1452, 230477, 2, 230476, '340601000000', '市辖区', '安徽,淮北', '116.798265', '33.955844', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1453, 230478, 2, 230476, '340602000000', '杜集区', '安徽,淮北,杜集', '116.828134', '33.991451', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1454, 230539, 2, 230476, '340603000000', '相山区', '安徽,淮北,相山', '116.794345', '33.959893', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1455, 230648, 2, 230476, '340604000000', '烈山区', '安徽,淮北,烈山', '116.813042', '33.895139', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1456, 230720, 2, 230476, '340621000000', '濉溪县', '安徽,淮北,濉溪', '116.766299', '33.915477', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1457, 230982, 2, 230981, '340701000000', '市辖区', '安徽,铜陵', '117.812079', '30.945429', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1458, 230983, 2, 230981, '340705000000', '铜官区', '安徽,铜陵,铜官', '117.816174', '30.927608', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1459, 231043, 2, 230981, '340706000000', '义安区', '安徽,铜陵,义安', '117.791544', '30.952823', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1460, 231171, 2, 230981, '340711000000', '郊区', '安徽,铜陵,郊区', '117.807070', '30.908927', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1461, 231216, 2, 230981, '340722000000', '枞阳县', '安徽,铜陵,枞阳', '117.220200', '30.700733', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1462, 231500, 2, 231499, '340801000000', '市辖区', '安徽,安庆', '117.063754', '30.543494', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1463, 231501, 2, 231499, '340802000000', '迎江区', '安徽,安庆,迎江', '117.091150', '30.511548', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1464, 231558, 2, 231499, '340803000000', '大观区', '安徽,安庆,大观', '117.021670', '30.553957', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1465, 231646, 2, 231499, '340811000000', '宜秀区', '安徽,安庆,宜秀', '117.070003', '30.541323', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1466, 231710, 2, 231499, '340822000000', '怀宁县', '安徽,安庆,怀宁', '116.829475', '30.733825', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1467, 231974, 2, 231499, '340824000000', '潜山县', '安徽,安庆,潜山', '116.581270', '30.631129', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1468, 232180, 2, 231499, '340825000000', '太湖县', '安徽,安庆,太湖', '116.308795', '30.454220', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1469, 232386, 2, 231499, '340826000000', '宿松县', '安徽,安庆,宿松', '116.129105', '30.153746', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1470, 232631, 2, 231499, '340827000000', '望江县', '安徽,安庆,望江', '116.694183', '30.124428', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1471, 232781, 2, 231499, '340828000000', '岳西县', '安徽,安庆,岳西', '116.359921', '30.849442', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1472, 232996, 2, 231499, '340881000000', '桐城市', '安徽,安庆,桐城', '116.974120', '31.035800', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1473, 233237, 2, 233236, '341001000000', '市辖区', '安徽,黄山', '118.337481', '29.714655', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1474, 233238, 2, 233236, '341002000000', '屯溪区', '安徽,黄山,屯溪', '118.315329', '29.696109', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1475, 233321, 2, 233236, '341003000000', '黄山区', '安徽,黄山,黄山', '118.141568', '30.272942', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1476, 233423, 2, 233236, '341004000000', '徽州区', '安徽,黄山,徽州', '118.336751', '29.827279', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1477, 233487, 2, 233236, '341021000000', '歙县', '安徽,黄山,歙县', '118.415356', '29.861308', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1478, 233714, 2, 233236, '341022000000', '休宁县', '安徽,黄山,休宁', '118.199179', '29.789095', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1479, 233894, 2, 233236, '341023000000', '黟县', '安徽,黄山,黟县', '117.938373', '29.924805', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1480, 233973, 2, 233236, '341024000000', '祁门县', '安徽,黄山,祁门', '117.717396', '29.854055', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1481, 234110, 2, 234109, '341101000000', '市辖区', '安徽,滁州', '118.317106', '32.301556', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1482, 234111, 2, 234109, '341102000000', '琅琊区', '安徽,滁州,琅琊', '118.305843', '32.294530', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1483, 234174, 2, 234109, '341103000000', '南谯区', '安徽,滁州,南谯', '118.296955', '32.329842', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1484, 234274, 2, 234109, '341122000000', '来安县', '安徽,滁州,来安', '118.435792', '32.452172', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1485, 234434, 2, 234109, '341124000000', '全椒县', '安徽,滁州,全椒', '118.273090', '32.085407', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1486, 234560, 2, 234109, '341125000000', '定远县', '安徽,滁州,定远', '117.698563', '32.530982', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1487, 234847, 2, 234109, '341126000000', '凤阳县', '安徽,滁州,凤阳', '117.531623', '32.874735', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1488, 235112, 2, 234109, '341181000000', '天长市', '安徽,滁州,天长', '119.004817', '32.667571', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1489, 235305, 2, 234109, '341182000000', '明光市', '安徽,滁州,明光', '118.018276', '32.781995', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1490, 235484, 2, 235483, '341201000000', '市辖区', '安徽,阜阳', '115.814204', '32.890124', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1491, 235485, 2, 235483, '341202000000', '颍州区', '安徽,阜阳,颍州', '115.806942', '32.883468', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1492, 235646, 2, 235483, '341203000000', '颍东区', '安徽,阜阳,颍东', '115.856687', '32.912478', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1493, 235778, 2, 235483, '341204000000', '颍泉区', '安徽,阜阳,颍泉', '115.808327', '32.924918', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1494, 235909, 2, 235483, '341221000000', '临泉县', '安徽,阜阳,临泉', '115.261473', '33.040261', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1495, 236338, 2, 235483, '341222000000', '太和县', '安徽,阜阳,太和', '115.621934', '33.160326', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1496, 236685, 2, 235483, '341225000000', '阜南县', '安徽,阜阳,阜南', '115.595644', '32.658297', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1497, 237046, 2, 235483, '341226000000', '颍上县', '安徽,阜阳,颍上', '116.256789', '32.653255', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1498, 237428, 2, 235483, '341282000000', '界首市', '安徽,阜阳,界首', '115.374564', '33.257013', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1499, 237608, 2, 237607, '341301000000', '市辖区', '安徽,宿州', '116.964356', '33.646373', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1500, 237609, 2, 237607, '341302000000', '埇桥区', '安徽,宿州,埇桥', '116.977463', '33.640061', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1501, 238022, 2, 237607, '341321000000', '砀山县', '安徽,宿州,砀山', '116.367095', '34.442561', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1502, 238207, 2, 237607, '341322000000', '萧县', '安徽,宿州,萧县', '116.947290', '34.188728', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1503, 238533, 2, 237607, '341323000000', '灵璧县', '安徽,宿州,灵璧', '117.552462', '33.552998', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1504, 238872, 2, 237607, '341324000000', '泗县', '安徽,宿州,泗县', '117.910629', '33.482982', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1505, 239085, 2, 239084, '341501000000', '市辖区', '安徽,六安', '116.521854', '31.733699', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1506, 239086, 2, 239084, '341502000000', '金安区', '安徽,六安,金安', '116.539679', '31.749265', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1507, 239450, 2, 239084, '341503000000', '裕安区', '安徽,六安,裕安', '116.479920', '31.737813', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1508, 239780, 2, 239084, '341504000000', '叶集区', '安徽,六安,叶集', '116.521854', '31.733699', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1509, 239834, 2, 239084, '341522000000', '霍邱县', '安徽,六安,霍邱', '116.277912', '32.353038', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1510, 240310, 2, 239084, '341523000000', '舒城县', '安徽,六安,舒城', '116.948623', '31.462027', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1511, 240759, 2, 239084, '341524000000', '金寨县', '安徽,六安,金寨', '115.934366', '31.727170', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1512, 241016, 2, 239084, '341525000000', '霍山县', '安徽,六安,霍山', '116.332951', '31.392786', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1513, 241181, 2, 241180, '341601000000', '市辖区', '安徽,亳州', '115.778676', '33.844582', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1514, 241182, 2, 241180, '341602000000', '谯城区', '安徽,亳州,谯城', '115.779025', '33.876235', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1515, 241517, 2, 241180, '341621000000', '涡阳县', '安徽,亳州,涡阳', '116.215665', '33.492921', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1516, 241927, 2, 241180, '341622000000', '蒙城县', '安徽,亳州,蒙城', '116.564248', '33.265831', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1517, 242245, 2, 241180, '341623000000', '利辛县', '安徽,亳州,利辛', '116.208635', '33.144724', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1518, 242635, 2, 242634, '341701000000', '市辖区', '安徽,池州', '117.491568', '30.664800', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1519, 242636, 2, 242634, '341702000000', '贵池区', '安徽,池州,贵池', '117.567379', '30.687181', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1520, 242888, 2, 242634, '341721000000', '东至县', '安徽,池州,东至', '117.027533', '30.111182', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1521, 243159, 2, 242634, '341722000000', '石台县', '安徽,池州,石台', '117.486306', '30.210313', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1522, 243254, 2, 242634, '341723000000', '青阳县', '安徽,池州,青阳', '117.847362', '30.639230', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1523, 243400, 2, 243399, '341801000000', '市辖区', '安徽,宣城', '118.758816', '30.940718', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1524, 243401, 2, 243399, '341802000000', '宣州区', '安徽,宣城,宣州', '118.756328', '30.946319', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1525, 243636, 2, 243399, '341821000000', '郎溪县', '安徽,宣城,郎溪', '119.179657', '31.126412', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1526, 243753, 2, 243399, '341822000000', '广德县', '安徽,宣城,广德', '119.420935', '30.877555', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1527, 243902, 2, 243399, '341823000000', '泾县', '安徽,宣城,泾县', '118.419864', '30.688578', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1528, 244058, 2, 243399, '341824000000', '绩溪县', '安徽,宣城,绩溪', '118.578519', '30.067533', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1529, 244153, 2, 243399, '341825000000', '旌德县', '安徽,宣城,旌德', '118.540487', '30.286350', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1530, 244232, 2, 243399, '341881000000', '宁国市', '安徽,宣城,宁国', '118.982915', '30.633571', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1531, 244379, 2, 244378, '350101000000', '市辖区', '福建,福州', '119.296494', '26.074507', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1532, 244380, 2, 244378, '350102000000', '鼓楼区', '福建,福州,鼓楼', '119.303822', '26.082294', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1533, 244460, 2, 244378, '350103000000', '台江区', '福建,福州,台江', '119.314054', '26.052842', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1534, 244523, 2, 244378, '350104000000', '仓山区', '福建,福州,仓山', '119.273546', '26.046744', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1535, 244713, 2, 244378, '350105000000', '马尾区', '福建,福州,马尾', '119.455589', '25.989500', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1536, 244793, 2, 244378, '350111000000', '晋安区', '福建,福州,晋安', '119.328515', '26.082105', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1537, 244987, 2, 244378, '350121000000', '闽侯县', '福建,福州,闽侯', '119.131725', '26.150047', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1538, 245329, 2, 244378, '350122000000', '连江县', '福建,福州,连江', '119.539704', '26.197364', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1539, 245633, 2, 244378, '350123000000', '罗源县', '福建,福州,罗源', '119.549776', '26.489559', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1540, 245845, 2, 244378, '350124000000', '闽清县', '福建,福州,闽清', '118.863361', '26.221198', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1541, 246154, 2, 244378, '350125000000', '永泰县', '福建,福州,永泰', '118.932592', '25.866695', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1542, 246443, 2, 244378, '350128000000', '平潭县', '福建,福州,平潭', '119.790168', '25.498720', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1543, 246667, 2, 244378, '350181000000', '福清市', '福建,福州,福清', '119.384334', '25.721143', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1544, 247200, 2, 244378, '350182000000', '长乐市', '福建,福州,长乐', '119.523266', '25.962888', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1545, 247479, 2, 247478, '350201000000', '市辖区', '福建,厦门', '118.089425', '24.479833', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1546, 247480, 2, 247478, '350203000000', '思明区', '福建,厦门,思明', '118.082658', '24.445567', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1547, 247590, 2, 247478, '350205000000', '海沧区', '福建,厦门,海沧', '118.032818', '24.484503', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1548, 247641, 2, 247478, '350206000000', '湖里区', '福建,厦门,湖里', '118.146769', '24.512905', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1549, 247704, 2, 247478, '350211000000', '集美区', '福建,厦门,集美', '118.097337', '24.575970', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1550, 247782, 2, 247478, '350212000000', '同安区', '福建,厦门,同安', '118.152149', '24.722747', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1551, 247933, 2, 247478, '350213000000', '翔安区', '福建,厦门,翔安', '118.248034', '24.618544', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1552, 248060, 2, 248059, '350301000000', '市辖区', '福建,莆田', '119.007777', '25.454084', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1553, 248061, 2, 248059, '350302000000', '城厢区', '福建,莆田,城厢', '118.993885', '25.419319', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1554, 248189, 2, 248059, '350303000000', '涵江区', '福建,莆田,涵江', '119.116290', '25.458720', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1555, 248403, 2, 248059, '350304000000', '荔城区', '福建,莆田,荔城', '119.015123', '25.431979', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1556, 248540, 2, 248059, '350305000000', '秀屿区', '福建,莆田,秀屿', '119.105528', '25.318672', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1557, 248753, 2, 248059, '350322000000', '仙游县', '福建,莆田,仙游', '118.691601', '25.362094', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1558, 249099, 2, 249098, '350401000000', '市辖区', '福建,三明', '117.638678', '26.263406', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1559, 249100, 2, 249098, '350402000000', '梅列区', '福建,三明,梅列', '117.645856', '26.271711', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1560, 249157, 2, 249098, '350403000000', '三元区', '福建,三明,三元', '117.608045', '26.234020', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1561, 249245, 2, 249098, '350421000000', '明溪县', '福建,三明,明溪', '117.201847', '26.357379', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1562, 249351, 2, 249098, '350423000000', '清流县', '福建,三明,清流', '116.816909', '26.177797', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1563, 249484, 2, 249098, '350424000000', '宁化县', '福建,三明,宁化', '116.654365', '26.261754', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1564, 249728, 2, 249098, '350425000000', '大田县', '福建,三明,大田', '117.847115', '25.692699', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1565, 250026, 2, 249098, '350426000000', '尤溪县', '福建,三明,尤溪', '118.190467', '26.170171', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1566, 250307, 2, 249098, '350427000000', '沙县', '福建,三明,沙县', '117.792450', '26.397300', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1567, 250512, 2, 249098, '350428000000', '将乐县', '福建,三明,将乐', '117.471373', '26.728953', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1568, 250680, 2, 249098, '350429000000', '泰宁县', '福建,三明,泰宁', '117.175740', '26.900259', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1569, 250809, 2, 249098, '350430000000', '建宁县', '福建,三明,建宁', '116.846084', '26.830902', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1570, 250920, 2, 249098, '350481000000', '永安市', '福建,三明,永安', '117.365053', '25.941937', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1571, 251198, 2, 251197, '350501000000', '市辖区', '福建,泉州', '118.675675', '24.874132', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1572, 251199, 2, 251197, '350502000000', '鲤城区', '福建,泉州,鲤城', '118.586884', '24.907581', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1573, 251289, 2, 251197, '350503000000', '丰泽区', '福建,泉州,丰泽', '118.613173', '24.891173', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1574, 251376, 2, 251197, '350504000000', '洛江区', '福建,泉州,洛江', '118.671193', '24.939796', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1575, 251470, 2, 251197, '350505000000', '泉港区', '福建,泉州,泉港', '118.916309', '25.119815', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1576, 251580, 2, 251197, '350521000000', '惠安县', '福建,泉州,惠安', '118.796605', '25.030781', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1577, 251897, 2, 251197, '350524000000', '安溪县', '福建,泉州,安溪', '118.186289', '25.055955', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1578, 252406, 2, 251197, '350525000000', '永春县', '福建,泉州,永春', '118.294048', '25.321565', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1579, 252665, 2, 251197, '350526000000', '德化县', '福建,泉州,德化', '118.241094', '25.491494', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1580, 252894, 2, 251197, '350527000000', '金门县', '福建,泉州,金门', '118.317089', '24.432706', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1581, 252895, 2, 251197, '350581000000', '石狮市', '福建,泉州,石狮', '118.648066', '24.732204', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1582, 253032, 2, 251197, '350582000000', '晋江市', '福建,泉州,晋江', '118.552365', '24.781681', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1583, 253454, 2, 251197, '350583000000', '南安市', '福建,泉州,南安', '118.386279', '24.960385', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1584, 253906, 2, 253905, '350601000000', '市辖区', '福建,漳州', '117.647481', '24.512948', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1585, 253907, 2, 253905, '350602000000', '芗城区', '福建,漳州,芗城', '117.653975', '24.510900', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1586, 254093, 2, 253905, '350603000000', '龙文区', '福建,漳州,龙文', '117.709755', '24.503113', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1587, 254170, 2, 253905, '350622000000', '云霄县', '福建,漳州,云霄', '117.339573', '23.957936', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1588, 254394, 2, 253905, '350623000000', '漳浦县', '福建,漳州,漳浦', '117.613808', '24.117102', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1589, 254747, 2, 253905, '350624000000', '诏安县', '福建,漳州,诏安', '117.175185', '23.711579', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1590, 255011, 2, 253905, '350625000000', '长泰县', '福建,漳州,长泰', '117.759153', '24.625449', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1591, 255105, 2, 253905, '350626000000', '东山县', '福建,漳州,东山', '117.430061', '23.701262', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1592, 255190, 2, 253905, '350627000000', '南靖县', '福建,漳州,南靖', '117.357321', '24.514654', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1593, 255405, 2, 253905, '350628000000', '平和县', '福建,漳州,平和', '117.314891', '24.363437', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1594, 255680, 2, 253905, '350629000000', '华安县', '福建,漳州,华安', '117.534103', '25.004425', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1595, 255789, 2, 253905, '350681000000', '龙海市', '福建,漳州,龙海', '117.818197', '24.446706', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1596, 256113, 2, 256112, '350701000000', '市辖区', '福建,南平', '118.177708', '26.641768', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1597, 256114, 2, 256112, '350702000000', '延平区', '福建,南平,延平', '118.181894', '26.637457', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1598, 256452, 2, 256112, '350703000000', '建阳区', '福建,南平,建阳', '118.120464', '27.331876', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1599, 256687, 2, 256112, '350721000000', '顺昌县', '福建,南平,顺昌', '117.810357', '26.793288', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1600, 256849, 2, 256112, '350722000000', '浦城县', '福建,南平,浦城', '118.541256', '27.917263', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1601, 257172, 2, 256112, '350723000000', '光泽县', '福建,南平,光泽', '117.334106', '27.540988', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1602, 257276, 2, 256112, '350724000000', '松溪县', '福建,南平,松溪', '118.785468', '27.526232', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1603, 257395, 2, 256112, '350725000000', '政和县', '福建,南平,政和', '118.857642', '27.366104', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1604, 257539, 2, 256112, '350781000000', '邵武市', '福建,南平,邵武', '117.492534', '27.340327', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1605, 257733, 2, 256112, '350782000000', '武夷山市', '福建,南平,武夷山', '118.035310', '27.756648', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1606, 257886, 2, 256112, '350783000000', '建瓯市', '福建,南平,建瓯', '118.304988', '27.022727', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1607, 258161, 2, 258160, '350801000000', '市辖区', '福建,龙岩', '117.017536', '25.075123', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1608, 258162, 2, 258160, '350802000000', '新罗区', '福建,龙岩,新罗', '117.037264', '25.098292', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1609, 258520, 2, 258160, '350803000000', '永定区', '福建,龙岩,永定', '116.732092', '24.723962', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1610, 258825, 2, 258160, '350821000000', '长汀县', '福建,龙岩,长汀', '116.357581', '25.833531', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1611, 259144, 2, 258160, '350823000000', '上杭县', '福建,龙岩,上杭', '116.420099', '25.049518', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1612, 259512, 2, 258160, '350824000000', '武平县', '福建,龙岩,武平', '116.100342', '25.095277', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1613, 259749, 2, 258160, '350825000000', '连城县', '福建,龙岩,连城', '116.754473', '25.710539', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1614, 260014, 2, 258160, '350881000000', '漳平市', '福建,龙岩,漳平', '117.419998', '25.290185', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1615, 260231, 2, 260230, '350901000000', '市辖区', '福建,宁德', '119.547932', '26.665617', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1616, 260232, 2, 260230, '350902000000', '蕉城区', '福建,宁德,蕉城', '119.526299', '26.660611', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1617, 260575, 2, 260230, '350921000000', '霞浦县', '福建,宁德,霞浦', '120.005643', '26.885204', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1618, 260905, 2, 260230, '350922000000', '古田县', '福建,宁德,古田', '118.746284', '26.577837', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1619, 261211, 2, 260230, '350923000000', '屏南县', '福建,宁德,屏南', '118.985895', '26.908276', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1620, 261382, 2, 260230, '350924000000', '寿宁县', '福建,宁德,寿宁', '119.514987', '27.454479', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1621, 261602, 2, 260230, '350925000000', '周宁县', '福建,宁德,周宁', '119.339025', '27.104591', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1622, 261759, 2, 260230, '350926000000', '柘荣县', '福建,宁德,柘荣', '119.900609', '27.233933', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1623, 261885, 2, 260230, '350981000000', '福安市', '福建,宁德,福安', '119.647770', '27.088049', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1624, 262395, 2, 260230, '350982000000', '福鼎市', '福建,宁德,福鼎', '120.216978', '27.324479', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1625, 262700, 2, 262699, '360101000000', '市辖区', '江西,南昌', '115.858197', '28.682892', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1626, 262701, 2, 262699, '360102000000', '东湖区', '江西,南昌,东湖', '115.899262', '28.685085', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1627, 262889, 2, 262699, '360103000000', '西湖区', '江西,南昌,西湖', '115.877233', '28.657595', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1628, 263058, 2, 262699, '360104000000', '青云谱区', '江西,南昌,青云谱', '115.925749', '28.621169', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1629, 263152, 2, 262699, '360105000000', '湾里区', '江西,南昌,湾里', '115.730847', '28.714796', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1630, 263217, 2, 262699, '360111000000', '青山湖区', '江西,南昌,青山湖', '115.962144', '28.682985', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1631, 263496, 2, 262699, '360112000000', '新建区', '江西,南昌,新建', '115.815278', '28.692864', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1632, 263948, 2, 262699, '360121000000', '南昌县', '江西,南昌,南昌', '115.944304', '28.545602', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1633, 264375, 2, 262699, '360123000000', '安义县', '江西,南昌,安义', '115.549247', '28.844507', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1634, 264517, 2, 262699, '360124000000', '进贤县', '江西,南昌,进贤', '116.240924', '28.376918', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1635, 264863, 2, 264862, '360201000000', '市辖区', '江西,景德镇', '117.178419', '29.268835', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1636, 264864, 2, 264862, '360202000000', '昌江区', '江西,景德镇,昌江', '117.183748', '29.273435', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1637, 264962, 2, 264862, '360203000000', '珠山区', '江西,景德镇,珠山', '117.202893', '29.299923', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1638, 265083, 2, 264862, '360222000000', '浮梁县', '江西,景德镇,浮梁', '117.215086', '29.351681', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1639, 265297, 2, 264862, '360281000000', '乐平市', '江西,景德镇,乐平', '117.151796', '28.978440', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1640, 265678, 2, 265677, '360301000000', '市辖区', '江西,萍乡', '113.854556', '27.622768', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1641, 265679, 2, 265677, '360302000000', '安源区', '江西,萍乡,安源', '113.870730', '27.615202', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1642, 265826, 2, 265677, '360313000000', '湘东区', '江西,萍乡,湘东', '113.733047', '27.640075', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1643, 265994, 2, 265677, '360321000000', '莲花县', '江西,萍乡,莲花', '113.961465', '27.127669', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1644, 266171, 2, 265677, '360322000000', '上栗县', '江西,萍乡,上栗', '113.795311', '27.880302', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1645, 266356, 2, 265677, '360323000000', '芦溪县', '江西,萍乡,芦溪', '114.029828', '27.630806', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1646, 266522, 2, 266521, '360401000000', '市辖区', '江西,九江', '116.001930', '29.705077', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1647, 266523, 2, 266521, '360402000000', '濂溪区', '江西,九江,濂溪', '116.011380', '29.678540', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1648, 266665, 2, 266521, '360403000000', '浔阳区', '江西,九江,浔阳', '115.990301', '29.727593', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1649, 266781, 2, 266521, '360421000000', '九江县', '江西,九江,九江', '115.911323', '29.608431', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1650, 266946, 2, 266521, '360423000000', '武宁县', '江西,九江,武宁', '115.100578', '29.256323', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1651, 267168, 2, 266521, '360424000000', '修水县', '江西,九江,修水', '114.546702', '29.026022', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1652, 267613, 2, 266521, '360425000000', '永修县', '江西,九江,永修', '115.832453', '29.012297', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1653, 267868, 2, 266521, '360426000000', '德安县', '江西,九江,德安', '115.767484', '29.298738', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1654, 267982, 2, 266521, '360428000000', '都昌县', '江西,九江,都昌', '116.204099', '29.273194', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1655, 268318, 2, 266521, '360429000000', '湖口县', '江西,九江,湖口', '116.251947', '29.731101', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1656, 268480, 2, 266521, '360430000000', '彭泽县', '江西,九江,彭泽', '116.549359', '29.896061', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1657, 268689, 2, 266521, '360481000000', '瑞昌市', '江西,九江,瑞昌', '115.681337', '29.675874', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1658, 268926, 2, 266521, '360482000000', '共青城市', '江西,九江,共青城', '115.808844', '29.248317', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1659, 268995, 2, 266521, '360483000000', '庐山市', '江西,九江,庐山', '116.045060', '29.448128', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1660, 269108, 2, 269107, '360501000000', '市辖区', '江西,新余', '114.917346', '27.817808', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1661, 269109, 2, 269107, '360502000000', '渝水区', '江西,新余,渝水', '114.944646', '27.800387', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1662, 269465, 2, 269107, '360521000000', '分宜县', '江西,新余,分宜', '114.692050', '27.814758', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1663, 269655, 2, 269654, '360601000000', '市辖区', '江西,鹰潭', '117.069202', '28.260189', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1664, 269656, 2, 269654, '360602000000', '月湖区', '江西,鹰潭,月湖', '117.037137', '28.239153', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1665, 269746, 2, 269654, '360622000000', '余江县', '江西,鹰潭,余江', '116.822763', '28.206177', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1666, 269942, 2, 269654, '360681000000', '贵溪市', '江西,鹰潭,贵溪', '117.245497', '28.292519', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1667, 270223, 2, 270222, '360701000000', '市辖区', '江西,赣州', '114.935029', '25.831829', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1668, 270224, 2, 270222, '360702000000', '章贡区', '江西,赣州,章贡', '114.921171', '25.817816', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1669, 270442, 2, 270222, '360703000000', '南康区', '江西,赣州,南康', '114.765403', '25.661471', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1670, 270780, 2, 270222, '360721000000', '赣县', '江西,赣州,赣县', '115.011561', '25.860691', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1671, 271095, 2, 270222, '360722000000', '信丰县', '江西,赣州,信丰', '114.922830', '25.386704', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1672, 271410, 2, 270222, '360723000000', '大余县', '江西,赣州,大余', '114.362112', '25.401314', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1673, 271541, 2, 270222, '360724000000', '上犹县', '江西,赣州,上犹', '114.551138', '25.785172', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1674, 271699, 2, 270222, '360725000000', '崇义县', '江西,赣州,崇义', '114.308267', '25.681784', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1675, 271848, 2, 270222, '360726000000', '安远县', '江西,赣州,安远', '115.393922', '25.136927', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1676, 272033, 2, 270222, '360727000000', '龙南县', '江西,赣州,龙南', '114.789873', '24.911069', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1677, 272156, 2, 270222, '360728000000', '定南县', '江西,赣州,定南', '115.027845', '24.784410', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1678, 272302, 2, 270222, '360729000000', '全南县', '江西,赣州,全南', '114.530125', '24.742403', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1679, 272408, 2, 270222, '360730000000', '宁都县', '江西,赣州,宁都', '116.009472', '26.470116', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1680, 272767, 2, 270222, '360731000000', '于都县', '江西,赣州,于都', '115.415508', '25.952069', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1681, 273183, 2, 270222, '360732000000', '兴国县', '江西,赣州,兴国', '115.363190', '26.337937', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1682, 273525, 2, 270222, '360733000000', '会昌县', '江西,赣州,会昌', '115.786057', '25.600272', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1683, 273820, 2, 270222, '360734000000', '寻乌县', '江西,赣州,寻乌', '115.646636', '24.963371', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1684, 274020, 2, 270222, '360735000000', '石城县', '江西,赣州,石城', '116.346995', '26.314775', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1685, 274184, 2, 270222, '360781000000', '瑞金市', '江西,赣州,瑞金', '116.027135', '25.885555', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1686, 274445, 2, 274444, '360801000000', '市辖区', '江西,吉安', '114.992509', '27.113443', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1687, 274446, 2, 274444, '360802000000', '吉州区', '江西,吉安,吉州', '114.994764', '27.143801', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1688, 274592, 2, 274444, '360803000000', '青原区', '江西,吉安,青原', '115.014812', '27.081977', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1689, 274736, 2, 274444, '360821000000', '吉安县', '江西,吉安,吉安', '114.907733', '27.039890', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1690, 275105, 2, 274444, '360822000000', '吉水县', '江西,吉安,吉水', '115.135507', '27.229632', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1691, 275406, 2, 274444, '360823000000', '峡江县', '江西,吉安,峡江', '115.316566', '27.582901', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1692, 275511, 2, 274444, '360824000000', '新干县', '江西,吉安,新干', '115.387052', '27.740192', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1693, 275694, 2, 274444, '360825000000', '永丰县', '江西,吉安,永丰', '115.444320', '27.318852', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1694, 275956, 2, 274444, '360826000000', '泰和县', '江西,吉安,泰和', '114.908869', '26.789960', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1695, 276331, 2, 274444, '360827000000', '遂川县', '江西,吉安,遂川', '114.520537', '26.313737', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1696, 276700, 2, 274444, '360828000000', '万安县', '江西,吉安,万安', '114.786182', '26.458254', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1697, 276874, 2, 274444, '360829000000', '安福县', '江西,吉安,安福', '114.619893', '27.392874', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1698, 277170, 2, 274444, '360830000000', '永新县', '江西,吉安,永新', '114.243096', '26.945002', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1699, 277459, 2, 274444, '360881000000', '井冈山市', '江西,吉安,井冈山', '114.289228', '26.748081', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1700, 277616, 2, 277615, '360901000000', '市辖区', '江西,宜春', '114.416778', '27.815619', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1701, 277617, 2, 277615, '360902000000', '袁州区', '江西,宜春,袁州', '114.424657', '27.798846', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1702, 278033, 2, 277615, '360921000000', '奉新县', '江西,宜春,奉新', '115.400491', '28.688423', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1703, 278249, 2, 277615, '360922000000', '万载县', '江西,宜春,万载', '114.445523', '28.106004', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1704, 278471, 2, 277615, '360923000000', '上高县', '江西,宜春,上高', '114.947594', '28.238509', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1705, 278710, 2, 277615, '360924000000', '宜丰县', '江西,宜春,宜丰', '114.803515', '28.393666', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1706, 278975, 2, 277615, '360925000000', '靖安县', '江西,宜春,靖安', '115.362629', '28.861479', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1707, 279095, 2, 277615, '360926000000', '铜鼓县', '江西,宜春,铜鼓', '114.371172', '28.520770', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1708, 279220, 2, 277615, '360981000000', '丰城市', '江西,宜春,丰城', '115.771094', '28.159142', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1709, 279845, 2, 277615, '360982000000', '樟树市', '江西,宜春,樟树', '115.546385', '28.054814', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1710, 280166, 2, 277615, '360983000000', '高安市', '江西,宜春,高安', '115.375616', '28.417255', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1711, 280563, 2, 280562, '361001000000', '市辖区', '江西,抚州', '116.358181', '27.949217', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1712, 280564, 2, 280562, '361002000000', '临川区', '江西,抚州,临川', '116.312167', '27.934573', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1713, 281098, 2, 280562, '361021000000', '南城县', '江西,抚州,南城', '116.637040', '27.569678', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1714, 281285, 2, 280562, '361022000000', '黎川县', '江西,抚州,黎川', '116.907681', '27.282333', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1715, 281443, 2, 280562, '361023000000', '南丰县', '江西,抚州,南丰', '116.525725', '27.218445', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1716, 281641, 2, 280562, '361024000000', '崇仁县', '江西,抚州,崇仁', '116.061101', '27.764394', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1717, 281827, 2, 280562, '361025000000', '乐安县', '江西,抚州,乐安', '115.830481', '27.428765', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1718, 282036, 2, 280562, '361026000000', '宜黄县', '江西,抚州,宜黄', '116.222128', '27.546146', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1719, 282206, 2, 280562, '361027000000', '金溪县', '江西,抚州,金溪', '116.755058', '27.918959', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1720, 282391, 2, 280562, '361028000000', '资溪县', '江西,抚州,资溪', '117.060264', '27.706102', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1721, 282482, 2, 280562, '361029000000', '东乡县', '江西,抚州,东乡县', '116.603560', '28.247697', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1722, 282684, 2, 280562, '361030000000', '广昌县', '江西,抚州,广昌', '116.325757', '26.837267', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1723, 282842, 2, 282841, '361101000000', '市辖区', '江西,上饶', '117.943433', '28.454862', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1724, 282843, 2, 282841, '361102000000', '信州区', '江西,上饶,信州', '117.966460', '28.431002', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1725, 282978, 2, 282841, '361103000000', '广丰区', '江西,上饶,广丰', '118.191240', '28.436286', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1726, 283240, 2, 282841, '361121000000', '上饶县', '江西,上饶,上饶', '117.907850', '28.448983', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1727, 283511, 2, 282841, '361123000000', '玉山县', '江西,上饶,玉山', '118.245124', '28.682055', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1728, 283769, 2, 282841, '361124000000', '铅山县', '江西,上饶,铅山', '117.709451', '28.315217', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1729, 283970, 2, 282841, '361125000000', '横峰县', '江西,上饶,横峰', '117.596452', '28.407118', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1730, 284066, 2, 282841, '361126000000', '弋阳县', '江西,上饶,弋阳', '117.449588', '28.378044', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1731, 284239, 2, 282841, '361127000000', '余干县', '江西,上饶,余干', '116.695647', '28.702302', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1732, 284706, 2, 282841, '361128000000', '鄱阳县', '江西,上饶,鄱阳', '116.699746', '29.011699', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1733, 285319, 2, 282841, '361129000000', '万年县', '江西,上饶,万年', '117.058445', '28.694582', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1734, 285488, 2, 282841, '361130000000', '婺源县', '江西,上饶,婺源', '117.861798', '29.248086', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1735, 285711, 2, 282841, '361181000000', '德兴市', '江西,上饶,德兴', '117.578713', '28.946464', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1736, 285862, 2, 285861, '370101000000', '市辖区', '山东,济南', '117.119999', '36.651216', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1737, 285863, 2, 285861, '370102000000', '历下区', '山东,济南,历下', '117.076455', '36.666412', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1738, 285991, 2, 285861, '370103000000', '市中区', '山东,济南,市中', '116.997777', '36.651474', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1739, 286215, 2, 285861, '370104000000', '槐荫区', '山东,济南,槐荫', '116.901224', '36.651441', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1740, 286404, 2, 285861, '370105000000', '天桥区', '山东,济南,天桥', '116.987492', '36.678016', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1741, 286683, 2, 285861, '370112000000', '历城区', '山东,济南,历城', '117.065237', '36.680017', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1742, 287424, 2, 285861, '370113000000', '长清区', '山东,济南,长清', '116.751937', '36.553571', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1743, 288084, 2, 285861, '370124000000', '平阴县', '山东,济南,平阴', '116.456187', '36.289265', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1744, 288448, 2, 285861, '370125000000', '济阳县', '山东,济南,济阳', '117.173525', '36.978537', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1745, 289313, 2, 285861, '370126000000', '商河县', '山东,济南,商河', '117.157183', '37.309045', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1746, 290291, 2, 285861, '370181000000', '章丘市', '山东,济南,章丘', '117.526228', '36.681259', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1747, 291236, 2, 291235, '370201000000', '市辖区', '山东,青岛', '120.382639', '36.067082', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1748, 291237, 2, 291235, '370202000000', '市南区', '山东,青岛,市南', '120.412392', '36.075651', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1749, 291313, 2, 291235, '370203000000', '市北区', '山东,青岛,市北', '120.374731', '36.087609', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1750, 291468, 2, 291235, '370211000000', '黄岛区', '山东,青岛,黄岛', '120.046190', '35.872664', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1751, 292713, 2, 291235, '370212000000', '崂山区', '山东,青岛,崂山', '120.468956', '36.107538', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1752, 292879, 2, 291235, '370213000000', '李沧区', '山东,青岛,李沧', '120.432697', '36.145463', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1753, 293008, 2, 291235, '370214000000', '城阳区', '山东,青岛,城阳', '120.396310', '36.307064', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1754, 293241, 2, 291235, '370281000000', '胶州市', '山东,青岛,胶州', '120.033382', '36.264680', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1755, 294138, 2, 291235, '370282000000', '即墨市', '山东,青岛,即墨', '120.447128', '36.389639', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1756, 295251, 2, 291235, '370283000000', '平度市', '山东,青岛,平度', '119.988420', '36.776358', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1757, 297121, 2, 291235, '370285000000', '莱西市', '山东,青岛,莱西', '120.517690', '36.889084', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1758, 298026, 2, 298025, '370301000000', '市辖区', '山东,淄博', '118.054927', '36.813487', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1759, 298027, 2, 298025, '370302000000', '淄川区', '山东,淄博,淄川', '117.966723', '36.643452', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1760, 298507, 2, 298025, '370303000000', '张店区', '山东,淄博,张店', '118.017913', '36.806674', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1761, 298821, 2, 298025, '370304000000', '博山区', '山东,淄博,博山', '117.861677', '36.494721', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1762, 299159, 2, 298025, '370305000000', '临淄区', '山东,淄博,临淄', '118.309118', '36.826981', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1763, 299652, 2, 298025, '370306000000', '周村区', '山东,淄博,周村', '117.869886', '36.803072', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1764, 299919, 2, 298025, '370321000000', '桓台县', '山东,淄博,桓台', '118.097923', '36.959804', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1765, 300276, 2, 298025, '370322000000', '高青县', '山东,淄博,高青', '117.826916', '37.171063', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1766, 301056, 2, 298025, '370323000000', '沂源县', '山东,淄博,沂源', '118.170856', '36.185038', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1767, 301712, 2, 301711, '370401000000', '市辖区', '山东,枣庄', '117.323725', '34.810487', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1768, 301713, 2, 301711, '370402000000', '市中区', '山东,枣庄,市中', '117.556123', '34.864114', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1769, 301888, 2, 301711, '370403000000', '薛城区', '山东,枣庄,薛城', '117.263164', '34.795063', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1770, 302179, 2, 301711, '370404000000', '峄城区', '山东,枣庄,峄城', '117.590816', '34.773263', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1771, 302532, 2, 301711, '370405000000', '台儿庄区', '山东,枣庄,台儿庄', '117.733832', '34.562528', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1772, 302750, 2, 301711, '370406000000', '山亭区', '山东,枣庄,山亭', '117.461517', '35.099528', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1773, 303037, 2, 301711, '370481000000', '滕州市', '山东,枣庄,滕州', '117.165824', '35.114156', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1774, 304310, 2, 304309, '370501000000', '市辖区', '山东,东营', '118.674767', '37.434751', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1775, 304311, 2, 304309, '370502000000', '东营区', '山东,东营,东营', '118.582184', '37.448963', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1776, 304647, 2, 304309, '370503000000', '河口区', '山东,东营,河口', '118.525543', '37.886162', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1777, 304845, 2, 304309, '370505000000', '垦利区', '山东,东营,垦利', '118.674767', '37.434751', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1778, 305208, 2, 304309, '370522000000', '利津县', '山东,东营,利津', '118.255273', '37.490260', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1779, 305747, 2, 304309, '370523000000', '广饶县', '山东,东营,广饶', '118.407107', '37.053555', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1780, 306340, 2, 306339, '370601000000', '市辖区', '山东,烟台', '121.447935', '37.463822', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1781, 306341, 2, 306339, '370602000000', '芝罘区', '山东,烟台,芝罘', '121.400031', '37.540687', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1782, 306496, 2, 306339, '370611000000', '福山区', '山东,烟台,福山', '121.267741', '37.498246', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1783, 306743, 2, 306339, '370612000000', '牟平区', '山东,烟台,牟平', '121.600512', '37.386901', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1784, 307348, 2, 306339, '370613000000', '莱山区', '山东,烟台,莱山', '121.445151', '37.511361', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1785, 307481, 2, 306339, '370634000000', '长岛县', '山东,烟台,长岛', '120.736580', '37.921368', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1786, 307530, 2, 306339, '370681000000', '龙口市', '山东,烟台,龙口', '120.477813', '37.646108', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1787, 308140, 2, 306339, '370682000000', '莱阳市', '山东,烟台,莱阳', '120.711673', '36.978941', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1788, 308953, 2, 306339, '370683000000', '莱州市', '山东,烟台,莱州', '119.942327', '37.177017', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1789, 309985, 2, 306339, '370684000000', '蓬莱市', '山东,烟台,蓬莱', '120.758848', '37.810661', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1790, 310581, 2, 306339, '370685000000', '招远市', '山东,烟台,招远', '120.434072', '37.355469', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1791, 311342, 2, 306339, '370686000000', '栖霞市', '山东,烟台,栖霞', '120.849675', '37.335123', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1792, 312312, 2, 306339, '370687000000', '海阳市', '山东,烟台,海阳', '121.158434', '36.776378', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1793, 313064, 2, 313063, '370701000000', '市辖区', '山东,潍坊', '119.161755', '36.706774', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1794, 313065, 2, 313063, '370702000000', '潍城区', '山东,潍坊,潍城', '119.024836', '36.728100', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1795, 313327, 2, 313063, '370703000000', '寒亭区', '山东,潍坊,寒亭', '119.219734', '36.775491', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1796, 313701, 2, 313063, '370704000000', '坊子区', '山东,潍坊,坊子', '119.166485', '36.654448', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1797, 314288, 2, 313063, '370705000000', '奎文区', '山东,潍坊,奎文', '119.132486', '36.707676', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1798, 314533, 2, 313063, '370724000000', '临朐县', '山东,潍坊,临朐', '118.542982', '36.512506', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1799, 314894, 2, 313063, '370725000000', '昌乐县', '山东,潍坊,昌乐', '118.829914', '36.706945', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1800, 315273, 2, 313063, '370781000000', '青州市', '山东,潍坊,青州', '118.479636', '36.684600', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1801, 316361, 2, 313063, '370782000000', '诸城市', '山东,潍坊,诸城', '119.410103', '35.995654', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1802, 316642, 2, 313063, '370783000000', '寿光市', '山东,潍坊,寿光', '118.790652', '36.855480', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1803, 317633, 2, 313063, '370784000000', '安丘市', '山东,潍坊,安丘', '119.218978', '36.478494', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1804, 318512, 2, 313063, '370785000000', '高密市', '山东,潍坊,高密', '119.755597', '36.382595', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1805, 319478, 2, 313063, '370786000000', '昌邑市', '山东,潍坊,昌邑', '119.398525', '36.858820', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1806, 320180, 2, 320179, '370801000000', '市辖区', '山东,济宁', '116.587098', '35.414921', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1807, 320181, 2, 320179, '370811000000', '任城区', '山东,济宁,任城', '116.595050', '35.406596', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1808, 320795, 2, 320179, '370812000000', '兖州区', '山东,济宁,兖州', '116.783834', '35.553144', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1809, 321246, 2, 320179, '370826000000', '微山县', '山东,济宁,微山', '117.128828', '34.806554', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1810, 321804, 2, 320179, '370827000000', '鱼台县', '山东,济宁,鱼台', '116.650608', '35.012749', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1811, 322209, 2, 320179, '370828000000', '金乡县', '山东,济宁,金乡', '116.311532', '35.066620', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1812, 322882, 2, 320179, '370829000000', '嘉祥县', '山东,济宁,嘉祥', '116.342442', '35.407829', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1813, 323607, 2, 320179, '370830000000', '汶上县', '山东,济宁,汶上', '116.489043', '35.732799', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1814, 324118, 2, 320179, '370831000000', '泗水县', '山东,济宁,泗水', '117.251195', '35.664323', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1815, 324729, 2, 320179, '370832000000', '梁山县', '山东,济宁,梁山', '116.096044', '35.802306', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1816, 325372, 2, 320179, '370881000000', '曲阜市', '山东,济宁,曲阜', '116.986503', '35.580996', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1817, 325791, 2, 320179, '370883000000', '邹城市', '山东,济宁,邹城', '117.003743', '35.405185', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1818, 326707, 2, 326706, '370901000000', '市辖区', '山东,泰安', '117.087614', '36.200252', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1819, 326708, 2, 326706, '370902000000', '泰山区', '山东,泰安,泰山', '117.135354', '36.192084', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1820, 326926, 2, 326706, '370911000000', '岱岳区', '山东,泰安,岱岳', '117.041582', '36.187990', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1821, 327655, 2, 326706, '370921000000', '宁阳县', '山东,泰安,宁阳', '116.805797', '35.758787', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1822, 328231, 2, 326706, '370923000000', '东平县', '山东,泰安,东平', '116.470304', '35.937102', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1823, 328962, 2, 326706, '370982000000', '新泰市', '山东,泰安,新泰', '117.767953', '35.909032', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1824, 329897, 2, 326706, '370983000000', '肥城市', '山东,泰安,肥城', '116.768358', '36.182572', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1825, 330548, 2, 330547, '371001000000', '市辖区', '山东,威海', '122.120419', '37.513068', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1826, 330549, 2, 330547, '371002000000', '环翠区', '山东,威海,环翠', '122.123444', '37.501991', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1827, 330748, 2, 330547, '371003000000', '文登区', '山东,威海,文登', '122.057941', '37.193886', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1828, 331529, 2, 330547, '371082000000', '荣成市', '山东,威海,荣成', '122.486658', '37.165160', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1829, 332496, 2, 330547, '371083000000', '乳山市', '山东,威海,乳山', '121.539765', '36.919816', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1830, 333141, 2, 333140, '371101000000', '市辖区', '山东,日照', '119.526888', '35.416377', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1831, 333142, 2, 333140, '371102000000', '东港区', '山东,日照,东港', '119.462228', '35.425475', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1832, 333755, 2, 333140, '371103000000', '岚山区', '山东,日照,岚山', '119.318929', '35.121884', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1833, 334188, 2, 333140, '371121000000', '五莲县', '山东,日照,五莲', '119.206763', '35.751927', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1834, 334833, 2, 333140, '371122000000', '莒县', '山东,日照,莒县', '118.837064', '35.579868', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1835, 336051, 2, 336050, '371201000000', '市辖区', '山东,莱芜', '117.676723', '36.213813', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1836, 336052, 2, 336050, '371202000000', '莱城区', '山东,莱芜,莱城', '117.659884', '36.203180', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1837, 336908, 2, 336050, '371203000000', '钢城区', '山东,莱芜,钢城', '117.811355', '36.058572', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1838, 337145, 2, 337144, '371301000000', '市辖区', '山东,临沂', '118.356448', '35.104672', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1839, 337146, 2, 337144, '371302000000', '兰山区', '山东,临沂,兰山', '118.347731', '35.051734', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1840, 337621, 2, 337144, '371311000000', '罗庄区', '山东,临沂,罗庄', '118.284786', '34.996741', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1841, 337844, 2, 337144, '371312000000', '河东区', '山东,临沂,河东', '118.402893', '35.089917', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1842, 338188, 2, 337144, '371321000000', '沂南县', '山东,临沂,沂南', '118.465213', '35.549976', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1843, 338778, 2, 337144, '371322000000', '郯城县', '山东,临沂,郯城', '118.367263', '34.613557', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1844, 339408, 2, 337144, '371323000000', '沂水县', '山东,临沂,沂水', '118.627918', '35.790450', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1845, 340490, 2, 337144, '371324000000', '兰陵县', '山东,临沂,兰陵', '118.070650', '34.857149', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1846, 341532, 2, 337144, '371325000000', '费县', '山东,临沂,费县', '117.977325', '35.265961', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1847, 342020, 2, 337144, '371326000000', '平邑县', '山东,临沂,平邑', '117.640352', '35.505943', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1848, 342766, 2, 337144, '371327000000', '莒南县', '山东,临沂,莒南', '118.835163', '35.174846', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1849, 343361, 2, 337144, '371328000000', '蒙阴县', '山东,临沂,蒙阴', '117.945085', '35.710032', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1850, 343836, 2, 337144, '371329000000', '临沭县', '山东,临沂,临沭', '118.650782', '34.919852', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1851, 344134, 2, 344133, '371401000000', '市辖区', '山东,德州', '116.357464', '37.434092', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1852, 344135, 2, 344133, '371402000000', '德城区', '山东,德州,德城', '116.299471', '37.450805', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1853, 344244, 2, 344133, '371403000000', '陵城区', '山东,德州,陵城', '116.576092', '37.335794', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1854, 345248, 2, 344133, '371422000000', '宁津县', '山东,德州,宁津', '116.800306', '37.652190', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1855, 346117, 2, 344133, '371423000000', '庆云县', '山东,德州,庆云', '117.385257', '37.775350', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1856, 346518, 2, 344133, '371424000000', '临邑县', '山东,德州,临邑', '116.866800', '37.189798', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1857, 346715, 2, 344133, '371425000000', '齐河县', '山东,德州,齐河', '116.762810', '36.783415', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1858, 347749, 2, 344133, '371426000000', '平原县', '山东,德州,平原', '116.434056', '37.165314', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1859, 347943, 2, 344133, '371427000000', '夏津县', '山东,德州,夏津', '116.001726', '36.948371', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1860, 348268, 2, 344133, '371428000000', '武城县', '山东,德州,武城', '116.069302', '37.213311', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1861, 348472, 2, 344133, '371481000000', '乐陵市', '山东,德州,乐陵', '117.231935', '37.729907', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1862, 348980, 2, 344133, '371482000000', '禹城市', '山东,德州,禹城', '116.638327', '36.933812', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1863, 349383, 2, 349382, '371501000000', '市辖区', '山东,聊城', '115.985371', '36.456703', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1864, 349384, 2, 349382, '371502000000', '东昌府区', '山东,聊城,东昌府', '115.988491', '36.434645', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1865, 350543, 2, 349382, '371521000000', '阳谷县', '山东,聊城,阳谷', '115.791820', '36.114392', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1866, 351436, 2, 349382, '371522000000', '莘县', '山东,聊城,莘县', '115.671191', '36.233598', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1867, 352587, 2, 349382, '371523000000', '茌平县', '山东,聊城,茌平', '115.985371', '36.456703', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1868, 353334, 2, 349382, '371524000000', '东阿县', '山东,聊城,东阿', '116.247580', '36.334917', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1869, 353863, 2, 349382, '371525000000', '冠县', '山东,聊城,冠县', '115.442740', '36.484009', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1870, 354643, 2, 349382, '371526000000', '高唐县', '山东,聊城,高唐', '116.230158', '36.846755', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1871, 355301, 2, 349382, '371581000000', '临清市', '山东,聊城,临清', '115.704881', '36.838277', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1872, 355973, 2, 355972, '371601000000', '市辖区', '山东,滨州', '117.970703', '37.381990', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1873, 355974, 2, 355972, '371602000000', '滨城区', '山东,滨州,滨城', '118.019326', '37.430724', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1874, 356960, 2, 355972, '371603000000', '沾化区', '山东,滨州,沾化', '118.098902', '37.699260', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1875, 357420, 2, 355972, '371621000000', '惠民县', '山东,滨州,惠民', '117.509921', '37.489877', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1876, 358556, 2, 355972, '371622000000', '阳信县', '山东,滨州,阳信', '117.578262', '37.641106', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1877, 359424, 2, 355972, '371623000000', '无棣县', '山东,滨州,无棣', '117.625696', '37.770260', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1878, 360038, 2, 355972, '371625000000', '博兴县', '山东,滨州,博兴', '118.131815', '37.150226', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1879, 360507, 2, 355972, '371626000000', '邹平县', '山东,滨州,邹平', '117.743109', '36.862989', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1880, 361376, 2, 361375, '371701000000', '市辖区', '山东,菏泽', '115.480656', '35.233750', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1881, 361377, 2, 361375, '371702000000', '牡丹区', '山东,菏泽,牡丹', '115.417827', '35.252512', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1882, 361988, 2, 361375, '371703000000', '定陶区', '山东,菏泽,定陶', '115.569619', '35.072701', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1883, 362368, 2, 361375, '371721000000', '曹县', '山东,菏泽,曹县', '115.542328', '34.825508', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1884, 363576, 2, 361375, '371722000000', '单县', '山东,菏泽,单县', '116.107428', '34.778808', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1885, 364107, 2, 361375, '371723000000', '成武县', '山东,菏泽,成武', '115.889765', '34.952459', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1886, 364606, 2, 361375, '371724000000', '巨野县', '山东,菏泽,巨野', '116.065396', '35.387374', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1887, 365498, 2, 361375, '371725000000', '郓城县', '山东,菏泽,郓城', '115.943613', '35.599758', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1888, 366562, 2, 361375, '371726000000', '鄄城县', '山东,菏泽,鄄城', '115.510193', '35.563408', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1889, 366971, 2, 361375, '371728000000', '东明县', '山东,菏泽,东明', '115.089905', '35.289368', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1890, 367397, 2, 367396, '410101000000', '市辖区', '河南,郑州', '113.625368', '34.746599', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1891, 367398, 2, 367396, '410102000000', '中原区', '河南,郑州,中原', '113.612850', '34.748257', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1892, 367563, 2, 367396, '410103000000', '二七区', '河南,郑州,二七', '113.640179', '34.723930', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1893, 367741, 2, 367396, '410104000000', '管城回族区', '河南,郑州,管城', '113.625368', '34.746599', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1894, 367877, 2, 367396, '410105000000', '金水区', '河南,郑州,金水', '113.660555', '34.800156', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1895, 368151, 2, 367396, '410106000000', '上街区', '河南,郑州,上街', '113.308961', '34.802780', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1896, 368217, 2, 367396, '410108000000', '惠济区', '河南,郑州,惠济', '113.616901', '34.867458', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1897, 368291, 2, 367396, '410122000000', '中牟县', '河南,郑州,中牟', '113.976254', '34.718937', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1898, 368635, 2, 367396, '410181000000', '巩义市', '河南,郑州,巩义', '113.022497', '34.747834', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1899, 368975, 2, 367396, '410182000000', '荥阳市', '河南,郑州,荥阳', '113.383221', '34.787375', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1900, 369293, 2, 367396, '410183000000', '新密市', '河南,郑州,新密', '113.390891', '34.539443', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1901, 369663, 2, 367396, '410184000000', '新郑市', '河南,郑州,新郑', '113.740529', '34.395562', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1902, 369963, 2, 367396, '410185000000', '登封市', '河南,郑州,登封', '113.050492', '34.453667', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1903, 370305, 2, 370304, '410201000000', '市辖区', '河南,开封', '114.307581', '34.797239', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1904, 370306, 2, 370304, '410202000000', '龙亭区', '河南,开封,龙亭', '114.354730', '34.815784', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1905, 370373, 2, 370304, '410203000000', '顺河回族区', '河南,开封,顺河', '114.369716', '34.811344', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1906, 370450, 2, 370304, '410204000000', '鼓楼区', '河南,开封,鼓楼', '114.348307', '34.788561', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1907, 370501, 2, 370304, '410205000000', '禹王台区', '河南,开封,禹王台', '114.348170', '34.777104', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1908, 370557, 2, 370304, '410211000000', '金明区', '河南,开封,金明', '114.307581', '34.797239', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1909, 370634, 2, 370304, '410212000000', '祥符区', '河南,开封,祥符', '114.441327', '34.756921', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1910, 370995, 2, 370304, '410221000000', '杞县', '河南,开封,杞县', '114.783041', '34.549166', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1911, 371618, 2, 370304, '410222000000', '通许县', '河南,开封,通许', '114.467467', '34.480433', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1912, 371942, 2, 370304, '410223000000', '尉氏县', '河南,开封,尉氏', '114.193081', '34.411494', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1913, 372481, 2, 370304, '410225000000', '兰考县', '河南,开封,兰考', '114.821348', '34.822211', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1914, 372972, 2, 372971, '410301000000', '市辖区', '河南,洛阳', '112.454040', '34.619682', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1915, 372973, 2, 372971, '410302000000', '老城区', '河南,洛阳,老城', '112.469024', '34.683646', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1916, 373030, 2, 372971, '410303000000', '西工区', '河南,洛阳,西工', '112.428413', '34.659900', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1917, 373105, 2, 372971, '410304000000', '瀍河回族区', '河南,洛阳,瀍河', '112.479653', '34.714976', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1918, 373143, 2, 372971, '410305000000', '涧西区', '河南,洛阳,涧西', '112.395756', '34.658034', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1919, 373227, 2, 372971, '410306000000', '吉利区', '河南,洛阳,吉利', '112.589052', '34.900889', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1920, 373268, 2, 372971, '410311000000', '洛龙区', '河南,洛阳,洛龙', '112.464173', '34.619404', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1921, 373554, 2, 372971, '410322000000', '孟津县', '河南,洛阳,孟津', '112.445252', '34.825307', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1922, 373799, 2, 372971, '410323000000', '新安县', '河南,洛阳,新安', '112.132488', '34.728584', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1923, 374121, 2, 372971, '410324000000', '栾川县', '河南,洛阳,栾川', '111.615769', '33.785698', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1924, 374349, 2, 372971, '410325000000', '嵩县', '河南,洛阳,嵩县', '112.085634', '34.134517', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1925, 374694, 2, 372971, '410326000000', '汝阳县', '河南,洛阳,汝阳', '112.473139', '34.153940', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1926, 374929, 2, 372971, '410327000000', '宜阳县', '河南,洛阳,宜阳', '112.179238', '34.514645', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1927, 375308, 2, 372971, '410328000000', '洛宁县', '河南,洛阳,洛宁', '111.653039', '34.389414', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1928, 375717, 2, 372971, '410329000000', '伊川县', '河南,洛阳,伊川', '112.425651', '34.421460', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1929, 376105, 2, 372971, '410381000000', '偃师市', '河南,洛阳,偃师', '112.789535', '34.727220', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1930, 376366, 2, 376365, '410401000000', '市辖区', '河南,平顶山', '113.192661', '33.766169', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1931, 376367, 2, 376365, '410402000000', '新华区', '河南,平顶山,新华', '113.293999', '33.737365', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1932, 376442, 2, 376365, '410403000000', '卫东区', '河南,平顶山,卫东', '113.335193', '33.734707', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1933, 376513, 2, 376365, '410404000000', '石龙区', '河南,平顶山,石龙', '112.898818', '33.898713', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1934, 376532, 2, 376365, '410411000000', '湛河区', '河南,平顶山,湛河', '113.320873', '33.725681', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1935, 376643, 2, 376365, '410421000000', '宝丰县', '河南,平顶山,宝丰', '113.054754', '33.868441', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1936, 376984, 2, 376365, '410422000000', '叶县', '河南,平顶山,叶县', '113.357239', '33.626731', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1937, 377555, 2, 376365, '410423000000', '鲁山县', '河南,平顶山,鲁山', '112.908023', '33.738518', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1938, 378139, 2, 376365, '410425000000', '郏县', '河南,平顶山,郏县', '113.212609', '33.971787', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1939, 378532, 2, 376365, '410481000000', '舞钢市', '河南,平顶山,舞钢', '113.524794', '33.307776', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1940, 378764, 2, 376365, '410482000000', '汝州市', '河南,平顶山,汝州', '112.844517', '34.167030', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1941, 379246, 2, 379245, '410501000000', '市辖区', '河南,安阳', '114.392392', '36.097577', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1942, 379247, 2, 379245, '410502000000', '文峰区', '河南,安阳,文峰', '114.357082', '36.090468', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1943, 379400, 2, 379245, '410503000000', '北关区', '河南,安阳,北关', '114.355822', '36.107255', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1944, 379488, 2, 379245, '410505000000', '殷都区', '河南,安阳,殷都', '114.303410', '36.109890', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1945, 379584, 2, 379245, '410506000000', '龙安区', '河南,安阳,龙安', '114.323522', '36.095568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1946, 379742, 2, 379245, '410522000000', '安阳县', '河南,安阳,安阳', '114.130207', '36.130585', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1947, 380371, 2, 379245, '410523000000', '汤阴县', '河南,安阳,汤阴', '114.357763', '35.924515', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1948, 380688, 2, 379245, '410526000000', '滑县', '河南,安阳,滑县', '114.518997', '35.575002', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1949, 381731, 2, 379245, '410527000000', '内黄县', '河南,安阳,内黄', '114.901492', '35.971653', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1950, 382281, 2, 379245, '410581000000', '林州市', '河南,安阳,林州', '113.820130', '36.083047', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1951, 382879, 2, 382878, '410601000000', '市辖区', '河南,鹤壁', '114.297272', '35.747225', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1952, 382880, 2, 382878, '410602000000', '鹤山区', '河南,鹤壁,鹤山', '114.163367', '35.954582', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1953, 382969, 2, 382878, '410603000000', '山城区', '河南,鹤壁,山城', '114.184428', '35.897703', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1954, 383079, 2, 382878, '410611000000', '淇滨区', '河南,鹤壁,淇滨', '114.298694', '35.741296', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1955, 383228, 2, 382878, '410621000000', '浚县', '河南,鹤壁,浚县', '114.550813', '35.676240', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1956, 383704, 2, 382878, '410622000000', '淇县', '河南,鹤壁,淇县', '114.197651', '35.607762', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1957, 383891, 2, 383890, '410701000000', '市辖区', '河南,新乡', '113.926800', '35.303004', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1958, 383892, 2, 383890, '410702000000', '红旗区', '河南,新乡,红旗', '113.875245', '35.303851', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1959, 383978, 2, 383890, '410703000000', '卫滨区', '河南,新乡,卫滨', '113.865780', '35.302117', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1960, 384041, 2, 383890, '410704000000', '凤泉区', '河南,新乡,凤泉', '113.915184', '35.383978', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1961, 384093, 2, 383890, '410711000000', '牧野区', '河南,新乡,牧野', '113.908772', '35.315039', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1962, 384193, 2, 383890, '410721000000', '新乡县', '河南,新乡,新乡', '113.805205', '35.190836', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1963, 384380, 2, 383890, '410724000000', '获嘉县', '河南,新乡,获嘉', '113.657433', '35.259808', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1964, 384622, 2, 383890, '410725000000', '原阳县', '河南,新乡,原阳', '113.940115', '35.065587', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1965, 385122, 2, 383890, '410726000000', '延津县', '河南,新乡,延津', '114.205197', '35.141956', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1966, 385485, 2, 383890, '410727000000', '封丘县', '河南,新乡,封丘', '114.418882', '35.041198', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1967, 386113, 2, 383890, '410728000000', '长垣县', '河南,新乡,长垣', '114.668936', '35.201548', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1968, 386744, 2, 383890, '410781000000', '卫辉市', '河南,新乡,卫辉', '114.064907', '35.398494', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1969, 387125, 2, 383890, '410782000000', '辉县市', '河南,新乡,辉', '113.926800', '35.303004', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1970, 387708, 2, 387707, '410801000000', '市辖区', '河南,焦作', '113.241823', '35.215892', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1971, 387709, 2, 387707, '410802000000', '解放区', '河南,焦作,解放', '113.230817', '35.240282', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1972, 387776, 2, 387707, '410803000000', '中站区', '河南,焦作,中站', '113.182946', '35.236820', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1973, 387836, 2, 387707, '410804000000', '马村区', '河南,焦作,马村', '113.322332', '35.256108', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1974, 387922, 2, 387707, '410811000000', '山阳区', '河南,焦作,山阳', '113.254881', '35.214507', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1975, 387985, 2, 387707, '410821000000', '修武县', '河南,焦作,修武', '113.447755', '35.223514', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1976, 388187, 2, 387707, '410822000000', '博爱县', '河南,焦作,博爱', '113.064379', '35.171045', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1977, 388415, 2, 387707, '410823000000', '武陟县', '河南,焦作,武陟', '113.401679', '35.099378', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1978, 388783, 2, 387707, '410825000000', '温县', '河南,焦作,温县', '113.080530', '34.940189', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1979, 389064, 2, 387707, '410882000000', '沁阳市', '河南,焦作,沁阳', '112.950716', '35.087539', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1980, 389418, 2, 387707, '410883000000', '孟州市', '河南,焦作,孟州', '112.789612', '34.907970', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1981, 389720, 2, 389719, '410901000000', '市辖区', '河南,濮阳', '115.029215', '35.761829', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1982, 389721, 2, 389719, '410902000000', '华龙区', '河南,濮阳,华龙', '115.074151', '35.777346', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1983, 389884, 2, 389719, '410922000000', '清丰县', '河南,濮阳,清丰', '115.104389', '35.885180', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1984, 390411, 2, 389719, '410923000000', '南乐县', '河南,濮阳,南乐', '115.204752', '36.069664', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1985, 390751, 2, 389719, '410926000000', '范县', '河南,濮阳,范县', '115.504201', '35.851907', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1986, 391345, 2, 389719, '410927000000', '台前县', '河南,濮阳,台前', '115.871906', '35.969390', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1987, 391730, 2, 389719, '410928000000', '濮阳县', '河南,濮阳,濮阳', '115.029078', '35.712193', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1988, 392738, 2, 392737, '411001000000', '市辖区', '河南,许昌', '113.852640', '34.035506', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1989, 392739, 2, 392737, '411002000000', '魏都区', '河南,许昌,魏都', '113.822647', '34.025342', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1990, 392850, 2, 392737, '411023000000', '许昌县', '河南,许昌,许昌', '113.822983', '34.124660', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1991, 393306, 2, 392737, '411024000000', '鄢陵县', '河南,许昌,鄢陵', '114.177400', '34.102332', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1992, 393705, 2, 392737, '411025000000', '襄城县', '河南,许昌,襄城', '113.482453', '33.846369', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1993, 394170, 2, 392737, '411081000000', '禹州市', '河南,许昌,禹州', '113.488478', '34.140701', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1994, 394863, 2, 392737, '411082000000', '长葛市', '河南,许昌,长葛', '113.819888', '34.194136', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1995, 395255, 2, 395254, '411101000000', '市辖区', '河南,漯河', '114.016539', '33.581412', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1996, 395256, 2, 395254, '411102000000', '源汇区', '河南,漯河,源汇', '114.017948', '33.565441', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1997, 395392, 2, 395254, '411103000000', '郾城区', '河南,漯河,郾城', '114.006944', '33.587409', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1998, 395601, 2, 395254, '411104000000', '召陵区', '河南,漯河,召陵', '114.093902', '33.586565', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (1999, 395816, 2, 395254, '411121000000', '舞阳县', '河南,漯河,舞阳', '113.609286', '33.437877', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2000, 396228, 2, 395254, '411122000000', '临颍县', '河南,漯河,临颍', '113.931203', '33.827304', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2001, 396612, 2, 396611, '411201000000', '市辖区', '河南,三门峡', '111.200135', '34.772493', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2002, 396613, 2, 396611, '411202000000', '湖滨区', '河南,三门峡,湖滨', '111.188398', '34.770886', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2003, 396710, 2, 396611, '411203000000', '陕州区', '河南,三门峡,陕州', '111.103563', '34.720548', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2004, 396996, 2, 396611, '411221000000', '渑池县', '河南,三门峡,渑池', '111.761504', '34.767244', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2005, 397257, 2, 396611, '411224000000', '卢氏县', '河南,三门峡,卢氏', '111.047858', '34.054324', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2006, 397644, 2, 396611, '411281000000', '义马市', '河南,三门峡,义马', '111.874393', '34.747129', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2007, 397687, 2, 396611, '411282000000', '灵宝市', '河南,三门峡,灵宝', '110.894220', '34.516828', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2008, 398170, 2, 398169, '411301000000', '市辖区', '河南,南阳', '112.528321', '32.990833', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2009, 398171, 2, 398169, '411302000000', '宛城区', '河南,南阳,宛城', '112.539559', '33.003784', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2010, 398437, 2, 398169, '411303000000', '卧龙区', '河南,南阳,卧龙', '112.528789', '32.989877', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2011, 398747, 2, 398169, '411321000000', '南召县', '河南,南阳,南召', '112.429133', '33.489877', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2012, 399117, 2, 398169, '411322000000', '方城县', '河南,南阳,方城', '113.012494', '33.254391', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2013, 399702, 2, 398169, '411323000000', '西峡县', '河南,南阳,西峡', '111.473530', '33.307294', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2014, 400021, 2, 398169, '411324000000', '镇平县', '河南,南阳,镇平', '112.234698', '33.034111', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2015, 400474, 2, 398169, '411325000000', '内乡县', '河南,南阳,内乡', '111.849392', '33.044865', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2016, 400787, 2, 398169, '411326000000', '淅川县', '河南,南阳,淅川', '111.490964', '33.137820', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2017, 401305, 2, 398169, '411327000000', '社旗县', '河南,南阳,社旗', '112.948245', '33.056109', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2018, 401579, 2, 398169, '411328000000', '唐河县', '河南,南阳,唐河', '112.807637', '32.681335', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2019, 402141, 2, 398169, '411329000000', '新野县', '河南,南阳,新野', '112.360026', '32.520805', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2020, 402429, 2, 398169, '411330000000', '桐柏县', '河南,南阳,桐柏', '113.428287', '32.380073', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2021, 402668, 2, 398169, '411381000000', '邓州市', '河南,南阳,邓州', '112.087278', '32.687938', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2022, 403312, 2, 403311, '411401000000', '市辖区', '河南,商丘', '115.656370', '34.414172', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2023, 403313, 2, 403311, '411402000000', '梁园区', '河南,商丘,梁园', '115.613965', '34.443893', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2024, 403577, 2, 403311, '411403000000', '睢阳区', '河南,商丘,睢阳', '115.653302', '34.388390', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2025, 403992, 2, 403311, '411421000000', '民权县', '河南,商丘,民权', '115.179594', '34.647758', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2026, 404572, 2, 403311, '411422000000', '睢县', '河南,商丘,睢县', '115.071879', '34.445656', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2027, 405150, 2, 403311, '411423000000', '宁陵县', '河南,商丘,宁陵', '115.313690', '34.460232', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2028, 405530, 2, 403311, '411424000000', '柘城县', '河南,商丘,柘城', '115.305843', '34.091045', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2029, 406070, 2, 403311, '411425000000', '虞城县', '河南,商丘,虞城', '115.840511', '34.402512', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2030, 406717, 2, 403311, '411426000000', '夏邑县', '河南,商丘,夏邑', '116.131447', '34.237554', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2031, 407487, 2, 403311, '411481000000', '永城市', '河南,商丘,永城', '116.449500', '33.929291', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2032, 408288, 2, 408287, '411501000000', '市辖区', '河南,信阳', '114.091023', '32.146983', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2033, 408289, 2, 408287, '411502000000', '浉河区', '河南,信阳,浉河', '114.058713', '32.116803', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2034, 408566, 2, 408287, '411503000000', '平桥区', '河南,信阳,平桥', '114.125656', '32.101031', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2035, 408914, 2, 408287, '411521000000', '罗山县', '河南,信阳,罗山', '114.513012', '32.203073', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2036, 409241, 2, 408287, '411522000000', '光山县', '河南,信阳,光山', '114.919033', '32.011103', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2037, 409621, 2, 408287, '411523000000', '新县', '河南,信阳,新县', '114.879239', '31.643918', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2038, 409844, 2, 408287, '411524000000', '商城县', '河南,信阳,商城', '115.406862', '31.798378', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2039, 410235, 2, 408287, '411525000000', '固始县', '河南,信阳,固始', '115.654482', '32.168137', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2040, 410916, 2, 408287, '411526000000', '潢川县', '河南,信阳,潢川', '115.051808', '32.131383', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2041, 411226, 2, 408287, '411527000000', '淮滨县', '河南,信阳,淮滨', '115.419538', '32.473258', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2042, 411541, 2, 408287, '411528000000', '息县', '河南,信阳,息县', '114.740456', '32.342792', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2043, 411926, 2, 411925, '411601000000', '市辖区', '河南,周口', '114.696951', '33.626149', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2044, 411927, 2, 411925, '411602000000', '川汇区', '河南,周口,川汇', '114.650628', '33.647598', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2045, 412097, 2, 411925, '411621000000', '扶沟县', '河南,周口,扶沟', '114.394915', '34.059862', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2046, 412526, 2, 411925, '411622000000', '西华县', '河南,周口,西华', '114.529756', '33.767408', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2047, 413030, 2, 411925, '411623000000', '商水县', '河南,周口,商水', '114.611596', '33.542480', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2048, 413644, 2, 411925, '411624000000', '沈丘县', '河南,周口,沈丘', '115.098583', '33.409369', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2049, 414239, 2, 411925, '411625000000', '郸城县', '河南,周口,郸城', '115.177189', '33.644743', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2050, 414779, 2, 411925, '411626000000', '淮阳县', '河南,周口,淮阳', '114.886154', '33.731561', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2051, 415271, 2, 411925, '411627000000', '太康县', '河南,周口,太康', '114.837887', '34.063798', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2052, 416070, 2, 411925, '411628000000', '鹿邑县', '河南,周口,鹿邑', '115.484454', '33.860000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2053, 416651, 2, 411925, '411681000000', '项城市', '河南,周口,项城', '114.875333', '33.465838', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2054, 417175, 2, 417174, '411701000000', '市辖区', '河南,驻马店', '114.022298', '33.011529', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2055, 417176, 2, 417174, '411702000000', '驿城区', '河南,驻马店,驿城', '113.993914', '32.973054', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2056, 417405, 2, 417174, '411721000000', '西平县', '河南,驻马店,西平', '114.021539', '33.387685', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2057, 417712, 2, 417174, '411722000000', '上蔡县', '河南,驻马店,上蔡', '114.264381', '33.262439', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2058, 418199, 2, 417174, '411723000000', '平舆县', '河南,驻马店,平舆', '114.619159', '32.962710', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2059, 418443, 2, 417174, '411724000000', '正阳县', '河南,驻马店,正阳', '114.392774', '32.605697', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2060, 418759, 2, 417174, '411725000000', '确山县', '河南,驻马店,确山', '114.026430', '32.802065', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2061, 418973, 2, 417174, '411726000000', '泌阳县', '河南,驻马店,泌阳', '113.327144', '32.723975', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2062, 419354, 2, 417174, '411727000000', '汝南县', '河南,驻马店,汝南', '114.362379', '33.006729', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2063, 419654, 2, 417174, '411728000000', '遂平县', '河南,驻马店,遂平', '114.013182', '33.145649', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2064, 419874, 2, 417174, '411729000000', '新蔡县', '河南,驻马店,新蔡', '114.965469', '32.744855', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2065, 420259, 2, 420258, '419001000000', '济源市', '河南,济源', '112.602341', '35.069031', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2066, 420826, 2, 420825, '420101000000', '市辖区', '湖北,武汉', '114.305392', '30.593098', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2067, 420827, 2, 420825, '420102000000', '江岸区', '湖北,武汉,江岸', '114.309091', '30.600064', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2068, 420996, 2, 420825, '420103000000', '江汉区', '湖北,武汉,江汉', '114.270871', '30.601430', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2069, 421122, 2, 420825, '420104000000', '硚口区', '湖北,武汉,硚口', '114.214920', '30.582202', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2070, 421270, 2, 420825, '420105000000', '汉阳区', '湖北,武汉,汉阳', '114.218724', '30.553905', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2071, 421400, 2, 420825, '420106000000', '武昌区', '湖北,武汉,武昌', '114.316223', '30.554235', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2072, 421559, 2, 420825, '420107000000', '青山区', '湖北,武汉,青山', '114.385539', '30.639630', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2073, 421676, 2, 420825, '420111000000', '洪山区', '湖北,武汉,洪山', '114.343913', '30.500317', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2074, 421983, 2, 420825, '420112000000', '东西湖区', '湖北,武汉,东西湖', '114.136886', '30.620020', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2075, 422149, 2, 420825, '420113000000', '汉南区', '湖北,武汉,汉南', '114.084445', '30.308856', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2076, 422220, 2, 420825, '420114000000', '蔡甸区', '湖北,武汉,蔡甸', '114.029328', '30.582271', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2077, 422631, 2, 420825, '420115000000', '江夏区', '湖北,武汉,江夏', '114.321551', '30.375748', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2078, 423075, 2, 420825, '420116000000', '黄陂区', '湖北,武汉,黄陂', '114.375743', '30.882557', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2079, 423775, 2, 420825, '420117000000', '新洲区', '湖北,武汉,新洲', '114.801107', '30.841544', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2080, 424450, 2, 424449, '420201000000', '市辖区', '湖北,黄石', '115.038520', '30.199652', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2081, 424451, 2, 424449, '420202000000', '黄石港区', '湖北,黄石,黄石港', '115.065978', '30.223003', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2082, 424489, 2, 424449, '420203000000', '西塞山区', '湖北,黄石,西塞山', '115.109955', '30.204924', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2083, 424531, 2, 424449, '420204000000', '下陆区', '湖北,黄石,下陆', '114.961327', '30.173913', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2084, 424574, 2, 424449, '420205000000', '铁山区', '湖北,黄石,铁山', '114.901412', '30.206592', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2085, 424590, 2, 424449, '420222000000', '阳新县', '湖北,黄石,阳新', '115.215227', '29.830258', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2086, 425070, 2, 424449, '420281000000', '大冶市', '湖北,黄石,大冶', '114.979875', '30.095643', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2087, 425509, 2, 425508, '420301000000', '市辖区', '湖北,十堰', '110.797990', '32.629397', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2088, 425510, 2, 425508, '420302000000', '茅箭区', '湖北,十堰,茅箭', '110.813621', '32.591929', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2089, 425592, 2, 425508, '420303000000', '张湾区', '湖北,十堰,张湾', '110.769133', '32.652297', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2090, 425709, 2, 425508, '420304000000', '郧阳区', '湖北,十堰,郧阳', '110.812050', '32.834776', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2091, 426078, 2, 425508, '420322000000', '郧西县', '湖北,十堰,郧西', '110.425983', '32.993182', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2092, 426440, 2, 425508, '420323000000', '竹山县', '湖北,十堰,竹山', '110.228694', '32.224875', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2093, 426708, 2, 425508, '420324000000', '竹溪县', '湖北,十堰,竹溪', '109.715304', '32.318255', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2094, 427085, 2, 425508, '420325000000', '房县', '湖北,十堰,房县', '110.726670', '32.040085', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2095, 427420, 2, 425508, '420381000000', '丹江口市', '湖北,十堰,丹江口', '111.513127', '32.540157', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2096, 427711, 2, 427710, '420501000000', '市辖区', '湖北,宜昌', '111.286471', '30.691967', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2097, 427712, 2, 427710, '420502000000', '西陵区', '湖北,宜昌,西陵', '111.285646', '30.710782', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2098, 427828, 2, 427710, '420503000000', '伍家岗区', '湖北,宜昌,伍家岗', '111.361037', '30.644334', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2099, 427894, 2, 427710, '420504000000', '点军区', '湖北,宜昌,点军', '111.268120', '30.693247', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2100, 427953, 2, 427710, '420505000000', '猇亭区', '湖北,宜昌,猇亭', '111.434620', '30.530903', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2101, 427983, 2, 427710, '420506000000', '夷陵区', '湖北,宜昌,夷陵', '111.326380', '30.770006', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2102, 428194, 2, 427710, '420525000000', '远安县', '湖北,宜昌,远安', '111.640508', '31.060869', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2103, 428319, 2, 427710, '420526000000', '兴山县', '湖北,宜昌,兴山', '110.746805', '31.348196', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2104, 428424, 2, 427710, '420527000000', '秭归县', '湖北,宜昌,秭归', '110.977711', '30.825897', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2105, 428630, 2, 427710, '420528000000', '长阳土家族自治县', '湖北,宜昌,长阳', '111.207242', '30.472763', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2106, 428807, 2, 427710, '420529000000', '五峰土家族自治县', '湖北,宜昌,五峰', '110.674706', '30.199688', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2107, 428924, 2, 427710, '420581000000', '宜都市', '湖北,宜昌,宜都', '111.450006', '30.378327', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2108, 429089, 2, 427710, '420582000000', '当阳市', '湖北,宜昌,当阳', '111.788312', '30.821266', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2109, 429273, 2, 427710, '420583000000', '枝江市', '湖北,宜昌,枝江', '111.760530', '30.425940', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2110, 429502, 2, 429501, '420601000000', '市辖区', '湖北,襄阳', '112.122414', '32.008986', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2111, 429503, 2, 429501, '420602000000', '襄城区', '湖北,襄阳,襄城', '112.133974', '32.010351', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2112, 429687, 2, 429501, '420606000000', '樊城区', '湖北,襄阳,樊城', '112.135684', '32.044833', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2113, 429907, 2, 429501, '420607000000', '襄州区', '湖北,襄阳,襄州', '112.211899', '32.087298', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2114, 430402, 2, 429501, '420624000000', '南漳县', '湖北,襄阳,南漳', '111.838905', '31.774636', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2115, 430723, 2, 429501, '420625000000', '谷城县', '湖北,襄阳,谷城', '111.652982', '32.263849', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2116, 431025, 2, 429501, '420626000000', '保康县', '湖北,襄阳,保康', '111.261309', '31.878310', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2117, 431301, 2, 429501, '420682000000', '老河口市', '湖北,襄阳,老河口', '111.683861', '32.359068', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2118, 431575, 2, 429501, '420683000000', '枣阳市', '湖北,襄阳,枣阳', '112.771959', '32.128818', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2119, 432166, 2, 429501, '420684000000', '宜城市', '湖北,襄阳,宜城', '112.257788', '31.719806', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2120, 432416, 2, 432415, '420701000000', '市辖区', '湖北,鄂州', '114.894843', '30.391940', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2121, 432417, 2, 432415, '420702000000', '梁子湖区', '湖北,鄂州,梁子湖', '114.684731', '30.100141', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2122, 432510, 2, 432415, '420703000000', '华容区', '湖北,鄂州,华容', '114.729878', '30.534310', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2123, 432633, 2, 432415, '420704000000', '鄂城区', '湖北,鄂州,鄂城', '114.891615', '30.400572', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2124, 432830, 2, 432829, '420801000000', '市辖区', '湖北,荆门', '112.199265', '31.035423', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2125, 432831, 2, 432829, '420802000000', '东宝区', '湖北,荆门,东宝', '112.201493', '31.051852', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2126, 433052, 2, 432829, '420804000000', '掇刀区', '湖北,荆门,掇刀', '112.207833', '30.973431', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2127, 433182, 2, 432829, '420821000000', '京山县', '湖北,荆门,京山', '113.119566', '31.018457', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2128, 433634, 2, 432829, '420822000000', '沙洋县', '湖北,荆门,沙洋', '112.588581', '30.709221', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2129, 433944, 2, 432829, '420881000000', '钟祥市', '湖北,荆门,钟祥', '112.588121', '31.167820', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2130, 434549, 2, 434548, '420901000000', '市辖区', '湖北,孝感', '113.916902', '30.924568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2131, 434550, 2, 434548, '420902000000', '孝南区', '湖北,孝感,孝南', '113.910958', '30.916874', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2132, 435091, 2, 434548, '420921000000', '孝昌县', '湖北,孝感,孝昌', '113.998010', '31.258159', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2133, 435563, 2, 434548, '420922000000', '大悟县', '湖北,孝感,大悟', '114.127022', '31.561165', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2134, 435956, 2, 434548, '420923000000', '云梦县', '湖北,孝感,云梦', '113.753554', '31.020983', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2135, 436267, 2, 434548, '420981000000', '应城市', '湖北,孝感,应城', '113.572707', '30.928370', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2136, 436706, 2, 434548, '420982000000', '安陆市', '湖北,孝感,安陆', '113.688941', '31.255610', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2137, 437119, 2, 434548, '420984000000', '汉川市', '湖北,孝感,汉川', '113.839149', '30.661244', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2138, 437780, 2, 437779, '421001000000', '市辖区', '湖北,荆州', '112.239741', '30.335165', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2139, 437781, 2, 437779, '421002000000', '沙市区', '湖北,荆州,沙市', '112.255583', '30.311056', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2140, 437909, 2, 437779, '421003000000', '荆州区', '湖北,荆州,荆州', '112.190185', '30.352832', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2141, 438103, 2, 437779, '421022000000', '公安县', '湖北,荆州,公安', '112.229648', '30.058336', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2142, 438512, 2, 437779, '421023000000', '监利县', '湖北,荆州,监利', '112.897465', '29.811574', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2143, 439263, 2, 437779, '421024000000', '江陵县', '湖北,荆州,江陵', '112.424664', '30.041822', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2144, 439491, 2, 437779, '421081000000', '石首市', '湖北,荆州,石首', '112.425454', '29.720938', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2145, 439836, 2, 437779, '421083000000', '洪湖市', '湖北,荆州,洪湖', '113.475980', '29.825458', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2146, 440344, 2, 437779, '421087000000', '松滋市', '湖北,荆州,松滋', '111.756773', '30.174522', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2147, 440640, 2, 440639, '421101000000', '市辖区', '湖北,黄冈', '114.872316', '30.453905', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2148, 440641, 2, 440639, '421102000000', '黄州区', '湖北,黄冈,黄州', '114.879398', '30.434050', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2149, 440797, 2, 440639, '421121000000', '团风县', '湖北,黄冈,团风', '114.872191', '30.643569', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2150, 441110, 2, 440639, '421122000000', '红安县', '湖北,黄冈,红安', '114.618236', '31.288153', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2151, 441550, 2, 440639, '421123000000', '罗田县', '湖北,黄冈,罗田', '115.399492', '30.783100', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2152, 442017, 2, 440639, '421124000000', '英山县', '湖北,黄冈,英山', '115.681259', '30.734959', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2153, 442351, 2, 440639, '421125000000', '浠水县', '湖北,黄冈,浠水', '115.265535', '30.451867', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2154, 443040, 2, 440639, '421126000000', '蕲春县', '湖北,黄冈,蕲春', '115.437008', '30.225964', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2155, 443641, 2, 440639, '421127000000', '黄梅县', '湖北,黄冈,黄梅', '115.944219', '30.070454', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2156, 444186, 2, 440639, '421181000000', '麻城市', '湖北,黄冈,麻城', '115.008163', '31.172740', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2157, 444684, 2, 440639, '421182000000', '武穴市', '湖北,黄冈,武穴', '115.561217', '29.844107', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2158, 445041, 2, 445040, '421201000000', '市辖区', '湖北,咸宁', '114.322492', '29.841443', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2159, 445042, 2, 445040, '421202000000', '咸安区', '湖北,咸宁,咸安', '114.298711', '29.852892', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2160, 445249, 2, 445040, '421221000000', '嘉鱼县', '湖北,咸宁,嘉鱼', '113.939277', '29.970737', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2161, 445363, 2, 445040, '421222000000', '通城县', '湖北,咸宁,通城', '113.816966', '29.245269', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2162, 445569, 2, 445040, '421223000000', '崇阳县', '湖北,咸宁,崇阳', '114.039828', '29.555605', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2163, 445786, 2, 445040, '421224000000', '通山县', '湖北,咸宁,通山', '114.482606', '29.605376', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2164, 446007, 2, 445040, '421281000000', '赤壁市', '湖北,咸宁,赤壁', '113.900628', '29.724692', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2165, 446213, 2, 446212, '421301000000', '市辖区', '湖北,随州', '113.382458', '31.690215', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2166, 446214, 2, 446212, '421303000000', '曾都区', '湖北,随州,曾都', '113.371121', '31.716280', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2167, 446433, 2, 446212, '421321000000', '随县', '湖北,随州,随县', '113.299528', '31.853833', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2168, 446847, 2, 446212, '421381000000', '广水市', '湖北,随州,广水', '113.825890', '31.616854', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2169, 447269, 2, 447268, '422801000000', '恩施市', '湖北,恩施,恩施', '109.479665', '30.294680', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2170, 447495, 2, 447268, '422802000000', '利川市', '湖北,恩施,利川', '108.936376', '30.290996', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2171, 448099, 2, 447268, '422822000000', '建始县', '湖北,恩施,建始', '109.726667', '30.601555', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2172, 448521, 2, 447268, '422823000000', '巴东县', '湖北,恩施,巴东', '110.340756', '31.042324', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2173, 448856, 2, 447268, '422825000000', '宣恩县', '湖北,恩施,宣恩', '109.491485', '29.986899', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2174, 449150, 2, 447268, '422826000000', '咸丰县', '湖北,恩施,咸丰', '109.139726', '29.665203', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2175, 449431, 2, 447268, '422827000000', '来凤县', '湖北,恩施,来凤', '109.407828', '29.493485', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2176, 449636, 2, 447268, '422828000000', '鹤峰县', '湖北,恩施,鹤峰', '110.033662', '29.890171', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2177, 449866, 2, 449865, '429004000000', '仙桃市', '湖北,仙桃', '113.442970', '30.328407', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2178, 450653, 2, 449865, '429005000000', '潜江市', '湖北,潜江', '112.900284', '30.401947', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2179, 451150, 2, 449865, '429006000000', '天门市', '湖北,天门', '113.166557', '30.663719', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2180, 452034, 2, 449865, '429021000000', '神农架林区', '湖北,神农架林', '110.675758', '31.744898', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2181, 452125, 2, 452124, '430101000000', '市辖区', '湖南,长沙', '112.938814', '28.228209', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2182, 452126, 2, 452124, '430102000000', '芙蓉区', '湖南,长沙,芙蓉', '113.032539', '28.185386', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2183, 452213, 2, 452124, '430103000000', '天心区', '湖南,长沙,天心', '112.989855', '28.112525', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2184, 452314, 2, 452124, '430104000000', '岳麓区', '湖南,长沙,岳麓', '112.931383', '28.235243', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2185, 452486, 2, 452124, '430105000000', '开福区', '湖南,长沙,开福', '112.985545', '28.257269', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2186, 452610, 2, 452124, '430111000000', '雨花区', '湖南,长沙,雨花', '113.038017', '28.137710', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2187, 452771, 2, 452124, '430112000000', '望城区', '湖南,长沙,望城', '112.819549', '28.347458', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2188, 452924, 2, 452124, '430121000000', '长沙县', '湖南,长沙,长沙', '113.080810', '28.246150', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2189, 453140, 2, 452124, '430124000000', '宁乡县', '湖南,长沙,宁乡', '112.551885', '28.277483', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2190, 453444, 2, 452124, '430181000000', '浏阳市', '湖南,长沙,浏阳', '113.643076', '28.162833', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2191, 453800, 2, 453799, '430201000000', '市辖区', '湖南,株洲', '113.134002', '27.827550', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2192, 453801, 2, 453799, '430202000000', '荷塘区', '湖南,株洲,荷塘', '113.173487', '27.855929', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2193, 453867, 2, 453799, '430203000000', '芦淞区', '湖南,株洲,芦淞', '113.152724', '27.785070', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2194, 453957, 2, 453799, '430204000000', '石峰区', '湖南,株洲,石峰', '113.117732', '27.875445', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2195, 454008, 2, 453799, '430211000000', '天元区', '湖南,株洲,天元', '113.082216', '27.826867', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2196, 454113, 2, 453799, '430221000000', '株洲县', '湖南,株洲,株洲', '113.144006', '27.699346', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2197, 454261, 2, 453799, '430223000000', '攸县', '湖南,株洲,攸县', '113.345309', '27.000227', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2198, 454580, 2, 453799, '430224000000', '茶陵县', '湖南,株洲,茶陵', '113.539280', '26.777492', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2199, 454845, 2, 453799, '430225000000', '炎陵县', '湖南,株洲,炎陵', '113.772655', '26.489902', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2200, 454989, 2, 453799, '430281000000', '醴陵市', '湖南,株洲,醴陵', '113.496894', '27.646130', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2201, 455284, 2, 455283, '430301000000', '市辖区', '湖南,湘潭', '112.944049', '27.829738', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2202, 455285, 2, 455283, '430302000000', '雨湖区', '湖南,湘潭,雨湖', '112.907238', '27.856250', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2203, 455426, 2, 455283, '430304000000', '岳塘区', '湖南,湘潭,岳塘', '112.969480', '27.872028', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2204, 455515, 2, 455283, '430321000000', '湘潭县', '湖南,湘潭,湘潭', '112.950831', '27.778958', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2205, 455889, 2, 455283, '430381000000', '湘乡市', '湖南,湘潭,湘乡', '112.535028', '27.734120', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2206, 456260, 2, 455283, '430382000000', '韶山市', '湖南,湘潭,韶山', '112.526671', '27.915009', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2207, 456304, 2, 456303, '430401000000', '市辖区', '湖南,衡阳', '112.571997', '26.893230', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2208, 456305, 2, 456303, '430405000000', '珠晖区', '湖南,衡阳,珠晖', '112.620112', '26.894657', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2209, 456391, 2, 456303, '430406000000', '雁峰区', '湖南,衡阳,雁峰', '112.616546', '26.888666', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2210, 456449, 2, 456303, '430407000000', '石鼓区', '湖南,衡阳,石鼓', '112.598089', '26.943215', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2211, 456502, 2, 456303, '430408000000', '蒸湘区', '湖南,衡阳,蒸湘', '112.567064', '26.911404', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2212, 456558, 2, 456303, '430412000000', '南岳区', '湖南,衡阳,南岳', '112.738604', '27.232444', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2213, 456587, 2, 456303, '430421000000', '衡阳县', '湖南,衡阳,衡阳', '112.370532', '26.969635', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2214, 457104, 2, 456303, '430422000000', '衡南县', '湖南,衡阳,衡南', '112.677877', '26.738248', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2215, 457576, 2, 456303, '430423000000', '衡山县', '湖南,衡阳,衡山', '112.868268', '27.230291', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2216, 457742, 2, 456303, '430424000000', '衡东县', '湖南,衡阳,衡东', '112.953168', '27.081170', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2217, 458018, 2, 456303, '430426000000', '祁东县', '湖南,衡阳,祁东', '112.090357', '26.799896', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2218, 458411, 2, 456303, '430481000000', '耒阳市', '湖南,衡阳,耒阳', '112.859795', '26.422275', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2219, 458820, 2, 456303, '430482000000', '常宁市', '湖南,衡阳,常宁', '112.399995', '26.420932', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2220, 459252, 2, 459251, '430501000000', '市辖区', '湖南,邵阳', '111.467791', '27.238892', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2221, 459253, 2, 459251, '430502000000', '双清区', '湖南,邵阳,双清', '111.496341', '27.232708', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2222, 459357, 2, 459251, '430503000000', '大祥区', '湖南,邵阳,大祥', '111.439091', '27.221452', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2223, 459470, 2, 459251, '430511000000', '北塔区', '湖南,邵阳,北塔', '111.452197', '27.246489', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2224, 459517, 2, 459251, '430521000000', '邵东县', '湖南,邵阳,邵东', '111.744258', '27.258942', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2225, 460126, 2, 459251, '430522000000', '新邵县', '湖南,邵阳,新邵', '111.458657', '27.320918', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2226, 460558, 2, 459251, '430523000000', '邵阳县', '湖南,邵阳,邵阳', '111.273806', '26.990637', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2227, 461014, 2, 459251, '430524000000', '隆回县', '湖南,邵阳,隆回', '111.032438', '27.113978', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2228, 461613, 2, 459251, '430525000000', '洞口县', '湖南,邵阳,洞口', '110.575846', '27.060321', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2229, 462000, 2, 459251, '430527000000', '绥宁县', '湖南,邵阳,绥宁', '110.155655', '26.581955', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2230, 462257, 2, 459251, '430528000000', '新宁县', '湖南,邵阳,新宁', '110.856623', '26.433418', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2231, 462600, 2, 459251, '430529000000', '城步苗族自治县', '湖南,邵阳,城步', '111.467791', '27.238892', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2232, 462807, 2, 459251, '430581000000', '武冈市', '湖南,邵阳,武冈', '110.631884', '26.726599', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2233, 463142, 2, 463141, '430601000000', '市辖区', '湖南,岳阳', '113.128958', '29.357104', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2234, 463143, 2, 463141, '430602000000', '岳阳楼区', '湖南,岳阳,岳阳楼', '113.129702', '29.371903', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2235, 463333, 2, 463141, '430603000000', '云溪区', '湖南,岳阳,云溪', '113.272313', '29.472746', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2236, 463397, 2, 463141, '430611000000', '君山区', '湖南,岳阳,君山', '113.006435', '29.461106', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2237, 463489, 2, 463141, '430621000000', '岳阳县', '湖南,岳阳,岳阳', '113.116418', '29.144067', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2238, 463722, 2, 463141, '430623000000', '华容县', '湖南,岳阳,华容', '112.540463', '29.531057', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2239, 463961, 2, 463141, '430624000000', '湘阴县', '湖南,岳阳,湘阴', '112.909426', '28.689105', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2240, 464180, 2, 463141, '430626000000', '平江县', '湖南,岳阳,平江', '113.581234', '28.701868', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2241, 464747, 2, 463141, '430681000000', '汨罗市', '湖南,岳阳,汨罗', '113.067259', '28.806890', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2242, 464944, 2, 463141, '430682000000', '临湘市', '湖南,岳阳,临湘', '113.450423', '29.476849', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2243, 465106, 2, 465105, '430701000000', '市辖区', '湖南,常德', '111.698497', '29.031673', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2244, 465107, 2, 465105, '430702000000', '武陵区', '湖南,常德,武陵', '111.683153', '29.055163', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2245, 465295, 2, 465105, '430703000000', '鼎城区', '湖南,常德,鼎城', '111.680783', '29.018593', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2246, 465661, 2, 465105, '430721000000', '安乡县', '湖南,常德,安乡', '112.171131', '29.411309', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2247, 465844, 2, 465105, '430722000000', '汉寿县', '湖南,常德,汉寿', '111.970514', '28.906107', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2248, 466173, 2, 465105, '430723000000', '澧县', '湖南,常德,澧县', '111.758702', '29.633237', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2249, 466483, 2, 465105, '430724000000', '临澧县', '湖南,常德,临澧', '111.647518', '29.440793', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2250, 466654, 2, 465105, '430725000000', '桃源县', '湖南,常德,桃源', '111.488925', '28.902503', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2251, 467112, 2, 465105, '430726000000', '石门县', '湖南,常德,石门', '111.380014', '29.584293', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2252, 467471, 2, 465105, '430781000000', '津市市', '湖南,常德,津', '111.698497', '29.031673', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2253, 467563, 2, 467562, '430801000000', '市辖区', '湖南,张家界', '110.479191', '29.117096', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2254, 467564, 2, 467562, '430802000000', '永定区', '湖南,张家界,永定', '110.537138', '29.119856', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2255, 467841, 2, 467562, '430811000000', '武陵源区', '湖南,张家界,武陵源', '110.550434', '29.345730', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2256, 467881, 2, 467562, '430821000000', '慈利县', '湖南,张家界,慈利', '111.139711', '29.429972', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2257, 468338, 2, 467562, '430822000000', '桑植县', '湖南,张家界,桑植', '110.204911', '29.414264', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2258, 468661, 2, 468660, '430901000000', '市辖区', '湖南,益阳', '112.355180', '28.553860', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2259, 468662, 2, 468660, '430902000000', '资阳区', '湖南,益阳,资阳', '112.324322', '28.590966', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2260, 468790, 2, 468660, '430903000000', '赫山区', '湖南,益阳,赫山', '112.374024', '28.579343', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2261, 469015, 2, 468660, '430921000000', '南县', '湖南,益阳,南县', '112.396241', '29.361338', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2262, 469192, 2, 468660, '430922000000', '桃江县', '湖南,益阳,桃江', '112.155822', '28.518085', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2263, 469452, 2, 468660, '430923000000', '安化县', '湖南,益阳,安化', '111.212846', '28.374107', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2264, 469909, 2, 468660, '430981000000', '沅江市', '湖南,益阳,沅江', '112.355954', '28.847045', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2265, 470124, 2, 470123, '431001000000', '市辖区', '湖南,郴州', '113.014717', '25.770509', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2266, 470125, 2, 470123, '431002000000', '北湖区', '湖南,郴州,北湖', '113.011035', '25.784054', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2267, 470300, 2, 470123, '431003000000', '苏仙区', '湖南,郴州,苏仙', '113.042441', '25.800370', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2268, 470500, 2, 470123, '431021000000', '桂阳县', '湖南,郴州,桂阳', '112.734176', '25.754167', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2269, 470894, 2, 470123, '431022000000', '宜章县', '湖南,郴州,宜章', '112.948772', '25.399792', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2270, 471178, 2, 470123, '431023000000', '永兴县', '湖南,郴州,永兴', '113.116528', '26.127151', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2271, 471473, 2, 470123, '431024000000', '嘉禾县', '湖南,郴州,嘉禾', '112.369021', '25.587520', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2272, 471685, 2, 470123, '431025000000', '临武县', '湖南,郴州,临武', '112.563456', '25.275560', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2273, 471908, 2, 470123, '431026000000', '汝城县', '湖南,郴州,汝城', '113.684727', '25.532816', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2274, 472174, 2, 470123, '431027000000', '桂东县', '湖南,郴州,桂东', '113.944614', '26.077616', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2275, 472301, 2, 470123, '431028000000', '安仁县', '湖南,郴州,安仁', '113.269441', '26.709056', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2276, 472477, 2, 470123, '431081000000', '资兴市', '湖南,郴州,资兴', '113.236146', '25.976243', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2277, 472710, 2, 472709, '431101000000', '市辖区', '湖南,永州', '111.613445', '26.420394', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2278, 472711, 2, 472709, '431102000000', '零陵区', '湖南,永州,零陵', '111.631109', '26.221936', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2279, 473062, 2, 472709, '431103000000', '冷水滩区', '湖南,永州,冷水滩', '111.592143', '26.461077', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2280, 473284, 2, 472709, '431121000000', '祁阳县', '湖南,永州,祁阳', '111.840657', '26.580120', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2281, 473871, 2, 472709, '431122000000', '东安县', '湖南,永州,东安', '111.314117', '26.394404', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2282, 474233, 2, 472709, '431123000000', '双牌县', '湖南,永州,双牌', '111.659967', '25.961910', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2283, 474367, 2, 472709, '431124000000', '道县', '湖南,永州,道县', '111.600796', '25.526438', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2284, 474761, 2, 472709, '431125000000', '江永县', '湖南,永州,江永', '111.343911', '25.273539', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2285, 474883, 2, 472709, '431126000000', '宁远县', '湖南,永州,宁远', '111.945805', '25.570976', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2286, 475326, 2, 472709, '431127000000', '蓝山县', '湖南,永州,蓝山', '112.196731', '25.369898', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2287, 475574, 2, 472709, '431128000000', '新田县', '湖南,永州,新田', '112.203287', '25.904305', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2288, 475819, 2, 472709, '431129000000', '江华瑶族自治县', '湖南,永州,江华', '111.579305', '25.185590', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2289, 476149, 2, 476148, '431201000000', '市辖区', '湖南,怀化', '109.998488', '27.554978', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2290, 476150, 2, 476148, '431202000000', '鹤城区', '湖南,怀化,鹤城', '110.040315', '27.578926', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2291, 476288, 2, 476148, '431221000000', '中方县', '湖南,怀化,中方', '109.944712', '27.440139', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2292, 476449, 2, 476148, '431222000000', '沅陵县', '湖南,怀化,沅陵', '110.393844', '28.452686', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2293, 476874, 2, 476148, '431223000000', '辰溪县', '湖南,怀化,辰溪', '110.183917', '28.006336', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2294, 477191, 2, 476148, '431224000000', '溆浦县', '湖南,怀化,溆浦', '110.594921', '27.908281', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2295, 477633, 2, 476148, '431225000000', '会同县', '湖南,怀化,会同', '109.735661', '26.887239', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2296, 477895, 2, 476148, '431226000000', '麻阳苗族自治县', '湖南,怀化,麻阳', '109.802587', '27.865548', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2297, 478135, 2, 476148, '431227000000', '新晃侗族自治县', '湖南,怀化,新晃', '109.174932', '27.352673', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2298, 478299, 2, 476148, '431228000000', '芷江侗族自治县', '湖南,怀化,芷江', '109.684629', '27.443499', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2299, 478536, 2, 476148, '431229000000', '靖州苗族侗族自治县', '湖南,怀化,靖州', '109.696311', '26.575052', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2300, 478685, 2, 476148, '431230000000', '通道侗族自治县', '湖南,怀化,通道', '109.784412', '26.158054', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2301, 478864, 2, 476148, '431281000000', '洪江市', '湖南,怀化,洪江', '109.836669', '27.208609', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2302, 479104, 2, 479103, '431301000000', '市辖区', '湖南,娄底', '111.993497', '27.700062', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2303, 479105, 2, 479103, '431302000000', '娄星区', '湖南,娄底,娄星', '112.001936', '27.729924', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2304, 479285, 2, 479103, '431321000000', '双峰县', '湖南,娄底,双峰', '112.175246', '27.456658', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2305, 479889, 2, 479103, '431322000000', '新化县', '湖南,娄底,新化', '111.327412', '27.726515', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2306, 480606, 2, 479103, '431381000000', '冷水江市', '湖南,娄底,冷水江', '111.435623', '27.685850', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2307, 480767, 2, 479103, '431382000000', '涟源市', '湖南,娄底,涟源', '111.664316', '27.692542', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2308, 481320, 2, 481319, '433101000000', '吉首市', '湖南,湘西,吉首', '109.698055', '28.262507', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2309, 481465, 2, 481319, '433122000000', '泸溪县', '湖南,湘西,泸溪', '110.219610', '28.216641', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2310, 481626, 2, 481319, '433123000000', '凤凰县', '湖南,湘西,凤凰', '109.598719', '27.948116', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2311, 481925, 2, 481319, '433124000000', '花垣县', '湖南,湘西,花垣', '109.482078', '28.572030', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2312, 482179, 2, 481319, '433125000000', '保靖县', '湖南,湘西,保靖', '109.660577', '28.699774', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2313, 482377, 2, 481319, '433126000000', '古丈县', '湖南,湘西,古丈', '109.950728', '28.616935', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2314, 482506, 2, 481319, '433127000000', '永顺县', '湖南,湘西,永顺', '109.851254', '29.001440', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2315, 482831, 2, 481319, '433130000000', '龙山县', '湖南,湘西,龙山', '109.443939', '29.457663', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2316, 483252, 2, 483251, '440101000000', '市辖区', '广东,广州', '113.264434', '23.129162', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2317, 483253, 2, 483251, '440103000000', '荔湾区', '广东,广州,荔湾', '113.244261', '23.125981', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2318, 483462, 2, 483251, '440104000000', '越秀区', '广东,广州,越秀', '113.266841', '23.128524', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2319, 483703, 2, 483251, '440105000000', '海珠区', '广东,广州,海珠', '113.317388', '23.083801', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2320, 483979, 2, 483251, '440106000000', '天河区', '广东,广州,天河', '113.361200', '23.124680', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2321, 484218, 2, 483251, '440111000000', '白云区', '广东,广州,白云', '113.273289', '23.157290', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2322, 484627, 2, 483251, '440112000000', '黄埔区', '广东,广州,黄埔', '113.459749', '23.106402', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2323, 484770, 2, 483251, '440113000000', '番禺区', '广东,广州,番禺', '113.384129', '22.937244', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2324, 485059, 2, 483251, '440114000000', '花都区', '广东,广州,花都', '113.220218', '23.404165', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2325, 485312, 2, 483251, '440115000000', '南沙区', '广东,广州,南沙', '113.525172', '22.801627', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2326, 485489, 2, 483251, '440117000000', '从化区', '广东,广州,从化', '113.586605', '23.548852', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2327, 485776, 2, 483251, '440118000000', '增城区', '广东,广州,增城', '113.810860', '23.261141', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2328, 486130, 2, 486129, '440201000000', '市辖区', '广东,韶关', '113.597522', '24.810403', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2329, 486131, 2, 486129, '440203000000', '武江区', '广东,韶关,武江', '113.587774', '24.792924', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2330, 486223, 2, 486129, '440204000000', '浈江区', '广东,韶关,浈江', '113.611098', '24.804381', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2331, 486345, 2, 486129, '440205000000', '曲江区', '广东,韶关,曲江', '113.604549', '24.682728', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2332, 486469, 2, 486129, '440222000000', '始兴县', '广东,韶关,始兴', '114.061789', '24.952977', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2333, 486609, 2, 486129, '440224000000', '仁化县', '广东,韶关,仁化', '113.749027', '25.085621', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2334, 486746, 2, 486129, '440229000000', '翁源县', '广东,韶关,翁源', '114.130342', '24.350347', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2335, 486929, 2, 486129, '440232000000', '乳源瑶族自治县', '广东,韶关,乳源', '113.275883', '24.776078', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2336, 487058, 2, 486129, '440233000000', '新丰县', '广东,韶关,新丰', '114.206867', '24.059760', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2337, 487223, 2, 486129, '440281000000', '乐昌市', '广东,韶关,乐昌', '113.347519', '25.130136', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2338, 487468, 2, 486129, '440282000000', '南雄市', '广东,韶关,南雄', '114.311982', '25.117753', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2339, 487722, 2, 487721, '440301000000', '市辖区', '广东,深圳', '114.057868', '22.543099', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2340, 487723, 2, 487721, '440303000000', '罗湖区', '广东,深圳,罗湖', '114.131764', '22.548171', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2341, 487849, 2, 487721, '440304000000', '福田区', '广东,深圳,福田', '114.055036', '22.521530', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2342, 487977, 2, 487721, '440305000000', '南山区', '广东,深圳,南山', '113.930476', '22.533013', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2343, 488090, 2, 487721, '440306000000', '宝安区', '广东,深圳,宝安', '113.884020', '22.555259', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2344, 488375, 2, 487721, '440307000000', '龙岗区', '广东,深圳,龙岗', '114.246899', '22.720968', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2345, 488558, 2, 487721, '440308000000', '盐田区', '广东,深圳,盐田', '114.236875', '22.556499', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2346, 488590, 2, 488589, '440401000000', '市辖区', '广东,珠海', '113.576726', '22.270715', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2347, 488591, 2, 488589, '440402000000', '香洲区', '广东,珠海,香洲', '113.543785', '22.265811', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2348, 488768, 2, 488589, '440403000000', '斗门区', '广东,珠海,斗门', '113.296467', '22.209200', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2349, 488905, 2, 488589, '440404000000', '金湾区', '广东,珠海,金湾', '113.363393', '22.146874', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2350, 488955, 2, 488954, '440501000000', '市辖区', '广东,汕头', '116.681972', '23.354091', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2351, 488956, 2, 488954, '440507000000', '龙湖区', '广东,汕头,龙湖', '116.716534', '23.371476', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2352, 489082, 2, 488954, '440511000000', '金平区', '广东,汕头,金平', '116.703426', '23.365613', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2353, 489270, 2, 488954, '440512000000', '濠江区', '广东,汕头,濠江', '116.726973', '23.286079', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2354, 489338, 2, 488954, '440513000000', '潮阳区', '广东,汕头,潮阳', '116.601515', '23.264936', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2355, 489624, 2, 488954, '440514000000', '潮南区', '广东,汕头,潮南', '116.433017', '23.250425', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2356, 489868, 2, 488954, '440515000000', '澄海区', '广东,汕头,澄海', '116.756092', '23.465960', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2357, 490064, 2, 488954, '440523000000', '南澳县', '广东,汕头,南澳', '117.023374', '23.421724', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2358, 490107, 2, 490106, '440601000000', '市辖区', '广东,佛山', '113.121416', '23.021548', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2359, 490108, 2, 490106, '440604000000', '禅城区', '广东,佛山,禅城', '113.122440', '23.009505', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2360, 490257, 2, 490106, '440605000000', '南海区', '广东,佛山,南海', '113.143441', '23.028956', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2361, 490531, 2, 490106, '440606000000', '顺德区', '广东,佛山,顺德', '113.293359', '22.805240', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2362, 490746, 2, 490106, '440607000000', '三水区', '广东,佛山,三水', '112.896668', '23.156065', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2363, 490834, 2, 490106, '440608000000', '高明区', '广东,佛山,高明', '112.892578', '22.900182', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2364, 490920, 2, 490919, '440701000000', '市辖区', '广东,江门', '113.081901', '22.578738', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2365, 490921, 2, 490919, '440703000000', '蓬江区', '广东,江门,蓬江', '113.078521', '22.595149', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2366, 491070, 2, 490919, '440704000000', '江海区', '广东,江门,江海', '113.111612', '22.560474', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2367, 491136, 2, 490919, '440705000000', '新会区', '广东,江门,新会', '113.034187', '22.458300', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2368, 491380, 2, 490919, '440781000000', '台山市', '广东,江门,台山', '112.794065', '22.251924', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2369, 491711, 2, 490919, '440783000000', '开平市', '广东,江门,开平', '112.698545', '22.376395', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2370, 492000, 2, 490919, '440784000000', '鹤山市', '广东,江门,鹤山', '112.964446', '22.765392', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2371, 492153, 2, 490919, '440785000000', '恩平市', '广东,江门,恩平', '112.305145', '22.183206', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2372, 492342, 2, 492341, '440801000000', '市辖区', '广东,湛江', '110.359377', '21.270707', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2373, 492343, 2, 492341, '440802000000', '赤坎区', '广东,湛江,赤坎', '110.365900', '21.266119', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2374, 492393, 2, 492341, '440803000000', '霞山区', '广东,湛江,霞山', '110.398070', '21.191720', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2375, 492484, 2, 492341, '440804000000', '坡头区', '广东,湛江,坡头', '110.455332', '21.244721', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2376, 492563, 2, 492341, '440811000000', '麻章区', '广东,湛江,麻章', '110.334387', '21.263443', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2377, 492716, 2, 492341, '440823000000', '遂溪县', '广东,湛江,遂溪', '110.250124', '21.377246', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2378, 493015, 2, 492341, '440825000000', '徐闻县', '广东,湛江,徐闻', '110.176750', '20.325489', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2379, 493241, 2, 492341, '440881000000', '廉江市', '广东,湛江,廉江', '110.286209', '21.609700', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2380, 493663, 2, 492341, '440882000000', '雷州市', '广东,湛江,雷州', '110.096749', '20.914278', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2381, 494182, 2, 492341, '440883000000', '吴川市', '广东,湛江,吴川', '110.778411', '21.441808', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2382, 494395, 2, 494394, '440901000000', '市辖区', '广东,茂名', '110.925456', '21.662999', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2383, 494396, 2, 494394, '440902000000', '茂南区', '广东,茂名,茂南', '110.918026', '21.641337', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2384, 494629, 2, 494394, '440904000000', '电白区', '广东,茂名,电白', '111.013556', '21.514164', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2385, 495088, 2, 494394, '440981000000', '高州市', '广东,茂名,高州', '110.853302', '21.917982', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2386, 495611, 2, 494394, '440982000000', '化州市', '广东,茂名,化州', '110.639569', '21.664044', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2387, 496016, 2, 494394, '440983000000', '信宜市', '广东,茂名,信宜', '110.947044', '22.354385', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2388, 496439, 2, 496438, '441201000000', '市辖区', '广东,肇庆', '112.465091', '23.047191', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2389, 496440, 2, 496438, '441202000000', '端州区', '广东,肇庆,端州', '112.484848', '23.052101', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2390, 496505, 2, 496438, '441203000000', '鼎湖区', '广东,肇庆,鼎湖', '112.567588', '23.158447', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2391, 496594, 2, 496438, '441204000000', '高要区', '广东,肇庆,高要', '112.457771', '23.025668', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2392, 496964, 2, 496438, '441223000000', '广宁县', '广东,肇庆,广宁', '112.440690', '23.634676', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2393, 497158, 2, 496438, '441224000000', '怀集县', '广东,肇庆,怀集', '112.184652', '23.911899', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2394, 497503, 2, 496438, '441225000000', '封开县', '广东,肇庆,封开', '111.512343', '23.424033', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2395, 497719, 2, 496438, '441226000000', '德庆县', '广东,肇庆,德庆', '111.785937', '23.143722', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2396, 497926, 2, 496438, '441284000000', '四会市', '广东,肇庆,四会', '112.733773', '23.326504', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2397, 498105, 2, 498104, '441301000000', '市辖区', '广东,惠州', '114.416196', '23.111847', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2398, 498106, 2, 498104, '441302000000', '惠城区', '广东,惠州,惠城', '114.382541', '23.084122', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2399, 498397, 2, 498104, '441303000000', '惠阳区', '广东,惠州,惠阳', '114.456696', '22.788734', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2400, 498578, 2, 498104, '441322000000', '博罗县', '广东,惠州,博罗', '114.289496', '23.172899', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2401, 498978, 2, 498104, '441323000000', '惠东县', '广东,惠州,惠东', '114.720079', '22.984975', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2402, 499292, 2, 498104, '441324000000', '龙门县', '广东,惠州,龙门', '114.254863', '23.727737', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2403, 499490, 2, 499489, '441401000000', '市辖区', '广东,梅州', '116.122238', '24.288615', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2404, 499491, 2, 499489, '441402000000', '梅江区', '广东,梅州,梅江', '116.116616', '24.310384', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2405, 499625, 2, 499489, '441403000000', '梅县区', '广东,梅州,梅县', '116.082183', '24.265312', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2406, 500036, 2, 499489, '441422000000', '大埔县', '广东,梅州,大埔', '116.695195', '24.347783', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2407, 500312, 2, 499489, '441423000000', '丰顺县', '广东,梅州,丰顺', '116.182299', '23.739526', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2408, 500611, 2, 499489, '441424000000', '五华县', '广东,梅州,五华', '115.775788', '23.932409', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2409, 501074, 2, 499489, '441426000000', '平远县', '广东,梅州,平远', '115.891638', '24.567262', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2410, 501230, 2, 499489, '441427000000', '蕉岭县', '广东,梅州,蕉岭', '116.171356', '24.658700', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2411, 501351, 2, 499489, '441481000000', '兴宁市', '广东,梅州,兴宁', '115.731110', '24.136630', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2412, 501868, 2, 501867, '441501000000', '市辖区', '广东,汕尾', '115.375278', '22.786211', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2413, 501869, 2, 501867, '441502000000', '城区', '广东,汕尾,城区', '115.365029', '22.778699', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2414, 502002, 2, 501867, '441521000000', '海丰县', '广东,汕尾,海丰', '115.323436', '22.966586', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2415, 502303, 2, 501867, '441523000000', '陆河县', '广东,汕尾,陆河', '115.660143', '23.301617', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2416, 502439, 2, 501867, '441581000000', '陆丰市', '广东,汕尾,陆丰', '115.652260', '22.917576', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2417, 502829, 2, 502828, '441601000000', '市辖区', '广东,河源', '114.700447', '23.743538', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2418, 502830, 2, 502828, '441602000000', '源城区', '广东,河源,源城', '114.702517', '23.733969', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2419, 502907, 2, 502828, '441621000000', '紫金县', '广东,河源,紫金', '115.184061', '23.635271', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2420, 503226, 2, 502828, '441622000000', '龙川县', '广东,河源,龙川', '115.259872', '24.100066', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2421, 503608, 2, 502828, '441623000000', '连平县', '广东,河源,连平', '114.488714', '24.369588', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2422, 503797, 2, 502828, '441624000000', '和平县', '广东,河源,和平', '114.938684', '24.442180', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2423, 504060, 2, 502828, '441625000000', '东源县', '广东,河源,东源', '114.746380', '23.788393', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2424, 504367, 2, 504366, '441701000000', '市辖区', '广东,阳江', '111.982232', '21.857958', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2425, 504368, 2, 504366, '441702000000', '江城区', '广东,阳江,江城', '111.955059', '21.861787', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2426, 504549, 2, 504366, '441704000000', '阳东区', '广东,阳江,阳东', '112.006338', '21.868358', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2427, 504749, 2, 504366, '441721000000', '阳西县', '广东,阳江,阳西', '111.617849', '21.752396', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2428, 504911, 2, 504366, '441781000000', '阳春市', '广东,阳江,阳春', '111.791539', '22.170438', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2429, 505299, 2, 505298, '441801000000', '市辖区', '广东,清远', '113.056031', '23.681763', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2430, 505300, 2, 505298, '441802000000', '清城区', '广东,清远,清城', '113.062692', '23.697899', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2431, 505466, 2, 505298, '441803000000', '清新区', '广东,清远,清新', '113.017749', '23.734673', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2432, 505685, 2, 505298, '441821000000', '佛冈县', '广东,清远,佛冈', '113.531607', '23.879192', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2433, 505782, 2, 505298, '441823000000', '阳山县', '广东,清远,阳山', '112.641363', '24.465359', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2434, 505963, 2, 505298, '441825000000', '连山壮族瑶族自治县', '广东,清远,连山', '112.093617', '24.570491', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2435, 506027, 2, 505298, '441826000000', '连南瑶族自治县', '广东,清远,连南', '112.287012', '24.726017', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2436, 506106, 2, 505298, '441881000000', '英德市', '广东,清远,英德', '113.402376', '24.205024', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2437, 506430, 2, 505298, '441882000000', '连州市', '广东,清远,连州', '112.377361', '24.780966', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2438, 506617, 2, 506616, '441900003000', '东城街道办事处', '广东,东莞,东城', '113.754635', '23.002896', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2439, 506643, 2, 506616, '441900004000', '南城街道办事处', '广东,东莞,南城', '113.753133', '22.987560', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2440, 506662, 2, 506616, '441900005000', '万江街道办事处', '广东,东莞,万江', '113.740409', '23.052146', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2441, 506691, 2, 506616, '441900006000', '莞城街道办事处', '广东,东莞,莞城', '113.751050', '23.053413', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2442, 506700, 2, 506616, '441900101000', '石碣镇', '广东,东莞,石碣', '113.802109', '23.094111', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2443, 506716, 2, 506616, '441900102000', '石龙镇', '广东,东莞,石龙', '113.751765', '23.020536', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2444, 506727, 2, 506616, '441900103000', '茶山镇', '广东,东莞,茶山', '113.751765', '23.020536', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2445, 506746, 2, 506616, '441900104000', '石排镇', '广东,东莞,石排', '113.751765', '23.020536', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2446, 506766, 2, 506616, '441900105000', '企石镇', '广东,东莞,企石', '113.751765', '23.020536', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2447, 506787, 2, 506616, '441900106000', '横沥镇', '广东,东莞,横沥', '113.751765', '23.020536', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2448, 506805, 2, 506616, '441900107000', '桥头镇', '广东,东莞,桥头', '113.751765', '23.020536', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2449, 506823, 2, 506616, '441900108000', '谢岗镇', '广东,东莞,谢岗', '114.141456', '22.972083', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2450, 506836, 2, 506616, '441900109000', '东坑镇', '广东,东莞,东坑', '113.948089', '22.989033', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2451, 506853, 2, 506616, '441900110000', '常平镇', '广东,东莞,常平', '113.992186', '22.975601', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2452, 506887, 2, 506616, '441900111000', '寮步镇', '广东,东莞,寮步', '113.818996', '23.025373', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2453, 506918, 2, 506616, '441900112000', '樟木头镇', '广东,东莞,樟木头镇', '114.083278', '22.914909', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2454, 506930, 2, 506616, '441900113000', '大朗镇', '广东,东莞,大朗', '113.915820', '22.915996', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2455, 506959, 2, 506616, '441900114000', '黄江镇', '广东,东莞,黄江', '113.996039', '22.877840', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2456, 506967, 2, 506616, '441900115000', '清溪镇', '广东,东莞,清溪', '114.164330', '22.844557', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2457, 506990, 2, 506616, '441900116000', '塘厦镇', '广东,东莞,塘厦', '113.774481', '22.791051', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2458, 507015, 2, 506616, '441900117000', '凤岗镇', '广东,东莞,凤岗', '113.751765', '23.020536', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2459, 507028, 2, 506616, '441900118000', '大岭山镇', '广东,东莞,大岭山镇', '113.842223', '22.899965', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2460, 507052, 2, 506616, '441900119000', '长安镇', '广东,东莞,长安', '113.794060', '22.803590', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2461, 507066, 2, 506616, '441900121000', '虎门镇', '广东,东莞,虎门', '113.672560', '22.814835', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2462, 507099, 2, 506616, '441900122000', '厚街镇', '广东,东莞,厚街', '113.751765', '23.020536', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2463, 507124, 2, 506616, '441900123000', '沙田镇', '广东,东莞,沙田', '113.751765', '23.020536', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2464, 507143, 2, 506616, '441900124000', '道滘镇', '广东,东莞,道滘', '113.751765', '23.020536', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2465, 507158, 2, 506616, '441900125000', '洪梅镇', '广东,东莞,洪梅', '113.608903', '22.994717', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2466, 507169, 2, 506616, '441900126000', '麻涌镇', '广东,东莞,麻涌', '113.751765', '23.020536', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2467, 507185, 2, 506616, '441900127000', '望牛墩镇', '广东,东莞,望牛墩镇', '113.656243', '23.055331', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2468, 507208, 2, 506616, '441900128000', '中堂镇', '广东,东莞,中堂', '113.751765', '23.020536', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2469, 507229, 2, 506616, '441900129000', '高埗镇', '广东,东莞,高埗', '113.722126', '23.078713', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2470, 507249, 2, 506616, '441900401000', '松山湖管委会', '广东,东莞,松山湖', '113.909208', '22.960541', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2471, 507251, 2, 506616, '441900402000', '虎门港管委会', '广东,东莞,虎门港', '113.583070', '22.864175', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2472, 507253, 2, 506616, '441900403000', '东莞生态园', '广东,东莞,东莞生态园', '113.927452', '23.063210', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2473, 507256, 2, 507255, '442000001000', '石岐区街道办事处', '广东,中山,石岐区', '113.384930', '22.532046', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2474, 507276, 2, 507255, '442000002000', '东区街道办事处', '广东,中山,东区', '113.392782', '22.517645', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2475, 507287, 2, 507255, '442000003000', '火炬开发区街道办事处', '广东,中山,火炬开发区', '113.480528', '22.566086', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2476, 507295, 2, 507255, '442000004000', '西区街道办事处', '广东,中山,西区', '113.392782', '22.517645', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2477, 507305, 2, 507255, '442000005000', '南区街道办事处', '广东,中山,南区', '113.358509', '22.472530', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2478, 507310, 2, 507255, '442000006000', '五桂山街道办事处', '广东,中山,五桂山', '113.463397', '22.421549', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2479, 507316, 2, 507255, '442000100000', '小榄镇', '广东,中山,小榄', '113.250897', '22.672099', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2480, 507332, 2, 507255, '442000101000', '黄圃镇', '广东,中山,黄圃', '113.335242', '22.709897', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2481, 507349, 2, 507255, '442000102000', '民众镇', '广东,中山,民众', '113.392782', '22.517645', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2482, 507369, 2, 507255, '442000103000', '东凤镇', '广东,中山,东凤', '113.392782', '22.517645', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2483, 507384, 2, 507255, '442000104000', '东升镇', '广东,中山,东升', '113.294393', '22.616908', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2484, 507399, 2, 507255, '442000105000', '古镇镇', '广东,中山,古镇', '113.190869', '22.613406', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2485, 507413, 2, 507255, '442000106000', '沙溪镇', '广东,中山,沙溪', '113.392782', '22.517645', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2486, 507430, 2, 507255, '442000107000', '坦洲镇', '广东,中山,坦洲', '113.460373', '22.265182', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2487, 507445, 2, 507255, '442000108000', '港口镇', '广东,中山,港口', '113.247148', '22.683616', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2488, 507455, 2, 507255, '442000109000', '三角镇', '广东,中山,三角', '113.422371', '22.684688', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2489, 507464, 2, 507255, '442000110000', '横栏镇', '广东,中山,横栏', '113.265845', '22.523201', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2490, 507476, 2, 507255, '442000111000', '南头镇', '广东,中山,南头', '113.392782', '22.517645', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2491, 507483, 2, 507255, '442000112000', '阜沙镇', '广东,中山,阜沙', '113.392782', '22.517645', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2492, 507493, 2, 507255, '442000113000', '南朗镇', '广东,中山,南朗', '113.392782', '22.517645', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2493, 507509, 2, 507255, '442000114000', '三乡镇', '广东,中山,三乡', '113.441614', '22.357754', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2494, 507526, 2, 507255, '442000115000', '板芙镇', '广东,中山,板芙', '113.392782', '22.517645', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2495, 507538, 2, 507255, '442000116000', '大涌镇', '广东,中山,大涌', '113.392782', '22.517645', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2496, 507550, 2, 507255, '442000117000', '神湾镇', '广东,中山,神湾', '113.392782', '22.517645', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2497, 507558, 2, 507557, '445101000000', '市辖区', '广东,潮州', '116.622603', '23.656950', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2498, 507559, 2, 507557, '445102000000', '湘桥区', '广东,潮州,湘桥', '116.628632', '23.674536', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2499, 507748, 2, 507557, '445103000000', '潮安区', '广东,潮州,潮安', '116.678204', '23.462613', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2500, 508223, 2, 507557, '445122000000', '饶平县', '广东,潮州,饶平', '117.003900', '23.663824', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2501, 508649, 2, 508648, '445201000000', '市辖区', '广东,揭阳', '116.372831', '23.549993', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2502, 508650, 2, 508648, '445202000000', '榕城区', '广东,揭阳,榕城', '116.367026', '23.525153', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2503, 508863, 2, 508648, '445203000000', '揭东区', '广东,揭阳,揭东', '116.412015', '23.566127', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2504, 509101, 2, 508648, '445222000000', '揭西县', '广东,揭阳,揭西', '115.841838', '23.431294', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2505, 509449, 2, 508648, '445224000000', '惠来县', '广东,揭阳,惠来', '116.295150', '23.033267', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2506, 509796, 2, 508648, '445281000000', '普宁市', '广东,揭阳,普宁', '116.166004', '23.297642', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2507, 510409, 2, 510408, '445301000000', '市辖区', '广东,云浮', '112.044491', '22.915094', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2508, 510410, 2, 510408, '445302000000', '云城区', '广东,云浮,云城', '112.043857', '22.928115', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2509, 510536, 2, 510408, '445303000000', '云安区', '广东,云浮,云安', '112.003209', '23.071020', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2510, 510660, 2, 510408, '445321000000', '新兴县', '广东,云浮,新兴', '112.225335', '22.695690', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2511, 510878, 2, 510408, '445322000000', '郁南县', '广东,云浮,郁南', '111.535249', '23.234627', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2512, 511102, 2, 510408, '445381000000', '罗定市', '广东,云浮,罗定', '111.570010', '22.768595', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2513, 511464, 2, 511463, '450101000000', '市辖区', '广西,南宁', '108.366543', '22.817002', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2514, 511465, 2, 511463, '450102000000', '兴宁区', '广西,南宁,兴宁', '108.368871', '22.854021', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2515, 511545, 2, 511463, '450103000000', '青秀区', '广西,南宁,青秀', '108.494024', '22.785879', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2516, 511662, 2, 511463, '450105000000', '江南区', '广西,南宁,江南', '108.273158', '22.781632', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2517, 511790, 2, 511463, '450107000000', '西乡塘区', '广西,南宁,西乡塘', '108.306886', '22.832770', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2518, 511960, 2, 511463, '450108000000', '良庆区', '广西,南宁,良庆', '108.322102', '22.759090', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2519, 512044, 2, 511463, '450109000000', '邕宁区', '广西,南宁,邕宁', '108.487369', '22.758390', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2520, 512124, 2, 511463, '450110000000', '武鸣区', '广西,南宁,武鸣', '108.274712', '23.158693', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2521, 512381, 2, 511463, '450123000000', '隆安县', '广西,南宁,隆安', '107.696153', '23.166028', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2522, 512530, 2, 511463, '450124000000', '马山县', '广西,南宁,马山', '108.176979', '23.708192', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2523, 512695, 2, 511463, '450125000000', '上林县', '广西,南宁,上林', '108.604921', '23.431936', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2524, 512838, 2, 511463, '450126000000', '宾阳县', '广西,南宁,宾阳', '108.810326', '23.217787', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2525, 513091, 2, 511463, '450127000000', '横县', '广西,南宁,横县', '109.261384', '22.679932', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2526, 513435, 2, 513434, '450201000000', '市辖区', '广西,柳州', '109.415953', '24.325502', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2527, 513436, 2, 513434, '450202000000', '城中区', '广西,柳州,城中', '109.410736', '24.315602', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2528, 513477, 2, 513434, '450203000000', '鱼峰区', '广西,柳州,鱼峰', '109.452442', '24.318517', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2529, 513569, 2, 513434, '450204000000', '柳南区', '广西,柳州,柳南', '109.385519', '24.336229', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2530, 513661, 2, 513434, '450205000000', '柳北区', '广西,柳州,柳北', '109.402050', '24.362691', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2531, 513772, 2, 513434, '450206000000', '柳江区', '广西,柳州,柳江', '109.326380', '24.254892', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2532, 513938, 2, 513434, '450222000000', '柳城县', '广西,柳州,柳城', '109.244730', '24.651518', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2533, 514091, 2, 513434, '450223000000', '鹿寨县', '广西,柳州,鹿寨', '109.750638', '24.472897', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2534, 514219, 2, 513434, '450224000000', '融安县', '广西,柳州,融安', '109.397538', '25.224550', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2535, 514380, 2, 513434, '450225000000', '融水苗族自治县', '广西,柳州,融水', '109.256334', '25.065934', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2536, 514607, 2, 513434, '450226000000', '三江侗族自治县', '广西,柳州,三江', '109.607675', '25.783198', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2537, 514791, 2, 514790, '450301000000', '市辖区', '广西,桂林', '110.290194', '25.273566', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2538, 514792, 2, 514790, '450302000000', '秀峰区', '广西,桂林,秀峰', '110.264183', '25.273625', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2539, 514824, 2, 514790, '450303000000', '叠彩区', '广西,桂林,叠彩', '110.301723', '25.314001', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2540, 514864, 2, 514790, '450304000000', '象山区', '广西,桂林,象山', '110.281082', '25.261687', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2541, 514911, 2, 514790, '450305000000', '七星区', '广西,桂林,七星', '110.317826', '25.252701', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2542, 514964, 2, 514790, '450311000000', '雁山区', '广西,桂林,雁山', '110.286690', '25.101935', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2543, 515012, 2, 514790, '450312000000', '临桂区', '广西,桂林,临桂', '110.212463', '25.238628', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2544, 515195, 2, 514790, '450321000000', '阳朔县', '广西,桂林,阳朔', '110.496593', '24.778481', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2545, 515319, 2, 514790, '450323000000', '灵川县', '广西,桂林,灵川', '110.325636', '25.409747', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2546, 515481, 2, 514790, '450324000000', '全州县', '广西,桂林,全州', '111.072926', '25.928617', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2547, 515784, 2, 514790, '450325000000', '兴安县', '广西,桂林,兴安', '110.671670', '25.611705', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2548, 515920, 2, 514790, '450326000000', '永福县', '广西,桂林,永福', '109.983076', '24.979856', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2549, 516029, 2, 514790, '450327000000', '灌阳县', '广西,桂林,灌阳', '111.160851', '25.489383', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2550, 516180, 2, 514790, '450328000000', '龙胜各族自治县', '广西,桂林,龙胜各族', '110.011238', '25.797931', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2551, 516317, 2, 514790, '450329000000', '资源县', '广西,桂林,资源', '110.652700', '26.042443', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2552, 516399, 2, 514790, '450330000000', '平乐县', '广西,桂林,平乐', '110.643305', '24.633362', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2553, 516563, 2, 514790, '450331000000', '荔浦县', '广西,桂林,荔浦', '110.395287', '24.487824', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2554, 516721, 2, 514790, '450332000000', '恭城瑶族自治县', '广西,桂林,恭城', '110.830193', '24.822522', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2555, 516859, 2, 516858, '450401000000', '市辖区', '广西,梧州', '111.279115', '23.476962', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2556, 516860, 2, 516858, '450403000000', '万秀区', '广西,梧州,万秀', '111.320542', '23.472962', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2557, 516945, 2, 516858, '450405000000', '长洲区', '广西,梧州,长洲', '111.274777', '23.485695', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2558, 516991, 2, 516858, '450406000000', '龙圩区', '广西,梧州,龙圩', '111.246035', '23.409960', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2559, 517075, 2, 516858, '450421000000', '苍梧县', '广西,梧州,苍梧', '111.544008', '23.845097', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2560, 517230, 2, 516858, '450422000000', '藤县', '广西,梧州,藤县', '110.914849', '23.374984', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2561, 517542, 2, 516858, '450423000000', '蒙山县', '广西,梧州,蒙山', '110.525003', '24.193570', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2562, 517636, 2, 516858, '450481000000', '岑溪市', '广西,梧州,岑溪', '110.994913', '22.918350', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2563, 517934, 2, 517933, '450501000000', '市辖区', '广西,北海', '109.119927', '21.481254', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2564, 517935, 2, 517933, '450502000000', '海城区', '广西,北海,海城', '109.117210', '21.475005', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2565, 518010, 2, 517933, '450503000000', '银海区', '广西,北海,银海', '109.139990', '21.449219', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2566, 518067, 2, 517933, '450512000000', '铁山港区', '广西,北海,铁山港', '109.421581', '21.529128', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2567, 518115, 2, 517933, '450521000000', '合浦县', '广西,北海,合浦', '109.207336', '21.660936', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2568, 518408, 2, 518407, '450601000000', '市辖区', '广西,防城港', '108.353846', '21.686860', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2569, 518409, 2, 518407, '450602000000', '港口区', '广西,防城港,港口', '108.380144', '21.643384', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2570, 518455, 2, 518407, '450603000000', '防城区', '广西,防城港,防城', '108.353499', '21.769212', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2571, 518641, 2, 518407, '450621000000', '上思县', '广西,防城港,上思', '107.983626', '22.153672', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2572, 518762, 2, 518407, '450681000000', '东兴市', '广西,防城港,东兴', '107.971826', '21.547822', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2573, 518809, 2, 518808, '450701000000', '市辖区', '广西,钦州', '108.654146', '21.979933', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2574, 518810, 2, 518808, '450702000000', '钦南区', '广西,钦州,钦南', '108.657210', '21.938860', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2575, 519003, 2, 518808, '450703000000', '钦北区', '广西,钦州,钦北', '108.449110', '22.132761', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2576, 519201, 2, 518808, '450721000000', '灵山县', '广西,钦州,灵山', '109.291007', '22.416537', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2577, 519637, 2, 518808, '450722000000', '浦北县', '广西,钦州,浦北', '109.556953', '22.271651', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2578, 519930, 2, 519929, '450801000000', '市辖区', '广西,贵港', '109.598926', '23.111530', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2579, 519931, 2, 519929, '450802000000', '港北区', '广西,贵港,港北', '109.572240', '23.111531', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2580, 520063, 2, 519929, '450803000000', '港南区', '广西,贵港,港南', '109.599557', '23.075573', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2581, 520240, 2, 519929, '450804000000', '覃塘区', '广西,贵港,覃塘', '109.452662', '23.127149', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2582, 520397, 2, 519929, '450821000000', '平南县', '广西,贵港,平南', '110.392168', '23.539127', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2583, 520707, 2, 519929, '450881000000', '桂平市', '广西,贵港,桂平', '110.079379', '23.394326', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2584, 521167, 2, 521166, '450901000000', '市辖区', '广西,玉林', '110.164756', '22.636379', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2585, 521168, 2, 521166, '450902000000', '玉州区', '广西,玉林,玉州', '110.151147', '22.628102', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2586, 521286, 2, 521166, '450903000000', '福绵区', '广西,玉林,福绵', '110.059439', '22.585557', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2587, 521409, 2, 521166, '450921000000', '容县', '广西,玉林,容县', '110.557874', '22.857823', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2588, 521652, 2, 521166, '450922000000', '陆川县', '广西,玉林,陆川', '110.264052', '22.321048', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2589, 521832, 2, 521166, '450923000000', '博白县', '广西,玉林,博白', '109.975985', '22.273048', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2590, 522220, 2, 521166, '450924000000', '兴业县', '广西,玉林,兴业', '109.875304', '22.736421', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2591, 522448, 2, 521166, '450981000000', '北流市', '广西,玉林,北流', '110.354215', '22.708311', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2592, 522787, 2, 522786, '451001000000', '市辖区', '广西,百色', '106.618201', '23.902333', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2593, 522788, 2, 522786, '451002000000', '右江区', '广西,百色,右江', '106.618645', '23.901383', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2594, 522918, 2, 522786, '451021000000', '田阳县', '广西,百色,田阳', '106.915418', '23.735682', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2595, 523086, 2, 522786, '451022000000', '田东县', '广西,百色,田东', '107.126081', '23.597194', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2596, 523265, 2, 522786, '451023000000', '平果县', '广西,百色,平果', '107.589810', '23.329376', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2597, 523461, 2, 522786, '451024000000', '德保县', '广西,百色,德保', '106.615374', '23.323450', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2598, 523661, 2, 522786, '451026000000', '那坡县', '广西,百色,那坡', '105.832530', '23.387441', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2599, 523801, 2, 522786, '451027000000', '凌云县', '广西,百色,凌云', '106.561310', '24.347557', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2600, 523920, 2, 522786, '451028000000', '乐业县', '广西,百色,乐业', '106.556519', '24.776827', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2601, 524017, 2, 522786, '451029000000', '田林县', '广西,百色,田林', '106.228538', '24.294488', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2602, 524200, 2, 522786, '451030000000', '西林县', '广西,百色,西林', '105.093837', '24.489810', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2603, 524306, 2, 522786, '451031000000', '隆林各族自治县', '广西,百色,隆林各族', '105.344040', '24.770896', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2604, 524502, 2, 522786, '451081000000', '靖西市', '广西,百色,靖西', '106.417549', '23.134766', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2605, 524815, 2, 524814, '451101000000', '市辖区', '广西,贺州', '111.566694', '24.403582', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2606, 524816, 2, 524814, '451102000000', '八步区', '广西,贺州,八步', '111.552096', '24.411805', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2607, 525035, 2, 524814, '451103000000', '平桂区', '广西,贺州,平桂', '111.566694', '24.403582', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2608, 525169, 2, 524814, '451121000000', '昭平县', '广西,贺州,昭平', '110.811287', '24.169480', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2609, 525341, 2, 524814, '451122000000', '钟山县', '广西,贺州,钟山', '111.303111', '24.526022', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2610, 525470, 2, 524814, '451123000000', '富川瑶族自治县', '广西,贺州,富川', '111.277389', '24.814444', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2611, 525639, 2, 525638, '451201000000', '市辖区', '广西,河池', '108.085261', '24.692931', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2612, 525640, 2, 525638, '451202000000', '金城江区', '广西,河池,金城江', '108.037277', '24.689703', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2613, 525798, 2, 525638, '451221000000', '南丹县', '广西,河池,南丹', '107.540722', '24.974486', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2614, 525961, 2, 525638, '451222000000', '天峨县', '广西,河池,天峨', '107.173802', '24.999108', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2615, 526066, 2, 525638, '451223000000', '凤山县', '广西,河池,凤山', '107.042191', '24.546876', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2616, 526174, 2, 525638, '451224000000', '东兰县', '广西,河池,东兰', '107.374294', '24.510842', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2617, 526338, 2, 525638, '451225000000', '罗城仫佬族自治县', '广西,河池,罗城', '108.904707', '24.777413', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2618, 526493, 2, 525638, '451226000000', '环江毛南族自治县', '广西,河池,环江', '108.258028', '24.825664', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2619, 526654, 2, 525638, '451227000000', '巴马瑶族自治县', '广西,河池,巴马', '107.258588', '24.142299', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2620, 526772, 2, 525638, '451228000000', '都安瑶族自治县', '广西,河池,都安', '108.128403', '23.919338', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2621, 527041, 2, 525638, '451229000000', '大化瑶族自治县', '广西,河池,大化', '108.085261', '24.692931', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2622, 527216, 2, 525638, '451281000000', '宜州市', '广西,河池,宜州', '108.636415', '24.485214', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2623, 527444, 2, 527443, '451301000000', '市辖区', '广西,来宾', '109.221465', '23.750306', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2624, 527445, 2, 527443, '451302000000', '兴宾区', '广西,来宾,兴宾', '109.230541', '23.732926', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2625, 527762, 2, 527443, '451321000000', '忻城县', '广西,来宾,忻城', '108.665666', '24.066235', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2626, 527905, 2, 527443, '451322000000', '象州县', '广西,来宾,象州', '109.683985', '23.958528', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2627, 528042, 2, 527443, '451323000000', '武宣县', '广西,来宾,武宣', '109.663207', '23.594110', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2628, 528205, 2, 527443, '451324000000', '金秀瑶族自治县', '广西,来宾,金秀', '110.189462', '24.130374', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2629, 528299, 2, 527443, '451381000000', '合山市', '广西,来宾,合山', '108.886082', '23.806536', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2630, 528340, 2, 528339, '451401000000', '市辖区', '广西,崇左', '107.364711', '22.376532', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2631, 528341, 2, 528339, '451402000000', '江州区', '广西,崇左,江州', '107.353437', '22.405325', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2632, 528494, 2, 528339, '451421000000', '扶绥县', '广西,崇左,扶绥', '107.904187', '22.635013', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2633, 528647, 2, 528339, '451422000000', '宁明县', '广西,崇左,宁明', '107.076457', '22.140192', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2634, 528845, 2, 528339, '451423000000', '龙州县', '广西,崇左,龙州', '106.854451', '22.342797', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2635, 528986, 2, 528339, '451424000000', '大新县', '广西,崇左,大新', '107.200654', '22.829288', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2636, 529159, 2, 528339, '451425000000', '天等县', '广西,崇左,天等', '107.143433', '23.081394', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2637, 529297, 2, 528339, '451481000000', '凭祥市', '广西,崇左,凭祥', '106.766293', '22.094485', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2638, 529346, 2, 529345, '460101000000', '市辖区', '海南,海口', '110.198293', '20.044001', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2639, 529347, 2, 529345, '460105000000', '秀英区', '海南,海口,秀英', '110.293561', '20.007969', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2640, 529451, 2, 529345, '460106000000', '龙华区', '海南,海口,龙华', '110.328492', '20.031007', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2641, 529589, 2, 529345, '460107000000', '琼山区', '海南,海口,琼山', '110.353972', '20.003170', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2642, 529720, 2, 529345, '460108000000', '美兰区', '海南,海口,美兰', '110.366357', '20.029083', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2643, 529879, 2, 529878, '460201000000', '市辖区', '海南,三亚', '109.511909', '18.252847', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2644, 529910, 2, 529878, '460202000000', '海棠区', '海南,三亚,海棠', '109.760778', '18.407516', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2645, 529934, 2, 529878, '460203000000', '吉阳区', '海南,三亚,吉阳', '109.578330', '18.281397', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2646, 529973, 2, 529878, '460204000000', '天涯区', '海南,三亚,天涯', '109.506357', '18.247340', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2647, 530027, 2, 529878, '460205000000', '崖州区', '海南,三亚,崖州', '109.174313', '18.352212', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2648, 530061, 2, 530060, '460321000000', '西沙群岛', '海南,三沙,西沙群岛', '112.338695', '16.831839', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2649, 530064, 2, 530060, '460322000000', '南沙群岛', '海南,三沙,南沙群岛', '112.338695', '16.831839', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2650, 530067, 2, 530060, '460323000000', '中沙群岛的岛礁及其海域', '海南,三沙,中沙群岛的岛礁及其海域', '112.338695', '16.831839', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2651, 530071, 2, 530070, '460400100000', '那大镇', '海南,儋州,那大', '110.349228', '20.017377', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2652, 530112, 2, 530070, '460400101000', '和庆镇', '海南,儋州,和庆', '109.640856', '19.525399', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2653, 530126, 2, 530070, '460400102000', '南丰镇', '海南,儋州,南丰', '110.349228', '20.017377', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2654, 530139, 2, 530070, '460400103000', '大成镇', '海南,儋州,大成', '110.349228', '20.017377', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2655, 530162, 2, 530070, '460400104000', '雅星镇', '海南,儋州,雅星', '110.349228', '20.017377', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2656, 530188, 2, 530070, '460400105000', '兰洋镇', '海南,儋州,兰洋', '110.349228', '20.017377', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2657, 530207, 2, 530070, '460400106000', '光村镇', '海南,儋州,光村', '110.349228', '20.017377', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2658, 530220, 2, 530070, '460400107000', '木棠镇', '海南,儋州,木棠', '110.349228', '20.017377', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2659, 530246, 2, 530070, '460400108000', '海头镇', '海南,儋州,海头', '110.349228', '20.017377', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2660, 530261, 2, 530070, '460400109000', '峨蔓镇', '海南,儋州,峨蔓', '110.349228', '20.017377', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2661, 530275, 2, 530070, '460400110000', '三都镇', '海南,儋州,三都', '110.349228', '20.017377', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2662, 530285, 2, 530070, '460400111000', '王五镇', '海南,儋州,王五', '110.349228', '20.017377', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2663, 530295, 2, 530070, '460400112000', '白马井镇', '海南,儋州,白马井镇', '109.218734', '19.696407', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2664, 530318, 2, 530070, '460400113000', '中和镇', '海南,儋州,中和', '110.349228', '20.017377', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2665, 530331, 2, 530070, '460400114000', '排浦镇', '海南,儋州,排浦', '110.349228', '20.017377', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2666, 530340, 2, 530070, '460400115000', '东成镇', '海南,儋州,东成', '110.349228', '20.017377', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2667, 530361, 2, 530070, '460400116000', '新州镇', '海南,儋州,新州', '110.349228', '20.017377', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2668, 530394, 2, 530070, '460400400000', '国营西培农场', '海南,儋州,国营西培农场', '109.455554', '19.476422', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2669, 530410, 2, 530070, '460400404000', '国营西联农场', '海南,儋州,国营西联农场', '109.539074', '19.673015', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2670, 530431, 2, 530070, '460400405000', '国营蓝洋农场', '海南,儋州,国营蓝洋农场', '109.670723', '19.458984', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2671, 530437, 2, 530070, '460400407000', '国营八一农场', '海南,儋州,国营八一农场', '109.364519', '19.413460', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2672, 530447, 2, 530070, '460400499000', '洋浦经济开发区', '海南,儋州,洋浦经济开发', '109.202064', '19.736941', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2673, 530466, 2, 530070, '460400500000', '华南热作学院', '海南,儋州,华南热作学院', '109.494073', '19.505382', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2674, 530469, 2, 530468, '469001000000', '五指山市', '海南,五指山', '109.516922', '18.775146', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2675, 530552, 2, 530468, '469002000000', '琼海市', '海南,琼海', '110.474579', '19.259140', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2676, 530809, 2, 530468, '469005000000', '文昌市', '海南,文昌', '110.797714', '19.543423', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2677, 531148, 2, 530468, '469006000000', '万宁市', '海南,万宁', '110.391075', '18.795143', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2678, 531426, 2, 530468, '469007000000', '东方市', '海南,东方', '108.651817', '19.095350', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2679, 531647, 2, 530468, '469021000000', '定安县', '海南,定安', '110.358891', '19.681434', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2680, 531811, 2, 530468, '469022000000', '屯昌县', '海南,屯昌', '110.103415', '19.351766', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2681, 531971, 2, 530468, '469023000000', '澄迈县', '海南,澄迈', '110.006755', '19.738521', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2682, 532200, 2, 530468, '469024000000', '临高县', '海南,临高', '109.690508', '19.912026', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2683, 532409, 2, 530468, '469025000000', '白沙黎族自治县', '海南,白沙', '109.451484', '19.224823', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2684, 532558, 2, 530468, '469026000000', '昌江黎族自治县', '海南,昌江', '109.055724', '19.298062', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2685, 532672, 2, 530468, '469027000000', '乐东黎族自治县', '海南,乐东', '109.173055', '18.750260', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2686, 532906, 2, 530468, '469028000000', '陵水黎族自治县', '海南,陵水', '110.037504', '18.506048', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2687, 533053, 2, 530468, '469029000000', '保亭黎族苗族自治县', '海南,保亭', '109.702590', '18.639130', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2688, 533161, 2, 530468, '469030000000', '琼中黎族苗族自治县', '海南,琼中', '109.838389', '19.033369', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2689, 533330, 2, 533329, '500101000000', '万州区', '重庆,万州', '108.408661', '30.807667', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2690, 534019, 2, 533329, '500102000000', '涪陵区', '重庆,涪陵', '107.389298', '29.703113', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2691, 534468, 2, 533329, '500103000000', '渝中区', '重庆,渝中', '106.568892', '29.552750', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2692, 534558, 2, 533329, '500104000000', '大渡口区', '重庆,大渡口', '106.482347', '29.484527', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2693, 534656, 2, 533329, '500105000000', '江北区', '重庆,江北', '106.574271', '29.606703', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2694, 534799, 2, 533329, '500106000000', '沙坪坝区', '重庆,沙坪坝', '106.456878', '29.541145', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2695, 535021, 2, 533329, '500107000000', '九龙坡区', '重庆,九龙坡', '106.510676', '29.502272', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2696, 535262, 2, 533329, '500108000000', '南岸区', '重庆,南岸', '106.644428', '29.500297', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2697, 535428, 2, 533329, '500109000000', '北碚区', '重庆,北碚', '106.395612', '29.805108', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2698, 535629, 2, 533329, '500110000000', '綦江区', '重庆,綦江', '106.651362', '29.028067', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2699, 536131, 2, 533329, '500111000000', '大足区', '重庆,大足', '105.721733', '29.707032', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2700, 536468, 2, 533329, '500112000000', '渝北区', '重庆,渝北', '106.631187', '29.718143', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2701, 536890, 2, 533329, '500113000000', '巴南区', '重庆,巴南', '106.540257', '29.402408', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2702, 537212, 2, 533329, '500114000000', '黔江区', '重庆,黔江', '108.770678', '29.533610', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2703, 537461, 2, 533329, '500115000000', '长寿区', '重庆,长寿', '107.081283', '29.857996', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2704, 537745, 2, 533329, '500116000000', '江津区', '重庆,江津', '106.259281', '29.290069', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2705, 538050, 2, 533329, '500117000000', '合川区', '重庆,合川', '106.276130', '29.972084', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2706, 538493, 2, 533329, '500118000000', '永川区', '重庆,永川', '105.927376', '29.356117', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2707, 538778, 2, 533329, '500119000000', '南川区', '重庆,南川', '107.099266', '29.157891', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2708, 539057, 2, 533329, '500120000000', '璧山区', '重庆,璧山', '106.227305', '29.592024', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2709, 539260, 2, 533329, '500151000000', '铜梁区', '重庆,铜梁', '106.056404', '29.844811', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2710, 539615, 2, 533329, '500152000000', '潼南区', '重庆,潼南', '105.840556', '30.191013', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2711, 539942, 2, 533329, '500153000000', '荣昌区', '重庆,荣昌', '105.594623', '29.405002', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2712, 540131, 2, 533329, '500154000000', '开州区', '重庆,开州', '106.551556', '29.563009', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2713, 540701, 2, 540700, '500228000000', '梁平县', '重庆,梁平', '107.769312', '30.654203', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2714, 541080, 2, 540700, '500229000000', '城口县', '重庆,城口', '108.664214', '31.947633', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2715, 541310, 2, 540700, '500230000000', '丰都县', '重庆,丰都', '107.730895', '29.863500', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2716, 541671, 2, 540700, '500231000000', '垫江县', '重庆,垫江', '107.333390', '30.327717', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2717, 541999, 2, 540700, '500232000000', '武隆县', '重庆,武隆', '107.760025', '29.325601', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2718, 542236, 2, 540700, '500233000000', '忠县', '重庆,忠县', '108.039002', '30.299560', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2719, 542631, 2, 540700, '500235000000', '云阳县', '重庆,云阳', '108.697324', '30.930613', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2720, 543152, 2, 540700, '500236000000', '奉节县', '重庆,奉节', '109.463987', '31.018498', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2721, 543575, 2, 540700, '500237000000', '巫山县', '重庆,巫山', '109.879153', '31.074834', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2722, 543943, 2, 540700, '500238000000', '巫溪县', '重庆,巫溪', '109.570062', '31.398604', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2723, 544307, 2, 540700, '500240000000', '石柱土家族自治县', '重庆,石柱', '108.114069', '29.999285', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2724, 544583, 2, 540700, '500241000000', '秀山土家族苗族自治县', '重庆,秀山', '109.007094', '28.447997', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2725, 544878, 2, 540700, '500242000000', '酉阳土家族苗族自治县', '重庆,酉阳', '108.767747', '28.841244', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2726, 545196, 2, 540700, '500243000000', '彭水苗族土家族自治县', '重庆,彭水', '108.165538', '29.293902', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2727, 545534, 2, 545533, '510101000000', '市辖区', '四川,成都', '104.066541', '30.572269', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2728, 545535, 2, 545533, '510104000000', '锦江区', '四川,成都,锦江', '104.080989', '30.657689', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2729, 545669, 2, 545533, '510105000000', '青羊区', '四川,成都,青羊', '104.062499', '30.674406', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2730, 545763, 2, 545533, '510106000000', '金牛区', '四川,成都,金牛', '104.052236', '30.691359', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2731, 545889, 2, 545533, '510107000000', '武侯区', '四川,成都,武侯', '104.043390', '30.641982', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2732, 546035, 2, 545533, '510108000000', '成华区', '四川,成都,成华', '104.101255', '30.660122', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2733, 546151, 2, 545533, '510112000000', '龙泉驿区', '四川,成都,龙泉驿', '104.274632', '30.556507', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2734, 546306, 2, 545533, '510113000000', '青白江区', '四川,成都,青白江', '104.250877', '30.878681', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2735, 546441, 2, 545533, '510114000000', '新都区', '四川,成都,新都', '104.158705', '30.823499', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2736, 546710, 2, 545533, '510115000000', '温江区', '四川,成都,温江', '103.856646', '30.682203', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2737, 546835, 2, 545533, '510116000000', '双流区', '四川,成都,双流', '103.923588', '30.574488', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2738, 547144, 2, 545533, '510121000000', '金堂县', '四川,成都,金堂', '104.412005', '30.862017', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2739, 547398, 2, 545533, '510124000000', '郫县', '四川,成都,郫县', '103.901092', '30.795854', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2740, 547634, 2, 545533, '510129000000', '大邑县', '四川,成都,大邑', '103.511875', '30.572269', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2741, 547873, 2, 545533, '510131000000', '蒲江县', '四川,成都,蒲江', '103.506498', '30.196789', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2742, 548018, 2, 545533, '510132000000', '新津县', '四川,成都,新津', '103.811345', '30.410222', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2743, 548137, 2, 545533, '510181000000', '都江堰市', '四川,成都,都江堰', '103.646912', '30.988435', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2744, 548412, 2, 545533, '510182000000', '彭州市', '四川,成都,彭州', '103.958013', '30.990165', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2745, 548788, 2, 545533, '510183000000', '邛崃市', '四川,成都,邛崃', '103.464156', '30.410275', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2746, 549084, 2, 545533, '510184000000', '崇州市', '四川,成都,崇州', '103.673001', '30.630122', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2747, 549363, 2, 545533, '510185000000', '简阳市', '四川,成都,简阳', '104.546774', '30.410755', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2748, 550276, 2, 550275, '510301000000', '市辖区', '四川,自贡', '104.778442', '29.339030', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2749, 550277, 2, 550275, '510302000000', '自流井区', '四川,自贡,自流井', '104.777191', '29.337430', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2750, 550413, 2, 550275, '510303000000', '贡井区', '四川,自贡,贡井', '104.715117', '29.345546', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2751, 550609, 2, 550275, '510304000000', '大安区', '四川,自贡,大安', '104.773968', '29.363634', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2752, 550816, 2, 550275, '510311000000', '沿滩区', '四川,自贡,沿滩', '104.874073', '29.272581', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2753, 551023, 2, 550275, '510321000000', '荣县', '四川,自贡,荣县', '104.417388', '29.445410', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2754, 551398, 2, 550275, '510322000000', '富顺县', '四川,自贡,富顺', '104.975048', '29.181430', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2755, 551810, 2, 551809, '510401000000', '市辖区', '四川,攀枝花', '101.718637', '26.582347', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2756, 551811, 2, 551809, '510402000000', '东区', '四川,攀枝花,东区', '101.718637', '26.582347', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2757, 551891, 2, 551809, '510403000000', '西区', '四川,攀枝花,西区', '101.718637', '26.582347', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2758, 551941, 2, 551809, '510411000000', '仁和区', '四川,攀枝花,仁和', '101.738528', '26.497765', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2759, 552057, 2, 551809, '510421000000', '米易县', '四川,攀枝花,米易', '102.110339', '26.890689', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2760, 552169, 2, 551809, '510422000000', '盐边县', '四川,攀枝花,盐边', '101.855071', '26.683213', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2761, 552359, 2, 552358, '510501000000', '市辖区', '四川,泸州', '105.442258', '28.871810', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2762, 552360, 2, 552358, '510502000000', '江阳区', '四川,泸州,江阳', '105.435009', '28.878818', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2763, 552536, 2, 552358, '510503000000', '纳溪区', '四川,泸州,纳溪', '105.371151', '28.773428', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2764, 552755, 2, 552358, '510504000000', '龙马潭区', '四川,泸州,龙马潭', '105.437765', '28.913221', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2765, 552858, 2, 552358, '510521000000', '泸县', '四川,泸州,泸县', '105.381893', '29.151534', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2766, 553181, 2, 552358, '510522000000', '合江县', '四川,泸州,合江', '105.831067', '28.811203', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2767, 553536, 2, 552358, '510524000000', '叙永县', '四川,泸州,叙永', '105.444765', '28.155801', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2768, 553823, 2, 552358, '510525000000', '古蔺县', '四川,泸州,古蔺', '105.812602', '28.038802', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2769, 554143, 2, 554142, '510601000000', '市辖区', '四川,德阳', '104.397894', '31.126855', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2770, 554144, 2, 554142, '510603000000', '旌阳区', '四川,德阳,旌阳', '104.416943', '31.142498', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2771, 554397, 2, 554142, '510623000000', '中江县', '四川,德阳,中江', '104.678749', '31.033051', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2772, 555280, 2, 554142, '510626000000', '罗江县', '四川,德阳,罗江', '104.510249', '31.317045', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2773, 555418, 2, 554142, '510681000000', '广汉市', '四川,德阳,广汉', '104.282331', '30.976165', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2774, 555660, 2, 554142, '510682000000', '什邡市', '四川,德阳,什邡', '104.167501', '31.126780', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2775, 555848, 2, 554142, '510683000000', '绵竹市', '四川,德阳,绵竹', '104.220750', '31.338077', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2776, 556078, 2, 556077, '510701000000', '市辖区', '四川,绵阳', '104.679114', '31.467450', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2777, 556079, 2, 556077, '510703000000', '涪城区', '四川,绵阳,涪城', '104.756944', '31.455101', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2778, 556357, 2, 556077, '510704000000', '游仙区', '四川,绵阳,游仙', '104.766393', '31.473779', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2779, 556705, 2, 556077, '510705000000', '安州区', '四川,绵阳,安州', '104.679114', '31.467450', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2780, 556985, 2, 556077, '510722000000', '三台县', '四川,绵阳,三台', '105.094586', '31.095979', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2781, 558091, 2, 556077, '510723000000', '盐亭县', '四川,绵阳,盐亭', '105.389453', '31.208363', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2782, 558648, 2, 556077, '510725000000', '梓潼县', '四川,绵阳,梓潼', '105.170845', '31.642718', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2783, 559030, 2, 556077, '510726000000', '北川羌族自治县', '四川,绵阳,北川', '104.467970', '31.617203', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2784, 559397, 2, 556077, '510727000000', '平武县', '四川,绵阳,平武', '104.555583', '32.409675', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2785, 559687, 2, 556077, '510781000000', '江油市', '四川,绵阳,江油', '104.745877', '31.778025', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2786, 560192, 2, 560191, '510801000000', '市辖区', '四川,广元', '105.843357', '32.435435', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2787, 560193, 2, 560191, '510802000000', '利州区', '四川,广元,利州', '105.845218', '32.433898', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2788, 560469, 2, 560191, '510811000000', '昭化区', '四川,广元,昭化', '105.964121', '32.322788', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2789, 560735, 2, 560191, '510812000000', '朝天区', '四川,广元,朝天', '105.890445', '32.643982', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2790, 560982, 2, 560191, '510821000000', '旺苍县', '四川,广元,旺苍', '106.289905', '32.228917', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2791, 561413, 2, 560191, '510822000000', '青川县', '四川,广元,青川', '105.238842', '32.575485', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2792, 561756, 2, 560191, '510823000000', '剑阁县', '四川,广元,剑阁', '105.524766', '32.287723', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2793, 562393, 2, 560191, '510824000000', '苍溪县', '四川,广元,苍溪', '105.934801', '31.732432', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2794, 563243, 2, 563242, '510901000000', '市辖区', '四川,遂宁', '105.592898', '30.532847', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2795, 563244, 2, 563242, '510903000000', '船山区', '四川,遂宁,船山', '105.568297', '30.525475', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2796, 563569, 2, 563242, '510904000000', '安居区', '四川,遂宁,安居', '105.456342', '30.355379', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2797, 564115, 2, 563242, '510921000000', '蓬溪县', '四川,遂宁,蓬溪', '105.707570', '30.757575', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2798, 564699, 2, 563242, '510922000000', '射洪县', '四川,遂宁,射洪', '105.388405', '30.870986', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2799, 565387, 2, 563242, '510923000000', '大英县', '四川,遂宁,大英', '105.236904', '30.594337', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2800, 565736, 2, 565735, '511001000000', '市辖区', '四川,内江', '105.058433', '29.580228', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2801, 565737, 2, 565735, '511002000000', '市中区', '四川,内江,市中', '105.067597', '29.587053', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2802, 565956, 2, 565735, '511011000000', '东兴区', '四川,内江,东兴', '105.075490', '29.592756', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2803, 566504, 2, 565735, '511024000000', '威远县', '四川,内江,威远', '104.668879', '29.527440', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2804, 566895, 2, 565735, '511025000000', '资中县', '四川,内江,资中', '104.851944', '29.764059', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2805, 567769, 2, 565735, '511028000000', '隆昌县', '四川,内江,隆昌', '105.287612', '29.339476', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2806, 568203, 2, 568202, '511101000000', '市辖区', '四川,乐山', '103.765568', '29.552106', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2807, 568204, 2, 568202, '511102000000', '市中区', '四川,乐山,市中', '103.761330', '29.555375', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2808, 568549, 2, 568202, '511111000000', '沙湾区', '四川,乐山,沙湾', '103.549991', '29.413091', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2809, 568712, 2, 568202, '511112000000', '五通桥区', '四川,乐山,五通桥', '103.818009', '29.406932', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2810, 568897, 2, 568202, '511113000000', '金口河区', '四川,乐山,金口河', '103.078621', '29.244345', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2811, 568949, 2, 568202, '511123000000', '犍为县', '四川,乐山,犍为', '103.949326', '29.208171', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2812, 569368, 2, 568202, '511124000000', '井研县', '四川,乐山,井研', '104.069726', '29.651287', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2813, 569627, 2, 568202, '511126000000', '夹江县', '四川,乐山,夹江', '103.571657', '29.737630', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2814, 569905, 2, 568202, '511129000000', '沐川县', '四川,乐山,沐川', '103.902335', '28.956647', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2815, 570138, 2, 568202, '511132000000', '峨边彝族自治县', '四川,乐山,峨边', '103.765568', '29.552106', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2816, 570296, 2, 568202, '511133000000', '马边彝族自治县', '四川,乐山,马边', '103.546348', '28.835521', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2817, 570440, 2, 568202, '511181000000', '峨眉山市', '四川,乐山,峨眉山', '103.484504', '29.601199', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2818, 570734, 2, 570733, '511301000000', '市辖区', '四川,南充', '106.110698', '30.837793', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2819, 570735, 2, 570733, '511302000000', '顺庆区', '四川,南充,顺庆', '106.092399', '30.796486', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2820, 571078, 2, 570733, '511303000000', '高坪区', '四川,南充,高坪', '106.118808', '30.781623', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2821, 571510, 2, 570733, '511304000000', '嘉陵区', '四川,南充,嘉陵', '106.071793', '30.758748', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2822, 572146, 2, 570733, '511321000000', '南部县', '四川,南充,南部', '106.036584', '31.347467', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2823, 573339, 2, 570733, '511322000000', '营山县', '四川,南充,营山', '106.565473', '31.076458', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2824, 574080, 2, 570733, '511323000000', '蓬安县', '四川,南充,蓬安', '106.412151', '31.029097', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2825, 574767, 2, 570733, '511324000000', '仪陇县', '四川,南充,仪陇', '106.303042', '31.271562', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2826, 575761, 2, 570733, '511325000000', '西充县', '四川,南充,西充', '105.900878', '30.995669', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2827, 576427, 2, 570733, '511381000000', '阆中市', '四川,南充,阆中', '106.005047', '31.558357', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2828, 576993, 2, 576992, '511401000000', '市辖区', '四川,眉山', '103.848538', '30.075439', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2829, 576994, 2, 576992, '511402000000', '东坡区', '四川,眉山,东坡', '103.831752', '30.042345', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2830, 577323, 2, 576992, '511403000000', '彭山区', '四川,眉山,彭山', '103.872950', '30.193056', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2831, 577445, 2, 576992, '511421000000', '仁寿县', '四川,眉山,仁寿', '104.134082', '29.995630', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2832, 578124, 2, 576992, '511423000000', '洪雅县', '四川,眉山,洪雅', '103.372863', '29.904890', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2833, 578299, 2, 576992, '511424000000', '丹棱县', '四川,眉山,丹棱', '103.512733', '30.014448', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2834, 578385, 2, 576992, '511425000000', '青神县', '四川,眉山,青神', '103.846688', '29.831358', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2835, 578486, 2, 578485, '511501000000', '市辖区', '四川,宜宾', '104.643215', '28.751768', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2836, 578487, 2, 578485, '511502000000', '翠屏区', '四川,宜宾,翠屏', '104.620009', '28.765690', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2837, 578857, 2, 578485, '511503000000', '南溪区', '四川,宜宾,南溪', '104.969882', '28.845626', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2838, 579114, 2, 578485, '511521000000', '宜宾县', '四川,宜宾,宜宾', '104.533213', '28.690045', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2839, 579727, 2, 578485, '511523000000', '江安县', '四川,宜宾,江安', '105.066943', '28.723999', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2840, 580070, 2, 578485, '511524000000', '长宁县', '四川,宜宾,长宁', '104.921174', '28.582169', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2841, 580388, 2, 578485, '511525000000', '高县', '四川,宜宾,高县', '104.517739', '28.436226', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2842, 580725, 2, 578485, '511526000000', '珙县', '四川,宜宾,珙县', '104.709202', '28.438630', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2843, 581025, 2, 578485, '511527000000', '筠连县', '四川,宜宾,筠连', '104.510988', '28.163860', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2844, 581304, 2, 578485, '511528000000', '兴文县', '四川,宜宾,兴文', '105.236325', '28.303614', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2845, 581579, 2, 578485, '511529000000', '屏山县', '四川,宜宾,屏山', '104.345974', '28.828482', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2846, 581871, 2, 581870, '511601000000', '市辖区', '四川,广安', '106.633212', '30.455961', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2847, 581872, 2, 581870, '511602000000', '广安区', '四川,广安,广安', '106.641608', '30.474003', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2848, 582526, 2, 581870, '511603000000', '前锋区', '四川,广安,前锋', '106.893277', '30.496300', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2849, 582827, 2, 581870, '511621000000', '岳池县', '四川,广安,岳池', '106.440114', '30.537863', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2850, 583751, 2, 581870, '511622000000', '武胜县', '四川,广安,武胜', '106.295764', '30.348772', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2851, 584332, 2, 581870, '511623000000', '邻水县', '四川,广安,邻水', '106.930380', '30.334769', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2852, 584900, 2, 581870, '511681000000', '华蓥市', '四川,广安,华蓥', '106.783088', '30.390435', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2853, 585050, 2, 585049, '511701000000', '市辖区', '四川,达州', '107.468023', '31.209571', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2854, 585051, 2, 585049, '511702000000', '通川区', '四川,达州,通川', '107.504517', '31.214724', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2855, 585347, 2, 585049, '511703000000', '达川区', '四川,达州,达川', '107.511845', '31.196118', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2856, 586085, 2, 585049, '511722000000', '宣汉县', '四川,达州,宣汉', '107.727191', '31.353835', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2857, 586709, 2, 585049, '511723000000', '开江县', '四川,达州,开江', '107.868736', '31.082987', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2858, 586957, 2, 585049, '511724000000', '大竹县', '四川,达州,大竹', '107.204744', '30.736266', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2859, 587452, 2, 585049, '511725000000', '渠县', '四川,达州,渠县', '106.972996', '30.836659', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2860, 588071, 2, 585049, '511781000000', '万源市', '四川,达州,万源', '108.034657', '32.081631', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2861, 588539, 2, 588538, '511801000000', '市辖区', '四川,雅安', '103.013261', '29.980537', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2862, 588540, 2, 588538, '511802000000', '雨城区', '四川,雅安,雨城', '103.033083', '30.005447', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2863, 588771, 2, 588538, '511803000000', '名山区', '四川,雅安,名山', '103.109185', '30.069954', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2864, 589001, 2, 588538, '511822000000', '荥经县', '四川,雅安,荥经', '102.846738', '29.792931', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2865, 589135, 2, 588538, '511823000000', '汉源县', '四川,雅安,汉源', '102.645453', '29.347187', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2866, 589376, 2, 588538, '511824000000', '石棉县', '四川,雅安,石棉', '102.359462', '29.227874', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2867, 589494, 2, 588538, '511825000000', '天全县', '四川,雅安,天全', '102.758317', '30.066713', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2868, 589654, 2, 588538, '511826000000', '芦山县', '四川,雅安,芦山', '102.928260', '30.144084', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2869, 589711, 2, 588538, '511827000000', '宝兴县', '四川,雅安,宝兴', '102.814531', '30.368126', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2870, 589780, 2, 589779, '511901000000', '市辖区', '四川,巴中', '106.747477', '31.867903', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2871, 589781, 2, 589779, '511902000000', '巴州区', '四川,巴中,巴州', '106.768878', '31.851478', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2872, 590246, 2, 589779, '511903000000', '恩阳区', '四川,巴中,恩阳', '106.655347', '31.786691', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2873, 590712, 2, 589779, '511921000000', '通江县', '四川,巴中,通江', '107.245033', '31.911705', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2874, 591330, 2, 589779, '511922000000', '南江县', '四川,巴中,南江', '106.828697', '32.346589', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2875, 592003, 2, 589779, '511923000000', '平昌县', '四川,巴中,平昌', '107.104008', '31.560874', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2876, 592599, 2, 592598, '512001000000', '市辖区', '四川,资阳', '104.627636', '30.128901', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2877, 592600, 2, 592598, '512002000000', '雁江区', '四川,资阳,雁江', '104.677096', '30.108210', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2878, 593157, 2, 592598, '512021000000', '安岳县', '四川,资阳,安岳', '105.335613', '30.097246', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2879, 594205, 2, 592598, '512022000000', '乐至县', '四川,资阳,乐至', '105.020204', '30.276120', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2880, 594865, 2, 594864, '513201000000', '马尔康市', '四川,阿坝,马尔康', '102.206504', '31.905813', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2881, 594988, 2, 594864, '513221000000', '汶川县', '四川,阿坝,汶川', '103.590387', '31.476822', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2882, 595128, 2, 594864, '513222000000', '理县', '四川,阿坝,理县', '103.166853', '31.436473', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2883, 595230, 2, 594864, '513223000000', '茂县', '四川,阿坝,茂县', '103.853522', '31.681154', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2884, 595404, 2, 594864, '513224000000', '松潘县', '四川,阿坝,松潘', '103.604698', '32.655325', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2885, 595579, 2, 594864, '513225000000', '九寨沟县', '四川,阿坝,九寨沟', '104.243841', '33.252056', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2886, 595731, 2, 594864, '513226000000', '金川县', '四川,阿坝,金川', '102.063829', '31.476277', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2887, 595864, 2, 594864, '513227000000', '小金县', '四川,阿坝,小金', '102.364373', '30.999031', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2888, 596022, 2, 594864, '513228000000', '黑水县', '四川,阿坝,黑水', '102.990108', '32.061895', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2889, 596167, 2, 594864, '513230000000', '壤塘县', '四川,阿坝,壤塘', '100.978526', '32.265796', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2890, 596243, 2, 594864, '513231000000', '阿坝县', '四川,阿坝,阿坝', '101.706655', '32.902459', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2891, 596354, 2, 594864, '513232000000', '若尔盖县', '四川,阿坝,若尔盖', '102.961798', '33.575892', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2892, 596475, 2, 594864, '513233000000', '红原县', '四川,阿坝,红原', '102.544405', '32.790891', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2893, 596526, 2, 596525, '513301000000', '康定市', '四川,甘孜,康定', '101.957146', '29.998436', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2894, 596792, 2, 596525, '513322000000', '泸定县', '四川,甘孜,泸定', '102.234618', '29.914160', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2895, 596957, 2, 596525, '513323000000', '丹巴县', '四川,甘孜,丹巴', '101.890358', '30.878577', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2896, 597158, 2, 596525, '513324000000', '九龙县', '四川,甘孜,九龙', '101.507294', '29.000348', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2897, 597242, 2, 596525, '513325000000', '雅江县', '四川,甘孜,雅江', '101.014425', '30.031533', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2898, 597374, 2, 596525, '513326000000', '道孚县', '四川,甘孜,道孚', '101.125237', '30.979545', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2899, 597557, 2, 596525, '513327000000', '炉霍县', '四川,甘孜,炉霍', '100.676372', '31.391790', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2900, 597749, 2, 596525, '513328000000', '甘孜县', '四川,甘孜,甘孜', '99.992671', '31.622934', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2901, 597992, 2, 596525, '513329000000', '新龙县', '四川,甘孜,新龙', '100.311369', '30.939169', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2902, 598162, 2, 596525, '513330000000', '德格县', '四川,甘孜,德格', '98.580915', '31.806118', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2903, 598363, 2, 596525, '513331000000', '白玉县', '四川,甘孜,白玉', '98.824182', '31.209913', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2904, 598540, 2, 596525, '513332000000', '石渠县', '四川,甘孜,石渠', '98.102900', '32.978960', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2905, 598733, 2, 596525, '513333000000', '色达县', '四川,甘孜,色达', '100.332743', '32.268129', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2906, 598889, 2, 596525, '513334000000', '理塘县', '四川,甘孜,理塘', '100.269818', '29.996049', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2907, 599129, 2, 596525, '513335000000', '巴塘县', '四川,甘孜,巴塘', '99.110712', '30.004677', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2908, 599272, 2, 596525, '513336000000', '乡城县', '四川,甘孜,乡城', '99.798435', '28.931172', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2909, 599377, 2, 596525, '513337000000', '稻城县', '四川,甘孜,稻城', '100.298403', '29.037007', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2910, 599516, 2, 596525, '513338000000', '得荣县', '四川,甘孜,得荣', '99.286335', '28.713037', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2911, 599660, 2, 599659, '513401000000', '西昌市', '四川,凉山,西昌', '102.264449', '27.894504', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2912, 599974, 2, 599659, '513422000000', '木里藏族自治县', '四川,凉山,木里', '101.280206', '27.928835', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2913, 600127, 2, 599659, '513423000000', '盐源县', '四川,凉山,盐源', '101.509188', '27.422645', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2914, 600415, 2, 599659, '513424000000', '德昌县', '四川,凉山,德昌', '102.175670', '27.402839', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2915, 600579, 2, 599659, '513425000000', '会理县', '四川,凉山,会理', '102.244683', '26.655026', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2916, 600938, 2, 599659, '513426000000', '会东县', '四川,凉山,会东', '102.577961', '26.634669', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2917, 601284, 2, 599659, '513427000000', '宁南县', '四川,凉山,宁南', '102.759634', '27.066384', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2918, 601444, 2, 599659, '513428000000', '普格县', '四川,凉山,普格', '102.540901', '27.376413', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2919, 601640, 2, 599659, '513429000000', '布拖县', '四川,凉山,布拖', '102.811631', '27.706192', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2920, 601863, 2, 599659, '513430000000', '金阳县', '四川,凉山,金阳', '103.248772', '27.696861', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2921, 602076, 2, 599659, '513431000000', '昭觉县', '四川,凉山,昭觉', '102.842611', '28.014088', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2922, 602396, 2, 599659, '513432000000', '喜德县', '四川,凉山,喜德', '102.412518', '28.306726', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2923, 602594, 2, 599659, '513433000000', '冕宁县', '四川,凉山,冕宁', '102.177010', '28.549657', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2924, 602865, 2, 599659, '513434000000', '越西县', '四川,凉山,越西', '102.507680', '28.639801', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2925, 603201, 2, 599659, '513435000000', '甘洛县', '四川,凉山,甘洛', '102.771749', '28.966069', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2926, 603460, 2, 599659, '513436000000', '美姑县', '四川,凉山,美姑', '103.132180', '28.328640', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2927, 603792, 2, 599659, '513437000000', '雷波县', '四川,凉山,雷波', '103.571696', '28.262683', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2928, 604133, 2, 604132, '520101000000', '市辖区', '贵州,贵阳', '106.630153', '26.647661', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2929, 604134, 2, 604132, '520102000000', '南明区', '贵州,贵阳,南明', '106.714371', '26.567944', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2930, 604342, 2, 604132, '520103000000', '云岩区', '贵州,贵阳,云岩', '106.630153', '26.647661', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2931, 604530, 2, 604132, '520111000000', '花溪区', '贵州,贵阳,花溪', '106.670258', '26.409817', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2932, 604769, 2, 604132, '520112000000', '乌当区', '贵州,贵阳,乌当', '106.630153', '26.647661', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2933, 604883, 2, 604132, '520113000000', '白云区', '贵州,贵阳,白云', '106.630153', '26.647661', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2934, 604989, 2, 604132, '520115000000', '观山湖区', '贵州,贵阳,观山湖', '106.622452', '26.601450', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2935, 605114, 2, 604132, '520121000000', '开阳县', '贵州,贵阳,开阳', '106.965088', '27.057764', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2936, 605264, 2, 604132, '520122000000', '息烽县', '贵州,贵阳,息烽', '106.740410', '27.090479', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2937, 605453, 2, 604132, '520123000000', '修文县', '贵州,贵阳,修文', '106.592110', '26.838926', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2938, 605593, 2, 604132, '520181000000', '清镇市', '贵州,贵阳,清镇', '106.470711', '26.556080', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2939, 605835, 2, 605834, '520201000000', '钟山区', '贵州,六盘水,钟山', '104.843555', '26.574979', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2940, 605994, 2, 605834, '520203000000', '六枝特区', '贵州,六盘水,六枝特', '105.480029', '26.201228', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2941, 606258, 2, 605834, '520221000000', '水城县', '贵州,六盘水,水城', '104.957831', '26.547904', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2942, 606493, 2, 605834, '520222000000', '盘县', '贵州,六盘水,盘县', '104.471535', '25.710002', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2943, 607030, 2, 607029, '520301000000', '市辖区', '贵州,遵义', '106.927389', '27.725654', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2944, 607031, 2, 607029, '520302000000', '红花岗区', '贵州,遵义,红花岗', '106.893709', '27.644755', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2945, 607235, 2, 607029, '520303000000', '汇川区', '贵州,遵义,汇川', '106.934270', '27.750125', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2946, 607385, 2, 607029, '520304000000', '播州区', '贵州,遵义,播州', '106.927389', '27.725654', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2947, 607584, 2, 607029, '520322000000', '桐梓县', '贵州,遵义,桐梓', '106.825644', '28.133583', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2948, 607833, 2, 607029, '520323000000', '绥阳县', '贵州,遵义,绥阳', '107.191222', '27.946222', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2949, 607966, 2, 607029, '520324000000', '正安县', '贵州,遵义,正安', '107.453945', '28.553285', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2950, 608138, 2, 607029, '520325000000', '道真仡佬族苗族自治县', '贵州,遵义,道真', '106.927389', '27.725654', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2951, 608236, 2, 607029, '520326000000', '务川仡佬族苗族自治县', '贵州,遵义,务川', '107.898957', '28.563086', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2952, 608370, 2, 607029, '520327000000', '凤冈县', '贵州,遵义,凤冈', '107.716356', '27.954695', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2953, 608471, 2, 607029, '520328000000', '湄潭县', '贵州,遵义,湄潭', '107.465407', '27.749055', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2954, 608620, 2, 607029, '520329000000', '余庆县', '贵州,遵义,余庆', '107.905278', '27.215420', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2955, 608701, 2, 607029, '520330000000', '习水县', '贵州,遵义,习水', '106.197138', '28.331270', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2956, 608974, 2, 607029, '520381000000', '赤水市', '贵州,遵义,赤水', '105.697472', '28.590337', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2957, 609114, 2, 607029, '520382000000', '仁怀市', '贵州,遵义,仁怀', '106.400342', '27.791650', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2958, 609310, 2, 609309, '520401000000', '市辖区', '贵州,安顺', '105.947593', '26.253072', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2959, 609311, 2, 609309, '520402000000', '西秀区', '贵州,安顺,西秀', '105.965535', '26.245433', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2960, 609686, 2, 609309, '520403000000', '平坝区', '贵州,安顺,平坝', '106.255557', '26.405502', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2961, 609845, 2, 609309, '520422000000', '普定县', '贵州,安顺,普定', '105.743196', '26.301446', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2962, 610030, 2, 609309, '520423000000', '镇宁布依族苗族自治县', '贵州,安顺,镇宁', '105.770402', '26.057362', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2963, 610256, 2, 609309, '520424000000', '关岭布依族苗族自治县', '贵州,安顺,关岭', '105.622053', '25.940378', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2964, 610426, 2, 609309, '520425000000', '紫云苗族布依族自治县', '贵州,安顺,紫云', '106.087216', '25.755886', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2965, 610608, 2, 610607, '520501000000', '市辖区', '贵州,毕节', '105.283992', '27.302589', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2966, 610609, 2, 610607, '520502000000', '七星关区', '贵州,毕节,七星关', '105.305138', '27.298494', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2967, 611207, 2, 610607, '520521000000', '大方县', '贵州,毕节,大方', '105.613174', '27.141682', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2968, 611627, 2, 610607, '520522000000', '黔西县', '贵州,毕节,黔西', '106.033544', '27.007713', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2969, 612043, 2, 610607, '520523000000', '金沙县', '贵州,毕节,金沙', '106.220228', '27.459214', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2970, 612308, 2, 610607, '520524000000', '织金县', '贵州,毕节,织金', '105.770542', '26.663450', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2971, 612915, 2, 610607, '520525000000', '纳雍县', '贵州,毕节,纳雍', '105.382715', '26.777645', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2972, 613369, 2, 610607, '520526000000', '威宁彝族回族苗族自治县', '贵州,毕节,威宁', '104.278740', '26.856210', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2973, 614035, 2, 610607, '520527000000', '赫章县', '贵州,毕节,赫章', '104.727418', '27.123079', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2974, 614531, 2, 614530, '520601000000', '市辖区', '贵州,铜仁', '109.189598', '27.731514', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2975, 614532, 2, 614530, '520602000000', '碧江区', '贵州,铜仁,碧江', '109.181122', '27.690653', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2976, 614636, 2, 614530, '520603000000', '万山区', '贵州,铜仁,万山', '109.213644', '27.517896', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2977, 614733, 2, 614530, '520621000000', '江口县', '贵州,铜仁,江口', '108.839557', '27.699650', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2978, 614900, 2, 614530, '520622000000', '玉屏侗族自治县', '贵州,铜仁,玉屏', '108.914680', '27.243012', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2979, 615001, 2, 614530, '520623000000', '石阡县', '贵州,铜仁,石阡', '108.223612', '27.513829', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2980, 615331, 2, 614530, '520624000000', '思南县', '贵州,铜仁,思南', '108.253873', '27.937560', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2981, 615886, 2, 614530, '520625000000', '印江土家族苗族自治县', '贵州,铜仁,印江', '108.409752', '27.994247', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2982, 616278, 2, 614530, '520626000000', '德江县', '贵州,铜仁,德江', '108.119807', '28.263964', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2983, 616644, 2, 614530, '520627000000', '沿河土家族自治县', '贵州,铜仁,沿河', '108.503870', '28.563928', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2984, 617116, 2, 614530, '520628000000', '松桃苗族自治县', '贵州,铜仁,松桃', '109.202886', '28.154071', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2985, 617671, 2, 617670, '522301000000', '兴义市', '贵州,黔西南,兴义', '104.895467', '25.092040', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2986, 617923, 2, 617670, '522322000000', '兴仁县', '贵州,黔西南,兴仁', '105.186238', '25.435183', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2987, 618102, 2, 617670, '522323000000', '普安县', '贵州,黔西南,普安', '104.953063', '25.784135', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2988, 618205, 2, 617670, '522324000000', '晴隆县', '贵州,黔西南,晴隆', '105.218991', '25.834784', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2989, 618316, 2, 617670, '522325000000', '贞丰县', '贵州,黔西南,贞丰', '105.649864', '25.385760', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2990, 618489, 2, 617670, '522326000000', '望谟县', '贵州,黔西南,望谟', '106.099617', '25.178422', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2991, 618671, 2, 617670, '522327000000', '册亨县', '贵州,黔西南,册亨', '105.811593', '24.983663', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2992, 618816, 2, 617670, '522328000000', '安龙县', '贵州,黔西南,安龙', '105.442701', '25.099014', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2993, 619018, 2, 619017, '522601000000', '凯里市', '贵州,黔东南,凯里', '107.981212', '26.566867', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2994, 619308, 2, 619017, '522622000000', '黄平县', '贵州,黔东南,黄平', '107.916412', '26.905396', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2995, 619574, 2, 619017, '522623000000', '施秉县', '贵州,黔东南,施秉', '108.124380', '27.032920', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2996, 619657, 2, 619017, '522624000000', '三穗县', '贵州,黔东南,三穗', '108.675267', '26.952968', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2997, 619831, 2, 619017, '522625000000', '镇远县', '贵州,黔东南,镇远', '108.429691', '27.049110', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2998, 619970, 2, 619017, '522626000000', '岑巩县', '贵州,黔东南,岑巩', '108.816060', '27.173887', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (2999, 620122, 2, 619017, '522627000000', '天柱县', '贵州,黔东南,天柱', '109.207757', '26.909678', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3000, 620465, 2, 619017, '522628000000', '锦屏县', '贵州,黔东南,锦屏', '109.200534', '26.676233', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3001, 620673, 2, 619017, '522629000000', '剑河县', '贵州,黔东南,剑河', '108.441501', '26.728274', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3002, 620996, 2, 619017, '522630000000', '台江县', '贵州,黔东南,台江', '108.321245', '26.667525', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3003, 621166, 2, 619017, '522631000000', '黎平县', '贵州,黔东南,黎平', '109.136658', '26.230424', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3004, 621616, 2, 619017, '522632000000', '榕江县', '贵州,黔东南,榕江', '108.521881', '25.931893', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3005, 621906, 2, 619017, '522633000000', '从江县', '贵州,黔东南,从江', '108.905329', '25.753009', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3006, 622312, 2, 619017, '522634000000', '雷山县', '贵州,黔东南,雷山', '108.077540', '26.378443', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3007, 622484, 2, 619017, '522635000000', '麻江县', '贵州,黔东南,麻江', '107.589359', '26.491105', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3008, 622561, 2, 619017, '522636000000', '丹寨县', '贵州,黔东南,丹寨', '107.788728', '26.198320', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3009, 622735, 2, 622734, '522701000000', '都匀市', '贵州,黔南,都匀', '107.518847', '26.259427', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3010, 622888, 2, 622734, '522702000000', '福泉市', '贵州,黔南,福泉', '107.520386', '26.686335', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3011, 622973, 2, 622734, '522722000000', '荔波县', '贵州,黔南,荔波', '107.886450', '25.410654', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3012, 623082, 2, 622734, '522723000000', '贵定县', '贵州,黔南,贵定', '107.232889', '26.557071', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3013, 623205, 2, 622734, '522725000000', '瓮安县', '贵州,黔南,瓮安', '107.471555', '27.078472', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3014, 623318, 2, 622734, '522726000000', '独山县', '贵州,黔南,独山', '107.545048', '25.822132', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3015, 623391, 2, 622734, '522727000000', '平塘县', '贵州,黔南,平塘', '107.323077', '25.831955', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3016, 623530, 2, 622734, '522728000000', '罗甸县', '贵州,黔南,罗甸', '106.751418', '25.424845', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3017, 623723, 2, 622734, '522729000000', '长顺县', '贵州,黔南,长顺', '106.447376', '26.022116', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3018, 623813, 2, 622734, '522730000000', '龙里县', '贵州,黔南,龙里', '106.979524', '26.453154', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3019, 623901, 2, 622734, '522731000000', '惠水县', '贵州,黔南,惠水', '106.657089', '26.132061', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3020, 624122, 2, 622734, '522732000000', '三都水族自治县', '贵州,黔南,三都', '107.869749', '25.983202', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3021, 624374, 2, 624373, '530101000000', '市辖区', '云南,昆明', '102.832891', '24.880095', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3022, 624375, 2, 624373, '530102000000', '五华区', '云南,昆明,五华', '102.832891', '24.880095', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3023, 624486, 2, 624373, '530103000000', '盘龙区', '云南,昆明,盘龙', '102.832891', '24.880095', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3024, 624599, 2, 624373, '530111000000', '官渡区', '云南,昆明,官渡', '102.832891', '24.880095', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3025, 624730, 2, 624373, '530112000000', '西山区', '云南,昆明,西山', '102.832891', '24.880095', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3026, 624860, 2, 624373, '530113000000', '东川区', '云南,昆明,东川', '103.187820', '26.082872', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3027, 625034, 2, 624373, '530114000000', '呈贡区', '云南,昆明,呈贡', '102.832891', '24.880095', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3028, 625111, 2, 624373, '530122000000', '晋宁县', '云南,昆明,晋宁', '102.832891', '24.880095', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3029, 625255, 2, 624373, '530124000000', '富民县', '云南,昆明,富民', '102.497681', '25.222046', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3030, 625337, 2, 624373, '530125000000', '宜良县', '云南,昆明,宜良', '103.141304', '24.919704', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3031, 625486, 2, 624373, '530126000000', '石林彝族自治县', '云南,昆明,石林', '102.832891', '24.880095', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3032, 625585, 2, 624373, '530127000000', '嵩明县', '云南,昆明,嵩明', '103.036911', '25.338642', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3033, 625669, 2, 624373, '530128000000', '禄劝彝族苗族自治县', '云南,昆明,禄劝', '102.832891', '24.880095', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3034, 625883, 2, 624373, '530129000000', '寻甸回族彝族自治县', '云南,昆明,寻甸', '102.832891', '24.880095', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3035, 626074, 2, 624373, '530181000000', '安宁市', '云南,昆明,安宁', '102.832891', '24.880095', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3036, 626182, 2, 626181, '530301000000', '市辖区', '云南,曲靖', '103.796167', '25.489999', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3037, 626183, 2, 626181, '530302000000', '麒麟区', '云南,曲靖,麒麟', '103.805012', '25.495241', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3038, 626343, 2, 626181, '530303000000', '沾益区', '云南,曲靖,沾益', '103.822324', '25.600507', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3039, 626485, 2, 626181, '530321000000', '马龙县', '云南,曲靖,马龙', '103.578454', '25.428130', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3040, 626569, 2, 626181, '530322000000', '陆良县', '云南,曲靖,陆良', '103.666663', '25.030051', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3041, 626731, 2, 626181, '530323000000', '师宗县', '云南,曲靖,师宗', '103.985478', '24.822403', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3042, 626852, 2, 626181, '530324000000', '罗平县', '云南,曲靖,罗平', '104.308675', '24.884626', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3043, 627020, 2, 626181, '530325000000', '富源县', '云南,曲靖,富源', '104.255015', '25.674238', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3044, 627194, 2, 626181, '530326000000', '会泽县', '云南,曲靖,会泽', '103.297361', '26.417947', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3045, 627596, 2, 626181, '530381000000', '宣威市', '云南,曲靖,宣威', '104.104475', '26.219767', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3046, 627982, 2, 627981, '530401000000', '市辖区', '云南,玉溪', '102.546543', '24.352036', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3047, 627983, 2, 627981, '530402000000', '红塔区', '云南,玉溪,红塔', '102.540179', '24.341098', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3048, 628099, 2, 627981, '530403000000', '江川区', '云南,玉溪,江川', '102.753734', '24.287534', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3049, 628181, 2, 627981, '530422000000', '澄江县', '云南,玉溪,澄江', '102.908248', '24.673734', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3050, 628228, 2, 627981, '530423000000', '通海县', '云南,玉溪,通海', '102.760039', '24.112205', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3051, 628314, 2, 627981, '530424000000', '华宁县', '云南,玉溪,华宁', '102.928835', '24.192761', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3052, 628397, 2, 627981, '530425000000', '易门县', '云南,玉溪,易门', '102.162531', '24.671651', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3053, 628463, 2, 627981, '530426000000', '峨山彝族自治县', '云南,玉溪,峨山', '102.397333', '24.169401', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3054, 628548, 2, 627981, '530427000000', '新平彝族傣族自治县', '云南,玉溪,新平', '101.990157', '24.070051', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3055, 628684, 2, 627981, '530428000000', '元江哈尼族彝族傣族自治县', '云南,玉溪,元江', '101.998103', '23.596503', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3056, 628777, 2, 628776, '530501000000', '市辖区', '云南,保山', '99.161761', '25.112046', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3057, 628778, 2, 628776, '530502000000', '隆阳区', '云南,保山,隆阳', '99.165607', '25.121154', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3058, 629117, 2, 628776, '530521000000', '施甸县', '云南,保山,施甸', '99.189221', '24.723064', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3059, 629271, 2, 628776, '530523000000', '龙陵县', '云南,保山,龙陵', '98.689230', '24.586766', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3060, 629403, 2, 628776, '530524000000', '昌宁县', '云南,保山,昌宁', '99.605142', '24.827839', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3061, 629541, 2, 628776, '530581000000', '腾冲市', '云南,保山,腾冲', '98.497291', '25.017570', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3062, 629782, 2, 629781, '530601000000', '市辖区', '云南,昭通', '103.717465', '27.338257', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3063, 629783, 2, 629781, '530602000000', '昭阳区', '云南,昭通,昭阳', '103.706539', '27.320075', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3064, 629988, 2, 629781, '530621000000', '鲁甸县', '云南,昭通,鲁甸', '103.558042', '27.186659', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3065, 630098, 2, 629781, '530622000000', '巧家县', '云南,昭通,巧家', '102.930164', '26.908461', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3066, 630299, 2, 629781, '530623000000', '盐津县', '云南,昭通,盐津', '104.234442', '28.108710', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3067, 630404, 2, 629781, '530624000000', '大关县', '云南,昭通,大关', '103.891146', '27.747978', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3068, 630498, 2, 629781, '530625000000', '永善县', '云南,昭通,永善', '103.638067', '28.229113', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3069, 630656, 2, 629781, '530626000000', '绥江县', '云南,昭通,绥江', '103.968978', '28.592100', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3070, 630704, 2, 629781, '530627000000', '镇雄县', '云南,昭通,镇雄', '104.873579', '27.441668', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3071, 630989, 2, 629781, '530628000000', '彝良县', '云南,昭通,彝良', '104.048289', '27.625419', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3072, 631144, 2, 629781, '530629000000', '威信县', '云南,昭通,威信', '105.049027', '27.846901', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3073, 631242, 2, 629781, '530630000000', '水富县', '云南,昭通,水富', '104.416031', '28.629880', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3074, 631277, 2, 631276, '530701000000', '市辖区', '云南,丽江', '100.227750', '26.855047', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3075, 631278, 2, 631276, '530702000000', '古城区', '云南,丽江,古城', '100.225766', '26.877190', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3076, 631349, 2, 631276, '530721000000', '玉龙纳西族自治县', '云南,丽江,玉龙', '100.236955', '26.821460', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3077, 631469, 2, 631276, '530722000000', '永胜县', '云南,丽江,永胜', '100.750795', '26.684225', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3078, 631634, 2, 631276, '530723000000', '华坪县', '云南,丽江,华坪', '101.266195', '26.629211', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3079, 631704, 2, 631276, '530724000000', '宁蒗彝族自治县', '云南,丽江,宁蒗', '100.852001', '27.282071', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3080, 631812, 2, 631811, '530801000000', '市辖区', '云南,普洱', '100.966512', '22.825065', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3081, 631813, 2, 631811, '530802000000', '思茅区', '云南,普洱,思茅', '100.977165', '22.786910', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3082, 631894, 2, 631811, '530821000000', '宁洱哈尼族彝族自治县', '云南,普洱,宁洱', '100.980485', '22.781242', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3083, 631993, 2, 631811, '530822000000', '墨江哈尼族自治县', '云南,普洱,墨江', '101.692461', '23.431894', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3084, 632177, 2, 631811, '530823000000', '景东彝族自治县', '云南,普洱,景东', '100.833877', '24.446731', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3085, 632361, 2, 631811, '530824000000', '景谷傣族彝族自治县', '云南,普洱,景谷', '100.702871', '23.497028', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3086, 632513, 2, 631811, '530825000000', '镇沅彝族哈尼族拉祜族自治县', '云南,普洱,镇沅', '101.108595', '24.004442', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3087, 632634, 2, 631811, '530826000000', '江城哈尼族彝族自治县', '云南,普洱,江城', '101.862120', '22.585868', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3088, 632693, 2, 631811, '530827000000', '孟连傣族拉祜族佤族自治县', '云南,普洱,孟连', '99.584157', '22.329100', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3089, 632742, 2, 631811, '530828000000', '澜沧拉祜族自治县', '云南,普洱,澜沧', '99.931975', '22.555905', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3090, 632924, 2, 631811, '530829000000', '西盟佤族自治县', '云南,普洱,西', '100.966512', '22.825065', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3091, 632972, 2, 632971, '530901000000', '市辖区', '云南,临沧', '100.079583', '23.877573', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3092, 632973, 2, 632971, '530902000000', '临翔区', '云南,临沧,临翔', '100.082523', '23.895137', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3093, 633086, 2, 632971, '530921000000', '凤庆县', '云南,临沧,凤庆', '99.928460', '24.580424', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3094, 633287, 2, 632971, '530922000000', '云县', '云南,临沧,云县', '100.123248', '24.437061', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3095, 633498, 2, 632971, '530923000000', '永德县', '云南,临沧,永德', '99.259340', '24.018357', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3096, 633629, 2, 632971, '530924000000', '镇康县', '云南,临沧,镇康', '98.825285', '23.762584', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3097, 633711, 2, 632971, '530925000000', '双江拉祜族佤族布朗族傣族自治县', '云南,临沧,双江', '99.827698', '23.473499', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3098, 633793, 2, 632971, '530926000000', '耿马傣族佤族自治县', '云南,临沧,耿马', '99.395366', '23.529249', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3099, 633898, 2, 632971, '530927000000', '沧源佤族自治县', '云南,临沧,沧源', '99.246197', '23.146712', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3100, 634007, 2, 634006, '532301000000', '楚雄市', '云南,楚雄,楚雄', '101.545906', '25.032889', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3101, 634176, 2, 634006, '532322000000', '双柏县', '云南,楚雄,双柏', '101.641937', '24.688875', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3102, 634269, 2, 634006, '532323000000', '牟定县', '云南,楚雄,牟定', '101.546566', '25.313122', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3103, 634366, 2, 634006, '532324000000', '南华县', '云南,楚雄,南华', '101.273577', '25.192293', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3104, 634505, 2, 634006, '532325000000', '姚安县', '云南,楚雄,姚安', '101.241728', '25.504173', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3105, 634592, 2, 634006, '532326000000', '大姚县', '云南,楚雄,大姚', '101.336617', '25.729513', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3106, 634734, 2, 634006, '532327000000', '永仁县', '云南,楚雄,永仁', '101.666133', '26.049464', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3107, 634805, 2, 634006, '532328000000', '元谋县', '云南,楚雄,元谋', '101.874520', '25.704338', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3108, 634894, 2, 634006, '532329000000', '武定县', '云南,楚雄,武定', '102.404338', '25.530389', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3109, 635039, 2, 634006, '532331000000', '禄丰县', '云南,楚雄,禄丰', '102.079027', '25.150111', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3110, 635220, 2, 635219, '532501000000', '个旧市', '云南,红河,个旧', '103.160034', '23.359121', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3111, 635347, 2, 635219, '532502000000', '开远市', '云南,红河,开远', '103.267143', '23.714316', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3112, 635435, 2, 635219, '532503000000', '蒙自市', '云南,红河,蒙自', '103.364905', '23.396201', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3113, 635548, 2, 635219, '532504000000', '弥勒市', '云南,红河,弥勒', '103.414874', '24.411912', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3114, 635698, 2, 635219, '532523000000', '屏边苗族自治县', '云南,红河,屏边', '103.687612', '22.983560', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3115, 635786, 2, 635219, '532524000000', '建水县', '云南,红河,建水', '102.826557', '23.634700', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3116, 635955, 2, 635219, '532525000000', '石屏县', '云南,红河,石屏', '102.494984', '23.705936', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3117, 636080, 2, 635219, '532527000000', '泸西县', '云南,红河,泸西', '103.766196', '24.532025', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3118, 636176, 2, 635219, '532528000000', '元阳县', '云南,红河,元阳', '102.835223', '23.219932', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3119, 636329, 2, 635219, '532529000000', '红河县', '云南,红河,红河', '102.420600', '23.369161', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3120, 636434, 2, 635219, '532530000000', '金平苗族瑶族傣族自治县', '云南,红河,金平', '103.226448', '22.779543', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3121, 636546, 2, 635219, '532531000000', '绿春县', '云南,红河,绿春', '102.392463', '22.993718', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3122, 636647, 2, 635219, '532532000000', '河口瑶族自治县', '云南,红河,河口', '103.960560', '22.509593', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3123, 636689, 2, 636688, '532601000000', '文山市', '云南,文山,文山', '104.232510', '23.386306', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3124, 636850, 2, 636688, '532622000000', '砚山县', '云南,文山,砚山', '104.337244', '23.605740', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3125, 636970, 2, 636688, '532623000000', '西畴县', '云南,文山,西畴', '104.672597', '23.437782', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3126, 637052, 2, 636688, '532624000000', '麻栗坡县', '云南,文山,麻栗坡', '104.702799', '23.125714', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3127, 637166, 2, 636688, '532625000000', '马关县', '云南,文山,马关', '104.394158', '23.012915', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3128, 637312, 2, 636688, '532626000000', '丘北县', '云南,文山,丘北', '104.195820', '24.041919', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3129, 637426, 2, 636688, '532627000000', '广南县', '云南,文山,广南', '105.054981', '24.045941', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3130, 637619, 2, 636688, '532628000000', '富宁县', '云南,文山,富宁', '105.630999', '23.625283', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3131, 637779, 2, 637778, '532801000000', '景洪市', '云南,西双版纳,景洪', '100.771679', '22.000143', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3132, 637910, 2, 637778, '532822000000', '勐海县', '云南,西双版纳,勐海', '100.452548', '21.957354', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3133, 638015, 2, 637778, '532823000000', '勐腊县', '云南,西双版纳,勐腊', '101.564636', '21.459233', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3134, 638093, 2, 638092, '532901000000', '大理市', '云南,大理,大理', '100.241369', '25.593067', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3135, 638249, 2, 638092, '532922000000', '漾濞彝族自治县', '云南,大理,漾濞', '99.958015', '25.670148', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3136, 638325, 2, 638092, '532923000000', '祥云县', '云南,大理,祥云', '100.550946', '25.483850', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3137, 638475, 2, 638092, '532924000000', '宾川县', '云南,大理,宾川', '100.575412', '25.827182', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3138, 638576, 2, 638092, '532925000000', '弥渡县', '云南,大理,弥渡', '100.490991', '25.343804', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3139, 638674, 2, 638092, '532926000000', '南涧彝族自治县', '云南,大理,南涧', '100.509036', '25.043510', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3140, 638764, 2, 638092, '532927000000', '巍山彝族回族自治县', '云南,大理,巍山', '100.307175', '25.227212', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3141, 638858, 2, 638092, '532928000000', '永平县', '云南,大理,永平', '99.541236', '25.464681', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3142, 638941, 2, 638092, '532929000000', '云龙县', '云南,大理,云龙', '99.371121', '25.885596', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3143, 639039, 2, 638092, '532930000000', '洱源县', '云南,大理,洱源', '99.951054', '26.111160', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3144, 639139, 2, 638092, '532931000000', '剑川县', '云南,大理,剑川', '99.905559', '26.537033', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3145, 639241, 2, 638092, '532932000000', '鹤庆县', '云南,大理,鹤庆', '100.176498', '26.560231', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3146, 639369, 2, 639368, '533102000000', '瑞丽市', '云南,德宏,瑞丽', '97.855477', '24.017836', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3147, 639416, 2, 639368, '533103000000', '芒市', '云南,德宏,芒市', '98.588086', '24.433690', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3148, 639524, 2, 639368, '533122000000', '梁河县', '云南,德宏,梁河', '98.296657', '24.804232', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3149, 639600, 2, 639368, '533123000000', '盈江县', '云南,德宏,盈江', '97.931955', '24.705211', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3150, 639719, 2, 639368, '533124000000', '陇川县', '云南,德宏,陇川', '97.792105', '24.182965', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3151, 639803, 2, 639802, '533301000000', '泸水市', '云南,怒江,泸水', '98.853097', '25.852547', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3152, 639889, 2, 639802, '533323000000', '福贡县', '云南,怒江,福贡', '98.869132', '26.901832', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3153, 639956, 2, 639802, '533324000000', '贡山独龙族怒族自治县', '云南,怒江,贡山', '98.853097', '25.852547', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3154, 639990, 2, 639802, '533325000000', '兰坪白族普米族自治县', '云南,怒江,兰坪', '99.416677', '26.453571', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3155, 640108, 2, 640107, '533401000000', '香格里拉市', '云南,迪庆,香格里拉', '99.700836', '27.829743', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3156, 640184, 2, 640107, '533422000000', '德钦县', '云南,迪庆,德钦', '98.911561', '28.486162', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3157, 640239, 2, 640107, '533423000000', '维西傈僳族自治县', '云南,迪庆,维西', '99.287173', '27.177162', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3158, 640334, 2, 640333, '540101000000', '市辖区', '西藏,拉萨', '91.140856', '29.645554', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3159, 640335, 2, 640333, '540102000000', '城关区', '西藏,拉萨,城关', '91.140856', '29.645554', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3160, 640399, 2, 640333, '540103000000', '堆龙德庆区', '西藏,拉萨,堆龙德庆', '91.140856', '29.645554', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3161, 640441, 2, 640333, '540121000000', '林周县', '西藏,拉萨,林周', '91.140856', '29.645554', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3162, 640497, 2, 640333, '540122000000', '当雄县', '西藏,拉萨,当雄', '91.140856', '29.645554', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3163, 640534, 2, 640333, '540123000000', '尼木县', '西藏,拉萨,尼木', '91.140856', '29.645554', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3164, 640575, 2, 640333, '540124000000', '曲水县', '西藏,拉萨,曲水', '91.140856', '29.645554', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3165, 640599, 2, 640333, '540126000000', '达孜县', '西藏,拉萨,达孜', '91.140856', '29.645554', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3166, 640626, 2, 640333, '540127000000', '墨竹工卡县', '西藏,拉萨,墨竹工卡', '91.140856', '29.645554', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3167, 640676, 2, 640675, '540202000000', '桑珠孜区', '西藏,日喀则,桑珠孜', '88.887270', '29.270389', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3168, 640865, 2, 640675, '540221000000', '南木林县', '西藏,日喀则,南木林', '89.099243', '29.682331', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3169, 641029, 2, 640675, '540222000000', '江孜县', '西藏,日喀则,江孜', '89.605574', '28.911659', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3170, 641204, 2, 640675, '540223000000', '定日县', '西藏,日喀则,定日', '87.126120', '28.658743', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3171, 641393, 2, 640675, '540224000000', '萨迦县', '西藏,日喀则,萨迦', '88.021674', '28.899664', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3172, 641512, 2, 640675, '540225000000', '拉孜县', '西藏,日喀则,拉孜', '87.637041', '29.081660', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3173, 641622, 2, 640675, '540226000000', '昂仁县', '西藏,日喀则,昂仁', '87.236051', '29.294802', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3174, 641825, 2, 640675, '540227000000', '谢通门县', '西藏,日喀则,谢通门', '88.261620', '29.432641', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3175, 641940, 2, 640675, '540228000000', '白朗县', '西藏,日喀则,白朗', '89.261977', '29.107688', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3176, 642063, 2, 640675, '540229000000', '仁布县', '西藏,日喀则,仁布', '89.841984', '29.230933', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3177, 642146, 2, 640675, '540230000000', '康马县', '西藏,日喀则,康马', '89.681663', '28.555627', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3178, 642203, 2, 640675, '540231000000', '定结县', '西藏,日喀则,定结', '87.765872', '28.364159', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3179, 642284, 2, 640675, '540232000000', '仲巴县', '西藏,日喀则,仲巴', '84.031530', '29.770279', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3180, 642356, 2, 640675, '540233000000', '亚东县', '西藏,日喀则,亚东', '88.907094', '27.484806', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3181, 642389, 2, 640675, '540234000000', '吉隆县', '西藏,日喀则,吉隆', '85.297535', '28.852394', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3182, 642437, 2, 640675, '540235000000', '聂拉木县', '西藏,日喀则,聂拉木', '85.982237', '28.155186', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3183, 642489, 2, 640675, '540236000000', '萨嘎县', '西藏,日喀则,萨嘎', '85.232941', '29.328818', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3184, 642536, 2, 640675, '540237000000', '岗巴县', '西藏,日喀则,岗巴', '88.520031', '28.274601', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3185, 642572, 2, 642571, '540302000000', '卡若区', '西藏,昌都,卡若', '97.180437', '31.138507', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3186, 642755, 2, 642571, '540321000000', '江达县', '西藏,昌都,江达', '98.218430', '31.499202', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3187, 642864, 2, 642571, '540322000000', '贡觉县', '西藏,昌都,贡觉', '98.270970', '30.860099', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3188, 643026, 2, 642571, '540323000000', '类乌齐县', '西藏,昌都,类乌齐', '96.600246', '31.211601', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3189, 643119, 2, 642571, '540324000000', '丁青县', '西藏,昌都,丁青', '95.595761', '31.412405', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3190, 643197, 2, 642571, '540325000000', '察雅县', '西藏,昌都,察雅', '97.568752', '30.653943', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3191, 643349, 2, 642571, '540326000000', '八宿县', '西藏,昌都,八宿', '96.917836', '30.053209', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3192, 643474, 2, 642571, '540327000000', '左贡县', '西藏,昌都,左贡', '97.841022', '29.671069', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3193, 643613, 2, 642571, '540328000000', '芒康县', '西藏,昌都,芒康', '98.593113', '29.679908', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3194, 643691, 2, 642571, '540329000000', '洛隆县', '西藏,昌都,洛隆', '95.824567', '30.741571', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3195, 643769, 2, 642571, '540330000000', '边坝县', '西藏,昌都,边坝', '94.707800', '30.933652', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3196, 643864, 2, 643863, '540402000000', '巴宜区', '西藏,林芝,巴宜', '94.360994', '29.653727', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3197, 643943, 2, 643863, '540421000000', '工布江达县', '西藏,林芝,工布江达', '93.246077', '29.885280', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3198, 644033, 2, 643863, '540422000000', '米林县', '西藏,林芝,米林', '94.213486', '29.215833', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3199, 644109, 2, 643863, '540423000000', '墨脱县', '西藏,林芝,墨脱', '95.332241', '29.325734', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3200, 644164, 2, 643863, '540424000000', '波密县', '西藏,林芝,波密', '95.768158', '29.858766', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3201, 644260, 2, 643863, '540425000000', '察隅县', '西藏,林芝,察隅', '94.361490', '29.649128', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3202, 644364, 2, 643863, '540426000000', '朗县', '西藏,林芝,朗县', '93.074702', '29.046337', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3203, 644424, 2, 644423, '540501000000', '市辖区', '西藏,山南', '91.117212', '29.646922', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3204, 644425, 2, 644423, '540502000000', '乃东区', '西藏,山南,乃东', '91.761539', '29.224904', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3205, 644480, 2, 644423, '540521000000', '扎囊县', '西藏,山南,扎囊', '91.337250', '29.245114', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3206, 644548, 2, 644423, '540522000000', '贡嘎县', '西藏,山南,贡嘎', '90.984140', '29.289455', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3207, 644600, 2, 644423, '540523000000', '桑日县', '西藏,山南,桑日', '92.015818', '29.259189', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3208, 644647, 2, 644423, '540524000000', '琼结县', '西藏,山南,琼结', '91.683881', '29.024625', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3209, 644672, 2, 644423, '540525000000', '曲松县', '西藏,山南,曲松', '92.203739', '29.062826', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3210, 644699, 2, 644423, '540526000000', '措美县', '西藏,山南,措美', '91.433509', '28.438202', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3211, 644720, 2, 644423, '540527000000', '洛扎县', '西藏,山南,洛扎', '90.859992', '28.385713', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3212, 644755, 2, 644423, '540528000000', '加查县', '西藏,山南,加查', '92.593993', '29.140290', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3213, 644840, 2, 644423, '540529000000', '隆子县', '西藏,山南,隆子', '92.463305', '28.408552', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3214, 644932, 2, 644423, '540530000000', '错那县', '西藏,山南,错那', '91.960139', '27.991716', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3215, 644967, 2, 644423, '540531000000', '浪卡子县', '西藏,山南,浪卡子', '90.397977', '28.968031', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3216, 645077, 2, 645076, '542421000000', '那曲县', '西藏,那曲,那曲', '92.053500', '31.469643', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3217, 645231, 2, 645076, '542422000000', '嘉黎县', '西藏,那曲,嘉黎', '93.232528', '30.640815', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3218, 645364, 2, 645076, '542423000000', '比如县', '西藏,那曲,比如', '93.679639', '31.480250', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3219, 645550, 2, 645076, '542424000000', '聂荣县', '西藏,那曲,聂荣', '92.303346', '32.107772', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3220, 645703, 2, 645076, '542425000000', '安多县', '西藏,那曲,安多', '91.682330', '32.265176', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3221, 645791, 2, 645076, '542426000000', '申扎县', '西藏,那曲,申扎', '88.709853', '30.930505', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3222, 645862, 2, 645076, '542427000000', '索县', '西藏,那曲,索县', '93.785631', '31.886918', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3223, 645997, 2, 645076, '542428000000', '班戈县', '西藏,那曲,班戈', '90.009957', '31.392411', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3224, 646094, 2, 645076, '542429000000', '巴青县', '西藏,那曲,巴青', '94.053463', '31.918563', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3225, 646261, 2, 645076, '542430000000', '尼玛县', '西藏,那曲,尼玛', '87.236772', '31.784701', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3226, 646353, 2, 645076, '542431000000', '双湖县', '西藏,那曲,双湖', '88.837642', '33.188515', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3227, 646393, 2, 646392, '542521000000', '普兰县', '西藏,阿里,普兰', '81.176237', '30.294402', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3228, 646407, 2, 646392, '542522000000', '札达县', '西藏,阿里,札达', '79.802706', '31.479217', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3229, 646431, 2, 646392, '542523000000', '噶尔县', '西藏,阿里,噶尔', '80.096419', '32.491488', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3230, 646451, 2, 646392, '542524000000', '日土县', '西藏,阿里,日土', '79.732427', '33.381359', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3231, 646470, 2, 646392, '542525000000', '革吉县', '西藏,阿里,革吉', '81.145433', '32.387233', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3232, 646495, 2, 646392, '542526000000', '改则县', '西藏,阿里,改则', '84.062590', '32.302713', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3233, 646551, 2, 646392, '542527000000', '措勤县', '西藏,阿里,措勤', '85.159494', '31.016769', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3234, 646580, 2, 646579, '610101000000', '市辖区', '陕西,西安', '108.940174', '34.341568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3235, 646581, 2, 646579, '610102000000', '新城区', '陕西,西安,新城', '108.940174', '34.341568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3236, 646694, 2, 646579, '610103000000', '碑林区', '陕西,西安,碑林', '108.940174', '34.341568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3237, 646800, 2, 646579, '610104000000', '莲湖区', '陕西,西安,莲湖', '108.940174', '34.341568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3238, 646944, 2, 646579, '610111000000', '灞桥区', '陕西,西安,灞桥', '108.940174', '34.341568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3239, 647214, 2, 646579, '610112000000', '未央区', '陕西,西安,未央', '108.940174', '34.341568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3240, 647486, 2, 646579, '610113000000', '雁塔区', '陕西,西安,雁塔', '108.940174', '34.341568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3241, 647710, 2, 646579, '610114000000', '阎良区', '陕西,西安,阎良', '108.940174', '34.341568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3242, 647821, 2, 646579, '610115000000', '临潼区', '陕西,西安,临潼', '108.940174', '34.341568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3243, 648113, 2, 646579, '610116000000', '长安区', '陕西,西安,长安', '108.940174', '34.341568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3244, 648645, 2, 646579, '610117000000', '高陵区', '陕西,西安,高陵', '108.940174', '34.341568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3245, 648756, 2, 646579, '610122000000', '蓝田县', '陕西,西安,蓝田', '108.940174', '34.341568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3246, 649123, 2, 646579, '610124000000', '周至县', '陕西,西安,周至', '108.940174', '34.341568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3247, 649424, 2, 646579, '610125000000', '户县', '陕西,西安,户县', '108.940174', '34.341568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3248, 649980, 2, 649979, '610201000000', '市辖区', '陕西,铜川', '108.945233', '34.896756', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3249, 649981, 2, 649979, '610202000000', '王益区', '陕西,铜川,王益', '109.075578', '35.068964', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3250, 650048, 2, 649979, '610203000000', '印台区', '陕西,铜川,印台', '109.099975', '35.114492', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3251, 650189, 2, 649979, '610204000000', '耀州区', '陕西,铜川,耀州', '108.980514', '34.908916', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3252, 650386, 2, 649979, '610222000000', '宜君县', '陕西,铜川,宜君', '109.116932', '35.398577', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3253, 650576, 2, 650575, '610301000000', '市辖区', '陕西,宝鸡', '107.237974', '34.361979', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3254, 650577, 2, 650575, '610302000000', '渭滨区', '陕西,宝鸡,渭滨', '107.149968', '34.371184', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3255, 650747, 2, 650575, '610303000000', '金台区', '陕西,宝鸡,金台', '107.146806', '34.376069', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3256, 650913, 2, 650575, '610304000000', '陈仓区', '陕西,宝鸡,陈仓', '107.387436', '34.354456', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3257, 651278, 2, 650575, '610322000000', '凤翔县', '陕西,宝鸡,凤翔', '107.400737', '34.521218', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3258, 651528, 2, 650575, '610323000000', '岐山县', '陕西,宝鸡,岐山', '107.621054', '34.443459', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3259, 651697, 2, 650575, '610324000000', '扶风县', '陕西,宝鸡,扶风', '107.900219', '34.375411', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3260, 651872, 2, 650575, '610326000000', '眉县', '陕西,宝鸡,眉县', '107.749767', '34.274247', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3261, 652014, 2, 650575, '610327000000', '陇县', '陕西,宝鸡,陇县', '106.864397', '34.893050', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3262, 652186, 2, 650575, '610328000000', '千阳县', '陕西,宝鸡,千阳', '107.132442', '34.642381', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3263, 652294, 2, 650575, '610329000000', '麟游县', '陕西,宝鸡,麟游', '107.793525', '34.677902', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3264, 652387, 2, 650575, '610330000000', '凤县', '陕西,宝鸡,凤县', '106.515756', '33.908469', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3265, 652505, 2, 650575, '610331000000', '太白县', '陕西,宝鸡,太白', '107.319116', '34.058401', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3266, 652582, 2, 652581, '610401000000', '市辖区', '陕西,咸阳', '108.708991', '34.329605', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3267, 652583, 2, 652581, '610402000000', '秦都区', '陕西,咸阳,秦都', '108.706272', '34.329567', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3268, 652779, 2, 652581, '610403000000', '杨陵区', '陕西,咸阳,杨陵', '108.084732', '34.272117', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3269, 652863, 2, 652581, '610404000000', '渭城区', '陕西,咸阳,渭城', '108.737213', '34.361988', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3270, 653042, 2, 652581, '610422000000', '三原县', '陕西,咸阳,三原', '108.940509', '34.617382', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3271, 653234, 2, 652581, '610423000000', '泾阳县', '陕西,咸阳,泾阳', '108.842623', '34.527114', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3272, 653470, 2, 652581, '610424000000', '乾县', '陕西,咸阳,乾县', '108.239473', '34.527551', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3273, 653679, 2, 652581, '610425000000', '礼泉县', '陕西,咸阳,礼泉', '108.425018', '34.481764', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3274, 653918, 2, 652581, '610426000000', '永寿县', '陕西,咸阳,永寿', '108.142311', '34.691979', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3275, 654101, 2, 652581, '610427000000', '彬县', '陕西,咸阳,彬县', '108.077658', '35.043911', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3276, 654369, 2, 652581, '610428000000', '长武县', '陕西,咸阳,长武', '107.798757', '35.205886', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3277, 654525, 2, 652581, '610429000000', '旬邑县', '陕西,咸阳,旬邑', '108.333986', '35.111978', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3278, 654661, 2, 652581, '610430000000', '淳化县', '陕西,咸阳,淳化', '108.580681', '34.799250', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3279, 654876, 2, 652581, '610431000000', '武功县', '陕西,咸阳,武功', '108.200398', '34.260204', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3280, 655081, 2, 652581, '610481000000', '兴平市', '陕西,咸阳,兴平', '108.490475', '34.299221', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3281, 655296, 2, 655295, '610501000000', '市辖区', '陕西,渭南', '109.509786', '34.499995', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3282, 655297, 2, 655295, '610502000000', '临渭区', '陕西,渭南,临渭', '109.492726', '34.498192', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3283, 655724, 2, 655295, '610503000000', '华州区', '陕西,渭南,华州', '109.761417', '34.511949', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3284, 655885, 2, 655295, '610522000000', '潼关县', '陕西,渭南,潼关', '110.246350', '34.544296', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3285, 655919, 2, 655295, '610523000000', '大荔县', '陕西,渭南,大荔', '109.941658', '34.797184', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3286, 656260, 2, 655295, '610524000000', '合阳县', '陕西,渭南,合阳', '110.149466', '35.237986', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3287, 656494, 2, 655295, '610525000000', '澄城县', '陕西,渭南,澄城', '109.932350', '35.190245', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3288, 656682, 2, 655295, '610526000000', '蒲城县', '陕西,渭南,蒲城', '109.586506', '34.955855', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3289, 656988, 2, 655295, '610527000000', '白水县', '陕西,渭南,白水', '109.590671', '35.177452', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3290, 657132, 2, 655295, '610528000000', '富平县', '陕西,渭南,富平', '109.180331', '34.751086', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3291, 657425, 2, 655295, '610581000000', '韩城市', '陕西,渭南,韩城', '110.442847', '35.476788', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3292, 657706, 2, 655295, '610582000000', '华阴市', '陕西,渭南,华阴', '110.092301', '34.566096', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3293, 657849, 2, 657848, '610601000000', '市辖区', '陕西,延安', '109.489727', '36.585455', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3294, 657850, 2, 657848, '610602000000', '宝塔区', '陕西,延安,宝塔', '109.493106', '36.591266', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3295, 658235, 2, 657848, '610603000000', '安塞区', '陕西,延安,安塞', '109.489727', '36.585455', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3296, 658462, 2, 657848, '610621000000', '延长县', '陕西,延安,延长', '110.012334', '36.579313', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3297, 658765, 2, 657848, '610622000000', '延川县', '陕西,延安,延川', '110.193514', '36.878117', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3298, 658951, 2, 657848, '610623000000', '子长县', '陕西,延安,子长', '109.675234', '37.142668', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3299, 659327, 2, 657848, '610625000000', '志丹县', '陕西,延安,志丹', '108.768432', '36.822194', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3300, 659450, 2, 657848, '610626000000', '吴起县', '陕西,延安,吴起', '108.175933', '36.927216', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3301, 659554, 2, 657848, '610627000000', '甘泉县', '陕西,延安,甘泉', '109.351020', '36.276526', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3302, 659632, 2, 657848, '610628000000', '富县', '陕西,延安,富县', '109.379711', '35.988010', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3303, 659777, 2, 657848, '610629000000', '洛川县', '陕西,延安,洛川', '109.432369', '35.761975', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3304, 660160, 2, 657848, '610630000000', '宜川县', '陕西,延安,宜川', '110.168963', '36.050178', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3305, 660375, 2, 657848, '610631000000', '黄龙县', '陕西,延安,黄龙', '109.840373', '35.584467', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3306, 660433, 2, 657848, '610632000000', '黄陵县', '陕西,延安,黄陵', '109.262961', '35.579428', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3307, 660644, 2, 660643, '610701000000', '市辖区', '陕西,汉中', '107.023323', '33.067480', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3308, 660645, 2, 660643, '610702000000', '汉台区', '陕西,汉中,汉台', '107.031856', '33.067771', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3309, 660909, 2, 660643, '610721000000', '南郑县', '陕西,汉中,南郑', '106.936230', '32.999334', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3310, 661244, 2, 660643, '610722000000', '城固县', '陕西,汉中,城固', '107.333930', '33.157131', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3311, 661535, 2, 660643, '610723000000', '洋县', '陕西,汉中,洋县', '107.545837', '33.222739', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3312, 661839, 2, 660643, '610724000000', '西乡县', '陕西,汉中,西乡', '107.766614', '32.983101', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3313, 662072, 2, 660643, '610725000000', '勉县', '陕西,汉中,勉县', '106.673221', '33.153553', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3314, 662289, 2, 660643, '610726000000', '宁强县', '陕西,汉中,宁强', '106.257171', '32.829694', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3315, 662521, 2, 660643, '610727000000', '略阳县', '陕西,汉中,略阳', '106.156718', '33.327281', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3316, 662704, 2, 660643, '610728000000', '镇巴县', '陕西,汉中,镇巴', '107.895035', '32.536704', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3317, 662908, 2, 660643, '610729000000', '留坝县', '陕西,汉中,留坝', '106.920808', '33.617571', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3318, 662993, 2, 660643, '610730000000', '佛坪县', '陕西,汉中,佛坪', '107.990539', '33.524359', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3319, 663047, 2, 663046, '610801000000', '市辖区', '陕西,榆林', '109.734589', '38.285390', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3320, 663048, 2, 663046, '610802000000', '榆阳区', '陕西,榆林,榆阳', '109.720309', '38.277029', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3321, 663445, 2, 663046, '610803000000', '横山区', '陕西,榆林,横山', '109.294346', '37.962209', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3322, 663827, 2, 663046, '610821000000', '神木县', '陕西,榆林,神木', '110.498868', '38.842498', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3323, 664184, 2, 663046, '610822000000', '府谷县', '陕西,榆林,府谷', '111.067366', '39.028116', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3324, 664441, 2, 663046, '610824000000', '靖边县', '陕西,榆林,靖边', '108.793988', '37.599438', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3325, 664686, 2, 663046, '610825000000', '定边县', '陕西,榆林,定边', '107.601267', '37.594612', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3326, 665047, 2, 663046, '610826000000', '绥德县', '陕西,榆林,绥德', '110.263362', '37.502940', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3327, 665732, 2, 663046, '610827000000', '米脂县', '陕西,榆林,米脂', '110.183754', '37.755417', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3328, 665953, 2, 663046, '610828000000', '佳县', '陕西,榆林,佳县', '110.491345', '38.019511', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3329, 666627, 2, 663046, '610829000000', '吴堡县', '陕西,榆林,吴堡', '110.739673', '37.452068', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3330, 666741, 2, 663046, '610830000000', '清涧县', '陕西,榆林,清涧', '110.121209', '37.088878', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3331, 667106, 2, 663046, '610831000000', '子洲县', '陕西,榆林,子洲', '110.035250', '37.610683', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3332, 667682, 2, 667681, '610901000000', '市辖区', '陕西,安康', '109.029022', '32.684714', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3333, 667683, 2, 667681, '610902000000', '汉滨区', '陕西,安康,汉滨', '109.026836', '32.695173', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3334, 668237, 2, 667681, '610921000000', '汉阴县', '陕西,安康,汉阴', '108.508745', '32.893026', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3335, 668397, 2, 667681, '610922000000', '石泉县', '陕西,安康,石泉', '108.247887', '33.038408', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3336, 668570, 2, 667681, '610923000000', '宁陕县', '陕西,安康,宁陕', '108.314283', '33.310527', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3337, 668662, 2, 667681, '610924000000', '紫阳县', '陕西,安康,紫阳', '108.534229', '32.520246', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3338, 668877, 2, 667681, '610925000000', '岚皋县', '陕西,安康,岚皋', '108.902049', '32.307001', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3339, 669026, 2, 667681, '610926000000', '平利县', '陕西,安康,平利', '109.361864', '32.388854', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3340, 669181, 2, 667681, '610927000000', '镇坪县', '陕西,安康,镇坪', '109.526873', '31.883672', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3341, 669251, 2, 667681, '610928000000', '旬阳县', '陕西,安康,旬阳', '109.365265', '32.834086', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3342, 669578, 2, 667681, '610929000000', '白河县', '陕西,安康,白河', '110.112629', '32.809026', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3343, 669708, 2, 669707, '611001000000', '市辖区', '陕西,商洛', '109.940477', '33.870422', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3344, 669709, 2, 669707, '611002000000', '商州区', '陕西,商洛,商州', '109.941241', '33.862703', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3345, 670030, 2, 669707, '611021000000', '洛南县', '陕西,商洛,洛南', '110.148509', '34.090838', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3346, 670291, 2, 669707, '611022000000', '丹凤县', '陕西,商洛,丹凤', '110.327331', '33.695783', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3347, 670459, 2, 669707, '611023000000', '商南县', '陕西,商洛,商南', '110.881807', '33.530995', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3348, 670594, 2, 669707, '611024000000', '山阳县', '陕西,商洛,山阳', '109.882290', '33.532172', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3349, 670852, 2, 669707, '611025000000', '镇安县', '陕西,商洛,镇安', '109.152893', '33.423357', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3350, 671028, 2, 669707, '611026000000', '柞水县', '陕西,商洛,柞水', '109.114207', '33.686110', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3351, 671121, 2, 671120, '620101000000', '市辖区', '甘肃,兰州', '103.834303', '36.061089', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3352, 671122, 2, 671120, '620102000000', '城关区', '甘肃,兰州,城关', '103.834303', '36.061089', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3353, 671324, 2, 671120, '620103000000', '七里河区', '甘肃,兰州,七里河', '103.834303', '36.061089', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3354, 671477, 2, 671120, '620104000000', '西固区', '甘肃,兰州,西固', '103.834303', '36.061089', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3355, 671606, 2, 671120, '620105000000', '安宁区', '甘肃,兰州,安宁', '103.834303', '36.061089', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3356, 671675, 2, 671120, '620111000000', '红古区', '甘肃,兰州,红古', '103.834303', '36.061089', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3357, 671740, 2, 671120, '620121000000', '永登县', '甘肃,兰州,永登', '103.834303', '36.061089', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3358, 671967, 2, 671120, '620122000000', '皋兰县', '甘肃,兰州,皋兰', '103.834303', '36.061089', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3359, 672034, 2, 671120, '620123000000', '榆中县', '甘肃,兰州,榆中', '103.834303', '36.061089', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3360, 672331, 2, 672330, '620201000000', '市辖区', '甘肃,嘉峪关', '98.289152', '39.773130', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3361, 672386, 2, 672385, '620301000000', '市辖区', '甘肃,金昌', '102.188043', '38.520089', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3362, 672387, 2, 672385, '620302000000', '金川区', '甘肃,金昌,金川', '102.194089', '38.521085', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3363, 672439, 2, 672385, '620321000000', '永昌县', '甘肃,金昌,永昌', '101.984649', '38.243170', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3364, 672578, 2, 672577, '620401000000', '市辖区', '甘肃,白银', '104.138559', '36.544756', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3365, 672579, 2, 672577, '620402000000', '白银区', '甘肃,白银,白银', '104.148556', '36.535398', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3366, 672670, 2, 672577, '620403000000', '平川区', '甘肃,白银,平川', '104.825208', '36.728304', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3367, 672773, 2, 672577, '620421000000', '靖远县', '甘肃,白银,靖远', '104.676774', '36.571366', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3368, 672978, 2, 672577, '620422000000', '会宁县', '甘肃,白银,会宁', '105.053358', '35.692823', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3369, 673307, 2, 672577, '620423000000', '景泰县', '甘肃,白银,景泰', '104.063091', '37.183804', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3370, 673464, 2, 673463, '620501000000', '市辖区', '甘肃,天水', '105.724947', '34.580863', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3371, 673465, 2, 673463, '620502000000', '秦州区', '甘肃,天水,秦州', '105.724199', '34.580892', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3372, 673952, 2, 673463, '620503000000', '麦积区', '甘肃,天水,麦积', '105.889557', '34.570384', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3373, 674399, 2, 673463, '620521000000', '清水县', '甘肃,天水,清水', '106.137293', '34.749865', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3374, 674684, 2, 673463, '620522000000', '秦安县', '甘肃,天水,秦安', '105.674983', '34.858916', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3375, 675138, 2, 673463, '620523000000', '甘谷县', '甘肃,天水,甘谷', '105.340864', '34.745465', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3376, 675568, 2, 673463, '620524000000', '武山县', '甘肃,天水,武山', '104.890782', '34.721380', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3377, 675938, 2, 673463, '620525000000', '张家川回族自治县', '甘肃,天水,张家川', '106.204518', '34.988037', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3378, 676216, 2, 676215, '620601000000', '市辖区', '甘肃,武威', '102.638011', '37.928264', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3379, 676217, 2, 676215, '620602000000', '凉州区', '甘肃,武威,凉州', '102.642184', '37.928225', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3380, 676751, 2, 676215, '620621000000', '民勤县', '甘肃,武威,民勤', '103.093792', '38.624350', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3381, 677055, 2, 676215, '620622000000', '古浪县', '甘肃,武威,古浪', '102.897533', '37.470120', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3382, 677344, 2, 676215, '620623000000', '天祝藏族自治县', '甘肃,武威,天祝', '103.141757', '36.971740', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3383, 677569, 2, 677568, '620701000000', '市辖区', '甘肃,张掖', '100.449818', '38.925875', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3384, 677570, 2, 677568, '620702000000', '甘州区', '甘肃,张掖,甘州', '100.478058', '38.929763', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3385, 677865, 2, 677568, '620721000000', '肃南裕固族自治县', '甘肃,张掖,肃南', '99.615601', '38.836932', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3386, 677983, 2, 677568, '620722000000', '民乐县', '甘肃,张掖,民乐', '100.812860', '38.430794', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3387, 678174, 2, 677568, '620723000000', '临泽县', '甘肃,张掖,临泽', '100.164445', '39.152642', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3388, 678270, 2, 677568, '620724000000', '高台县', '甘肃,张掖,高台', '99.819317', '39.377733', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3389, 678427, 2, 677568, '620725000000', '山丹县', '甘肃,张掖,山丹', '101.088575', '38.784758', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3390, 678561, 2, 678560, '620801000000', '市辖区', '甘肃,平凉', '106.665240', '35.543051', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3391, 678562, 2, 678560, '620802000000', '崆峒区', '甘肃,平凉,崆峒', '106.674767', '35.542491', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3392, 678825, 2, 678560, '620821000000', '泾川县', '甘肃,平凉,泾川', '107.367850', '35.332666', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3393, 679066, 2, 678560, '620822000000', '灵台县', '甘肃,平凉,灵台', '107.621124', '35.065399', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3394, 679271, 2, 678560, '620823000000', '崇信县', '甘肃,平凉,崇信', '107.035409', '35.302123', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3395, 679368, 2, 678560, '620824000000', '华亭县', '甘肃,平凉,华亭', '106.653158', '35.218292', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3396, 679507, 2, 678560, '620825000000', '庄浪县', '甘肃,平凉,庄浪', '106.036687', '35.202385', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3397, 679825, 2, 678560, '620826000000', '静宁县', '甘肃,平凉,静宁', '105.732556', '35.521977', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3398, 680192, 2, 680191, '620901000000', '市辖区', '甘肃,酒泉', '98.494483', '39.732410', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3399, 680193, 2, 680191, '620902000000', '肃州区', '甘肃,酒泉,肃州', '98.507850', '39.745071', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3400, 680365, 2, 680191, '620921000000', '金塔县', '甘肃,酒泉,金塔', '98.903270', '39.983599', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3401, 680478, 2, 680191, '620922000000', '瓜州县', '甘肃,酒泉,瓜州', '95.782306', '40.520545', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3402, 680582, 2, 680191, '620923000000', '肃北蒙古族自治县', '甘肃,酒泉,肃北', '94.876579', '39.512450', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3403, 680615, 2, 680191, '620924000000', '阿克塞哈萨克族自治县', '甘肃,酒泉,阿克塞', '94.340204', '39.633943', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3404, 680634, 2, 680191, '620981000000', '玉门市', '甘肃,酒泉,玉门', '97.045679', '40.291843', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3405, 680736, 2, 680191, '620982000000', '敦煌市', '甘肃,酒泉,敦煌', '94.661967', '40.142128', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3406, 680816, 2, 680815, '621001000000', '市辖区', '甘肃,庆阳', '107.643631', '35.709077', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3407, 680817, 2, 680815, '621002000000', '西峰区', '甘肃,庆阳,西峰', '107.651077', '35.730652', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3408, 680943, 2, 680815, '621021000000', '庆城县', '甘肃,庆阳,庆城', '107.881802', '36.016299', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3409, 681132, 2, 680815, '621022000000', '环县', '甘肃,庆阳,环县', '107.308501', '36.568435', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3410, 681414, 2, 680815, '621023000000', '华池县', '甘肃,庆阳,华池', '107.990035', '36.461355', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3411, 681559, 2, 680815, '621024000000', '合水县', '甘肃,庆阳,合水', '108.019530', '35.819243', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3412, 681665, 2, 680815, '621025000000', '正宁县', '甘肃,庆阳,正宁', '108.359976', '35.491890', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3413, 681784, 2, 680815, '621026000000', '宁县', '甘肃,庆阳,宁县', '107.928369', '35.502177', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3414, 682081, 2, 680815, '621027000000', '镇原县', '甘肃,庆阳,镇原', '107.200832', '35.677462', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3415, 682323, 2, 682322, '621101000000', '市辖区', '甘肃,定西', '104.626282', '35.580662', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3416, 682324, 2, 682322, '621102000000', '安定区', '甘肃,定西,安定', '104.610668', '35.580629', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3417, 682673, 2, 682322, '621121000000', '通渭县', '甘肃,定西,通渭', '105.242061', '35.210831', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3418, 683034, 2, 682322, '621122000000', '陇西县', '甘肃,定西,陇西', '104.634984', '35.003940', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3419, 683278, 2, 682322, '621123000000', '渭源县', '甘肃,定西,渭源', '104.215467', '35.136755', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3420, 683515, 2, 682322, '621124000000', '临洮县', '甘肃,定西,临洮', '103.859565', '35.394989', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3421, 683869, 2, 682322, '621125000000', '漳县', '甘肃,定西,漳县', '104.471572', '34.848444', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3422, 684024, 2, 682322, '621126000000', '岷县', '甘肃,定西,岷县', '104.036880', '34.438076', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3423, 684416, 2, 684415, '621201000000', '市辖区', '甘肃,陇南', '104.921841', '33.400684', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3424, 684417, 2, 684415, '621202000000', '武都区', '甘肃,陇南,武都', '104.926337', '33.392211', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3425, 685162, 2, 684415, '621221000000', '成县', '甘肃,陇南,成县', '105.742203', '33.750477', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3426, 685439, 2, 684415, '621222000000', '文县', '甘肃,陇南,文县', '104.683434', '32.943815', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3427, 685772, 2, 684415, '621223000000', '宕昌县', '甘肃,陇南,宕昌', '104.393385', '34.047261', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3428, 686138, 2, 684415, '621224000000', '康县', '甘肃,陇南,康县', '105.609169', '33.329136', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3429, 686518, 2, 684415, '621225000000', '西和县', '甘肃,陇南,西和', '105.298756', '34.014215', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3430, 686933, 2, 684415, '621226000000', '礼县', '甘肃,陇南,礼县', '105.178640', '34.189345', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3431, 687542, 2, 684415, '621227000000', '徽县', '甘肃,陇南,徽县', '106.087780', '33.768826', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3432, 687781, 2, 684415, '621228000000', '两当县', '甘肃,陇南,两当', '106.304967', '33.908917', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3433, 687917, 2, 687916, '622901000000', '临夏市', '甘肃,临夏,临夏', '103.243021', '35.604376', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3434, 687999, 2, 687916, '622921000000', '临夏县', '甘肃,临夏,临夏', '103.243021', '35.604376', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3435, 688248, 2, 687916, '622922000000', '康乐县', '甘肃,临夏,康乐', '103.708354', '35.370505', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3436, 688417, 2, 687916, '622923000000', '永靖县', '甘肃,临夏,永靖', '103.285854', '35.958306', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3437, 688588, 2, 687916, '622924000000', '广河县', '甘肃,临夏,广河', '103.575834', '35.488052', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3438, 688701, 2, 687916, '622925000000', '和政县', '甘肃,临夏,和政', '103.350997', '35.424603', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3439, 688841, 2, 687916, '622926000000', '东乡族自治县', '甘肃,临夏,东乡族自治县', '103.389346', '35.663752', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3440, 689096, 2, 687916, '622927000000', '积石山保安族东乡族撒拉族自治县', '甘肃,临夏,积石山', '102.875843', '35.717661', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3441, 689266, 2, 689265, '623001000000', '合作市', '甘肃,甘南,合作', '102.910882', '35.000399', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3442, 689327, 2, 689265, '623021000000', '临潭县', '甘肃,甘南,临潭', '103.353919', '34.692747', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3443, 689488, 2, 689265, '623022000000', '卓尼县', '甘肃,甘南,卓尼', '103.507109', '34.589588', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3444, 689610, 2, 689265, '623023000000', '舟曲县', '甘肃,甘南,舟曲', '104.371586', '33.785259', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3445, 689845, 2, 689265, '623024000000', '迭部县', '甘肃,甘南,迭部', '103.221870', '34.055939', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3446, 689913, 2, 689265, '623025000000', '玛曲县', '甘肃,甘南,玛曲', '102.072698', '33.997712', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3447, 689966, 2, 689265, '623026000000', '碌曲县', '甘肃,甘南,碌曲', '102.487327', '34.590944', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3448, 690005, 2, 689265, '623027000000', '夏河县', '甘肃,甘南,夏河', '102.521807', '35.202503', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3449, 690096, 2, 690095, '630101000000', '市辖区', '青海,西宁', '101.778228', '36.617144', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3450, 690097, 2, 690095, '630102000000', '城东区', '青海,西宁,城东', '101.778228', '36.617144', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3451, 690164, 2, 690095, '630103000000', '城中区', '青海,西宁,城中', '101.778228', '36.617144', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3452, 690235, 2, 690095, '630104000000', '城西区', '青海,西宁,城西', '101.778228', '36.617144', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3453, 690283, 2, 690095, '630105000000', '城北区', '青海,西宁,城北', '101.778228', '36.617144', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3454, 690357, 2, 690095, '630121000000', '大通回族土族自治县', '青海,西宁,大通', '101.679987', '36.930717', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3455, 690689, 2, 690095, '630122000000', '湟中县', '青海,西宁,湟中', '101.778228', '36.617144', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3456, 691114, 2, 690095, '630123000000', '湟源县', '青海,西宁,湟源', '101.778228', '36.617144', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3457, 691279, 2, 691278, '630202000000', '乐都区', '青海,海东,乐都', '102.401725', '36.482058', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3458, 691667, 2, 691278, '630203000000', '平安区', '青海,海东,平安', '102.108835', '36.500563', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3459, 691796, 2, 691278, '630222000000', '民和回族土族自治县', '青海,海东,民和', '102.830892', '36.320321', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3460, 692148, 2, 691278, '630223000000', '互助土族自治县', '青海,海东,互助', '101.959271', '36.844249', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3461, 692479, 2, 691278, '630224000000', '化隆回族自治县', '青海,海东,化隆', '102.264143', '36.094908', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3462, 692870, 2, 691278, '630225000000', '循化撒拉族自治县', '青海,海东,循化', '102.485646', '35.848586', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3463, 693041, 2, 693040, '632221000000', '门源回族自治县', '青海,海北,门源', '101.622364', '37.376449', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3464, 693186, 2, 693040, '632222000000', '祁连县', '青海,海北,祁连', '100.253211', '38.177112', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3465, 693243, 2, 693040, '632223000000', '海晏县', '青海,海北,海晏', '100.994430', '36.896467', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3466, 693286, 2, 693040, '632224000000', '刚察县', '青海,海北,刚察', '100.145833', '37.325470', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3467, 693343, 2, 693342, '632321000000', '同仁县', '青海,黄南,同仁', '102.018323', '35.516063', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3468, 693437, 2, 693342, '632322000000', '尖扎县', '青海,黄南,尖扎', '102.031183', '35.938299', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3469, 693541, 2, 693342, '632323000000', '泽库县', '青海,黄南,泽库', '101.466689', '35.035313', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3470, 693623, 2, 693342, '632324000000', '河南蒙古族自治县', '青海,黄南,河南', '102.015248', '35.519548', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3471, 693673, 2, 693672, '632521000000', '共和县', '青海,海南,共和', '100.620031', '36.284107', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3472, 693808, 2, 693672, '632522000000', '同德县', '青海,海南,同德', '100.578052', '35.254791', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3473, 693906, 2, 693672, '632523000000', '贵德县', '青海,海南,贵德', '101.433298', '36.040150', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3474, 694046, 2, 693672, '632524000000', '兴海县', '青海,海南,兴海', '99.987966', '35.588613', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3475, 694121, 2, 693672, '632525000000', '贵南县', '青海,海南,贵南', '100.747503', '35.586715', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3476, 694221, 2, 694220, '632621000000', '玛沁县', '青海,果洛,玛沁', '100.238888', '34.477433', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3477, 694272, 2, 694220, '632622000000', '班玛县', '青海,果洛,班玛', '100.737138', '32.932723', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3478, 694315, 2, 694220, '632623000000', '甘德县', '青海,果洛,甘德', '99.900905', '33.969219', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3479, 694361, 2, 694220, '632624000000', '达日县', '青海,果洛,达日', '99.651392', '33.748921', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3480, 694407, 2, 694220, '632625000000', '久治县', '青海,果洛,久治', '101.482831', '33.429471', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3481, 694440, 2, 694220, '632626000000', '玛多县', '青海,果洛,玛多', '98.209206', '34.915946', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3482, 694479, 2, 694478, '632701000000', '玉树市', '青海,玉树,玉树', '97.008785', '32.993107', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3483, 694572, 2, 694478, '632722000000', '杂多县', '青海,玉树,杂多', '95.300723', '32.893185', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3484, 694622, 2, 694478, '632723000000', '称多县', '青海,玉树,称多', '97.110832', '33.369218', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3485, 694695, 2, 694478, '632724000000', '治多县', '青海,玉树,治多', '95.613080', '33.852751', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3486, 694728, 2, 694478, '632725000000', '囊谦县', '青海,玉树,囊谦', '96.480650', '32.203246', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3487, 694816, 2, 694478, '632726000000', '曲麻莱县', '青海,玉树,曲麻莱', '95.797367', '34.126429', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3488, 694847, 2, 694846, '632801000000', '格尔木市', '青海,海西,格尔木', '94.928484', '36.406404', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3489, 694932, 2, 694846, '632802000000', '德令哈市', '青海,海西,德令哈', '97.360985', '37.369436', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3490, 695009, 2, 694846, '632821000000', '乌兰县', '青海,海西,乌兰', '98.480195', '36.929749', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3491, 695060, 2, 694846, '632822000000', '都兰县', '青海,海西,都兰', '98.095844', '36.302496', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3492, 695184, 2, 694846, '632823000000', '天峻县', '青海,海西,天峻', '99.022984', '37.300851', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3493, 695261, 2, 695260, '640101000000', '市辖区', '宁夏,银川', '106.230909', '38.487193', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3494, 695262, 2, 695260, '640104000000', '兴庆区', '宁夏,银川,兴庆', '106.230909', '38.487193', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3495, 695412, 2, 695260, '640105000000', '西夏区', '宁夏,银川,西夏', '106.230909', '38.487193', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3496, 695500, 2, 695260, '640106000000', '金凤区', '宁夏,银川,金凤', '106.230909', '38.487193', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3497, 695575, 2, 695260, '640121000000', '永宁县', '宁夏,银川,永宁', '106.230909', '38.487193', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3498, 695675, 2, 695260, '640122000000', '贺兰县', '宁夏,银川,贺兰', '106.230909', '38.487193', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3499, 695767, 2, 695260, '640181000000', '灵武市', '宁夏,银川,灵武', '106.230909', '38.487193', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3500, 695884, 2, 695883, '640201000000', '市辖区', '宁夏,石嘴山', '106.383303', '38.983236', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3501, 695885, 2, 695883, '640202000000', '大武口区', '宁夏,石嘴山,大武口', '106.367861', '39.019060', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3502, 695959, 2, 695883, '640205000000', '惠农区', '宁夏,石嘴山,惠农', '106.781176', '39.239302', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3503, 696058, 2, 695883, '640221000000', '平罗县', '宁夏,石嘴山,平罗', '106.523474', '38.913544', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3504, 696253, 2, 696252, '640301000000', '市辖区', '宁夏,吴忠', '106.198393', '37.997460', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3505, 696254, 2, 696252, '640302000000', '利通区', '宁夏,吴忠,利通', '106.212566', '37.983458', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3506, 696427, 2, 696252, '640303000000', '红寺堡区', '宁夏,吴忠,红寺堡', '106.062114', '37.425702', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3507, 696505, 2, 696252, '640323000000', '盐池县', '宁夏,吴忠,盐池', '107.407359', '37.783205', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3508, 696633, 2, 696252, '640324000000', '同心县', '宁夏,吴忠,同心', '105.914458', '36.980575', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3509, 696803, 2, 696252, '640381000000', '青铜峡市', '宁夏,吴忠,青铜峡', '106.078818', '38.021302', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3510, 696929, 2, 696928, '640401000000', '市辖区', '宁夏,固原', '106.242610', '36.015855', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3511, 696930, 2, 696928, '640402000000', '原州区', '宁夏,固原,原州', '106.287782', '36.003740', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3512, 697133, 2, 696928, '640422000000', '西吉县', '宁夏,固原,西吉', '105.729085', '35.963913', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3513, 697457, 2, 696928, '640423000000', '隆德县', '宁夏,固原,隆德', '106.111595', '35.625915', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3514, 697594, 2, 696928, '640424000000', '泾源县', '宁夏,固原,泾源', '106.330646', '35.498160', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3515, 697714, 2, 696928, '640425000000', '彭阳县', '宁夏,固原,彭阳', '106.638340', '35.849565', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3516, 697888, 2, 697887, '640501000000', '市辖区', '宁夏,中卫', '105.196902', '37.499972', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3517, 697889, 2, 697887, '640502000000', '沙坡头区', '宁夏,中卫,沙坡头', '105.190536', '37.514564', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3518, 698087, 2, 697887, '640521000000', '中宁县', '宁夏,中卫,中宁', '105.685285', '37.491505', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3519, 698240, 2, 697887, '640522000000', '海原县', '宁夏,中卫,海原', '105.643487', '36.565033', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3520, 698442, 2, 698441, '650101000000', '市辖区', '新疆,乌鲁木齐', '87.616848', '43.825592', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3521, 698443, 2, 698441, '650102000000', '天山区', '新疆,乌鲁木齐,天山', '87.616848', '43.825592', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3522, 698654, 2, 698441, '650103000000', '沙依巴克区', '新疆,乌鲁木齐,沙依巴克', '87.616848', '43.825592', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3523, 698884, 2, 698441, '650104000000', '新市区', '新疆,乌鲁木齐,新市区', '87.616848', '43.825592', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3524, 699054, 2, 698441, '650105000000', '水磨沟区', '新疆,乌鲁木齐,水磨沟', '87.616848', '43.825592', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3525, 699229, 2, 698441, '650106000000', '头屯河区', '新疆,乌鲁木齐,头屯河', '87.616848', '43.825592', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3526, 699313, 2, 698441, '650107000000', '达坂城区', '新疆,乌鲁木齐,达坂城', '87.616848', '43.825592', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3527, 699363, 2, 698441, '650109000000', '米东区', '新疆,乌鲁木齐,米东', '87.616848', '43.825592', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3528, 699535, 2, 698441, '650121000000', '乌鲁木齐县', '新疆,乌鲁木齐,乌鲁木齐', '87.616848', '43.825592', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3529, 699584, 2, 699583, '650201000000', '市辖区', '新疆,克拉玛依', '84.889207', '45.579888', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3530, 699585, 2, 699583, '650202000000', '独山子区', '新疆,克拉玛依,独山子', '84.886974', '44.328096', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3531, 699606, 2, 699583, '650203000000', '克拉玛依区', '新疆,克拉玛依,克拉玛依', '84.867844', '45.602526', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3532, 699730, 2, 699583, '650204000000', '白碱滩区', '新疆,克拉玛依,白碱滩', '85.131696', '45.687855', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3533, 699752, 2, 699583, '650205000000', '乌尔禾区', '新疆,克拉玛依,乌尔禾', '85.693742', '46.089148', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3534, 699774, 2, 699773, '650402000000', '高昌区', '新疆,吐鲁番,高昌', '89.182342', '42.947635', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3535, 699884, 2, 699773, '650421000000', '鄯善县', '新疆,吐鲁番,鄯善', '90.213330', '42.868744', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3536, 700000, 2, 699773, '650422000000', '托克逊县', '新疆,吐鲁番,托克逊', '88.653814', '42.792521', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3537, 700071, 2, 700070, '650502000000', '伊州区', '新疆,哈密,伊州', '93.514916', '42.818501', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3538, 700350, 2, 700070, '650521000000', '巴里坤哈萨克自治县', '新疆,哈密,巴里坤', '93.016625', '43.598763', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3539, 700438, 2, 700070, '650522000000', '伊吾县', '新疆,哈密,伊吾', '94.697074', '43.254978', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3540, 700490, 2, 700489, '652301000000', '昌吉市', '新疆,昌吉,昌吉', '87.304112', '44.013183', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3541, 700685, 2, 700489, '652302000000', '阜康市', '新疆,昌吉,阜康', '87.946894', '44.168576', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3542, 700805, 2, 700489, '652323000000', '呼图壁县', '新疆,昌吉,呼图壁', '86.898902', '44.191428', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3543, 700956, 2, 700489, '652324000000', '玛纳斯县', '新疆,昌吉,玛纳斯', '86.213997', '44.303893', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3544, 701230, 2, 700489, '652325000000', '奇台县', '新疆,昌吉,奇台', '89.593967', '44.022066', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3545, 701375, 2, 700489, '652327000000', '吉木萨尔县', '新疆,昌吉,吉木萨尔', '89.180437', '44.000497', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3546, 701474, 2, 700489, '652328000000', '木垒哈萨克自治县', '新疆,昌吉,木垒', '90.286028', '43.834689', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3547, 701560, 2, 701559, '652701000000', '博乐市', '新疆,博尔塔拉,博乐', '82.051005', '44.853870', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3548, 701834, 2, 701559, '652702000000', '阿拉山口市', '新疆,博尔塔拉,阿拉山口', '82.559396', '45.172228', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3549, 701839, 2, 701559, '652722000000', '精河县', '新疆,博尔塔拉,精河', '82.894195', '44.600408', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3550, 701978, 2, 701559, '652723000000', '温泉县', '新疆,博尔塔拉,温泉', '81.024816', '44.968857', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3551, 702105, 2, 702104, '652801000000', '库尔勒市', '新疆,巴音郭楞,库尔勒', '86.174633', '41.725892', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3552, 702357, 2, 702104, '652822000000', '轮台县', '新疆,巴音郭楞,轮台', '84.252156', '41.777702', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3553, 702447, 2, 702104, '652823000000', '尉犁县', '新疆,巴音郭楞,尉犁', '86.261321', '41.343933', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3554, 702573, 2, 702104, '652824000000', '若羌县', '新疆,巴音郭楞,若羌', '88.167152', '39.023242', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3555, 702634, 2, 702104, '652825000000', '且末县', '新疆,巴音郭楞,且末', '85.528865', '38.147895', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3556, 702727, 2, 702104, '652826000000', '焉耆回族自治县', '新疆,巴音郭楞,焉耆', '86.574067', '42.059759', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3557, 702821, 2, 702104, '652827000000', '和静县', '新疆,巴音郭楞,和静', '86.384065', '42.323625', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3558, 702995, 2, 702104, '652828000000', '和硕县', '新疆,巴音郭楞,和硕', '86.863963', '42.268371', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3559, 703063, 2, 702104, '652829000000', '博湖县', '新疆,巴音郭楞,博湖', '86.631998', '41.980152', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3560, 703120, 2, 703119, '652901000000', '阿克苏市', '新疆,阿克苏,阿克苏', '80.260605', '41.168779', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3561, 703353, 2, 703119, '652922000000', '温宿县', '新疆,阿克苏,温宿', '80.238959', '41.276688', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3562, 703576, 2, 703119, '652923000000', '库车县', '新疆,阿克苏,库车', '82.962016', '41.717906', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3563, 703858, 2, 703119, '652924000000', '沙雅县', '新疆,阿克苏,沙雅', '82.781819', '41.221667', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3564, 704059, 2, 703119, '652925000000', '新和县', '新疆,阿克苏,新和', '82.609220', '41.548118', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3565, 704209, 2, 703119, '652926000000', '拜城县', '新疆,阿克苏,拜城', '81.874156', '41.796910', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3566, 704413, 2, 703119, '652927000000', '乌什县', '新疆,阿克苏,乌什', '79.224445', '41.214652', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3567, 704556, 2, 703119, '652928000000', '阿瓦提县', '新疆,阿克苏,阿瓦提', '80.373137', '40.644529', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3568, 704733, 2, 703119, '652929000000', '柯坪县', '新疆,阿克苏,柯坪', '79.047291', '40.508340', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3569, 704780, 2, 704779, '653001000000', '阿图什市', '新疆,克孜勒苏,阿图什', '76.168400', '39.716160', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3570, 704893, 2, 704779, '653022000000', '阿克陶县', '新疆,克孜勒苏,阿克陶', '75.962509', '37.993697', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3571, 705047, 2, 704779, '653023000000', '阿合奇县', '新疆,克孜勒苏,阿合奇', '78.446253', '40.936936', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3572, 705084, 2, 704779, '653024000000', '乌恰县', '新疆,克孜勒苏,乌恰', '76.167819', '39.714526', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3573, 705146, 2, 705145, '653101000000', '喀什市', '新疆,喀什,喀什', '75.989755', '39.470400', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3574, 705344, 2, 705145, '653121000000', '疏附县', '新疆,喀什,疏附', '75.862814', '39.375044', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3575, 705496, 2, 705145, '653122000000', '疏勒县', '新疆,喀什,疏勒', '76.048139', '39.401385', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3576, 705764, 2, 705145, '653123000000', '英吉沙县', '新疆,喀什,英吉沙', '76.175729', '38.930382', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3577, 705961, 2, 705145, '653124000000', '泽普县', '新疆,喀什,泽普', '77.260103', '38.184955', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3578, 706133, 2, 705145, '653125000000', '莎车县', '新疆,喀什,莎车', '77.245761', '38.414217', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3579, 706753, 2, 705145, '653126000000', '叶城县', '新疆,喀什,叶城', '77.413836', '37.882989', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3580, 707143, 2, 705145, '653127000000', '麦盖提县', '新疆,喀什,麦盖提', '77.610105', '38.898666', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3581, 707342, 2, 705145, '653128000000', '岳普湖县', '新疆,喀什,岳普湖', '76.773163', '39.224200', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3582, 707464, 2, 705145, '653129000000', '伽师县', '新疆,喀什,伽师', '76.723720', '39.488182', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3583, 707806, 2, 705145, '653130000000', '巴楚县', '新疆,喀什,巴楚', '78.549297', '39.785155', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3584, 708055, 2, 705145, '653131000000', '塔什库尔干塔吉克自治县', '新疆,喀什,塔什库尔干', '75.989755', '39.470400', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3585, 708118, 2, 708117, '653201000000', '和田市', '新疆,和田,和田', '79.913534', '37.112149', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3586, 708305, 2, 708117, '653221000000', '和田县', '新疆,和田,和田', '79.913534', '37.112149', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3587, 708528, 2, 708117, '653222000000', '墨玉县', '新疆,和田,墨玉', '79.728841', '37.277340', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3588, 708940, 2, 708117, '653223000000', '皮山县', '新疆,和田,皮山', '78.283669', '37.621450', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3589, 709155, 2, 708117, '653224000000', '洛浦县', '新疆,和田,洛浦', '80.188986', '37.073667', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3590, 709393, 2, 708117, '653225000000', '策勒县', '新疆,和田,策勒', '80.806159', '36.998335', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3591, 709538, 2, 708117, '653226000000', '于田县', '新疆,和田,于田', '81.677418', '36.857081', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3592, 709746, 2, 708117, '653227000000', '民丰县', '新疆,和田,民丰', '82.695862', '37.064080', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3593, 709793, 2, 709792, '654002000000', '伊宁市', '新疆,伊犁,伊宁', '81.277950', '43.908558', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3594, 709978, 2, 709792, '654003000000', '奎屯市', '新疆,伊犁,奎屯', '84.903267', '44.426529', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3595, 710057, 2, 709792, '654004000000', '霍尔果斯市', '新疆,伊犁,霍尔果斯', '80.420759', '44.201669', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3596, 710090, 2, 709792, '654021000000', '伊宁县', '新疆,伊犁,伊宁', '81.277950', '43.908558', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3597, 710275, 2, 709792, '654022000000', '察布查尔锡伯自治县', '新疆,伊犁,察布查尔', '81.151337', '43.840726', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3598, 710410, 2, 709792, '654023000000', '霍城县', '新疆,伊犁,霍城', '80.874181', '44.053592', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3599, 710612, 2, 709792, '654024000000', '巩留县', '新疆,伊犁,巩留', '82.231718', '43.482628', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3600, 710730, 2, 709792, '654025000000', '新源县', '新疆,伊犁,新源', '83.260770', '43.429930', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3601, 710868, 2, 709792, '654026000000', '昭苏县', '新疆,伊犁,昭苏', '81.130975', '43.157293', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3602, 711013, 2, 709792, '654027000000', '特克斯县', '新疆,伊犁,特克斯', '81.836206', '43.217184', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3603, 711105, 2, 709792, '654028000000', '尼勒克县', '新疆,伊犁,尼勒克', '82.511810', '43.800247', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3604, 711219, 2, 711218, '654201000000', '塔城市', '新疆,塔城,塔城', '82.978928', '46.748523', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3605, 711436, 2, 711218, '654202000000', '乌苏市', '新疆,塔城,乌苏', '84.713736', '44.418887', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3606, 711820, 2, 711218, '654221000000', '额敏县', '新疆,塔城,额敏', '83.628303', '46.524673', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3607, 712103, 2, 711218, '654223000000', '沙湾县', '新疆,塔城,沙湾', '85.619416', '44.326388', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3608, 712601, 2, 711218, '654224000000', '托里县', '新疆,塔城,托里', '83.606951', '45.947638', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3609, 712700, 2, 711218, '654225000000', '裕民县', '新疆,塔城,裕民', '82.982668', '46.201104', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3610, 712777, 2, 711218, '654226000000', '和布克赛尔蒙古自治县', '新疆,塔城,和布克赛尔', '85.738335', '46.798895', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3611, 712894, 2, 712893, '654301000000', '阿勒泰市', '新疆,阿勒泰,阿勒泰', '88.131842', '47.827309', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3612, 713072, 2, 712893, '654321000000', '布尔津县', '新疆,阿勒泰,布尔津', '86.874897', '47.701850', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3613, 713161, 2, 712893, '654322000000', '富蕴县', '新疆,阿勒泰,富蕴', '89.525504', '46.994115', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3614, 713261, 2, 712893, '654323000000', '福海县', '新疆,阿勒泰,福海', '87.486703', '47.111919', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3615, 713426, 2, 712893, '654324000000', '哈巴河县', '新疆,阿勒泰,哈巴河', '86.418621', '48.060846', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3616, 713568, 2, 712893, '654325000000', '青河县', '新疆,阿勒泰,青河', '90.382961', '46.674205', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3617, 713635, 2, 712893, '654326000000', '吉木乃县', '新疆,阿勒泰,吉木乃', '85.874096', '47.443101', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3618, 713698, 2, 713697, '659001000000', '石河子市', '新疆,石河子', '86.080460', '44.305428', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3619, 713842, 2, 713697, '659002000000', '阿拉尔市', '新疆,阿拉尔', '81.280525', '40.547653', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3620, 714172, 2, 713697, '659003000000', '图木舒克市', '新疆,图木舒克', '79.074089', '39.868969', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3621, 714310, 2, 713697, '659004000000', '五家渠市', '新疆,五家渠', '87.543243', '44.166756', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3622, 714363, 2, 713697, '659006000000', '铁门关市', '新疆,铁门关', '85.669533', '41.863300', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3648, 714403, 2, 714402, '0', '芳苑乡', '台湾,彰化,芳苑', '120.416000', '24.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3649, 714632, 2, 714402, '0', '芬园乡', '台湾,彰化,芬园', '120.416000', '24.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3650, 714701, 2, 714402, '0', '福兴乡', '台湾,彰化,福兴', '120.416000', '24.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3651, 714777, 2, 714402, '0', '和美镇', '台湾,彰化,和美', '120.416000', '24.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3652, 715055, 2, 714402, '0', '花坛乡', '台湾,彰化,花坛', '120.416000', '24.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3653, 715172, 2, 714402, '0', '鹿港镇', '台湾,彰化,鹿港', '120.416000', '24.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3654, 715490, 2, 714402, '0', '埤头乡', '台湾,彰化,埤头', '120.464542', '23.890392', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3655, 715602, 2, 714402, '0', '埔心乡', '台湾,彰化,埔心', '120.416000', '24.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3656, 715745, 2, 714402, '0', '埔盐乡', '台湾,彰化,埔盐', '120.416000', '24.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3657, 715795, 2, 714402, '0', '伸港乡', '台湾,彰化,伸港', '120.416000', '24.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3658, 715960, 2, 714402, '0', '社头乡', '台湾,彰化,社头', '120.416000', '24.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3659, 716105, 2, 714402, '0', '田尾乡', '台湾,彰化,田尾', '120.416000', '24.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3660, 716202, 2, 714402, '0', '田中镇', '台湾,彰化,田中', '120.416000', '24.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3661, 716341, 2, 714402, '0', '线西乡', '台湾,彰化,线西', '120.416000', '24.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3662, 716421, 2, 714402, '0', '溪湖镇', '台湾,彰化,溪湖', '120.416000', '24.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3663, 716750, 2, 714402, '0', '秀水乡', '台湾,彰化,秀水', '120.416000', '24.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3664, 716874, 2, 714402, '0', '溪州乡', '台湾,彰化,溪州', '120.492906', '23.853578', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3665, 717107, 2, 714402, '0', '永靖乡', '台湾,彰化,永靖', '120.416000', '24.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3666, 717238, 2, 714402, '0', '员林市', '台湾,彰化,员林市', '120.416000', '24.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3667, 717447, 2, 714402, '0', '竹塘乡', '台湾,彰化,竹塘', '120.416000', '24.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3668, 717532, 2, 717531, '0', '八里区', '台湾,新北,八里区', '121.465746', '25.012366', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3669, 717645, 2, 717531, '0', '板桥区', '台湾,新北,板桥区', '121.465746', '25.012366', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3670, 717902, 2, 717531, '0', '贡寮区', '台湾,新北,贡寮区', '121.465746', '25.012366', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3671, 717955, 2, 717531, '0', '金山区', '台湾,新北,金山区', '121.465746', '25.012366', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3672, 718036, 2, 717531, '0', '林口区', '台湾,新北,林口区', '121.465746', '25.012366', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3673, 718195, 2, 717531, '0', '芦洲区', '台湾,新北,芦洲区', '121.465746', '25.012366', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3674, 718266, 2, 717531, '0', '坪林区', '台湾,新北,坪林区', '121.465746', '25.012366', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3675, 718327, 2, 717531, '0', '平溪区', '台湾,新北,平溪区', '121.465746', '25.012366', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3676, 718375, 2, 717531, '0', '瑞芳区', '台湾,新北,瑞芳区', '121.465746', '25.012366', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3677, 718490, 2, 717531, '0', '三重区', '台湾,新北,三重区', '121.465746', '25.012366', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3678, 718786, 2, 717531, '0', '三峡区', '台湾,新北,三峡区', '121.465746', '25.012366', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3679, 718879, 2, 717531, '0', '三芝区', '台湾,新北,三芝区', '121.465746', '25.012366', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3680, 718980, 2, 717531, '0', '深坑区', '台湾,新北,深坑区', '121.465746', '25.012366', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3681, 719023, 2, 717531, '0', '石碇区', '台湾,新北,石碇区', '121.465746', '25.012366', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3682, 719115, 2, 717531, '0', '石门区', '台湾,新北,石门区', '121.465746', '25.012366', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3683, 719155, 2, 717531, '0', '双溪区', '台湾,新北,双溪区', '121.465746', '25.012366', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3684, 719243, 2, 717531, '0', '树林区', '台湾,新北,树林区', '121.465746', '25.012366', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3685, 719382, 2, 717531, '0', '泰山区', '台湾,新北,泰山区', '121.465746', '25.012366', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3686, 719498, 2, 717531, '0', '淡水区', '台湾,新北,淡水区', '121.465746', '25.012366', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3687, 719731, 2, 717531, '0', '土城区', '台湾,新北,土城区', '121.465746', '25.012366', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3688, 719869, 2, 719868, '0', '白沙乡', '台湾,澎湖,白沙', '119.566417', '23.569733', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3689, 719890, 2, 719868, '0', '湖西乡', '台湾,澎湖,湖西', '119.566417', '23.569733', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3690, 719916, 2, 719868, '0', '马公市', '台湾,澎湖,马公市', '119.566417', '23.569733', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3691, 720065, 2, 719868, '0', '七美乡', '台湾,澎湖,七美', '119.566417', '23.569733', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3692, 720090, 2, 719868, '0', '望安乡', '台湾,澎湖,望安', '119.566417', '23.569733', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3693, 720102, 2, 719868, '0', '西屿乡', '台湾,澎湖,西屿', '119.566417', '23.569733', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3694, 720119, 2, 720118, '0', '三地门乡', '台湾,屏东,三地门', '120.487928', '22.682802', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3695, 720142, 2, 720118, '0', '狮子乡', '台湾,屏东,狮子', '120.487928', '22.682802', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3696, 720163, 2, 720118, '0', '泰武乡', '台湾,屏东,泰武', '120.626012', '22.591307', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3697, 720186, 2, 720118, '0', '万丹乡', '台湾,屏东,万丹', '120.486423', '22.588123', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3698, 720415, 2, 720118, '0', '万峦乡', '台湾,屏东,万峦', '120.566478', '22.571966', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3699, 720480, 2, 720118, '0', '雾臺乡', '台湾,屏东,雾臺', '120.727653', '22.743675', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3700, 720502, 2, 720118, '0', '新埤乡', '台湾,屏东,新埤', '120.545190', '22.465998', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3701, 720553, 2, 720118, '0', '新园乡', '台湾,屏东,新园', '120.459758', '22.544147', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3702, 720649, 2, 720118, '0', '盐埔乡', '台湾,屏东,盐埔', '120.487928', '22.682802', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3703, 720748, 2, 720118, '0', '竹田乡', '台湾,屏东,竹田', '120.487928', '22.682802', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3704, 720835, 2, 720118, '0', '长治乡', '台湾,屏东,长治', '120.487928', '22.682802', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3705, 720975, 2, 720118, '0', '潮州镇', '台湾,屏东,潮州', '120.487928', '22.682802', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3706, 721293, 2, 720118, '0', '车城乡', '台湾,屏东,车城', '120.707694', '22.072115', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3707, 721335, 2, 720118, '0', '春日乡', '台湾,屏东,春日', '120.622000', '22.368284', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3708, 721344, 2, 720118, '0', '东港镇', '台湾,屏东,东港', '120.487928', '22.682802', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3709, 721490, 2, 720118, '0', '枋寮乡', '台湾,屏东,枋寮', '120.487928', '22.682802', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3710, 721617, 2, 720118, '0', '枋山乡', '台湾,屏东,枋山', '120.647762', '22.262550', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3711, 721638, 2, 720118, '0', '高树乡', '台湾,屏东,高树', '120.595945', '22.825131', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3712, 721805, 2, 720118, '0', '恆春镇', '台湾,屏东,恆春', '120.487928', '22.682802', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3713, 721930, 2, 720118, '0', '佳冬乡', '台湾,屏东,佳冬', '120.545370', '22.417786', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3714, 722025, 2, 722024, '0', '梧栖区', '台湾,臺中,梧栖区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3715, 722212, 2, 722024, '0', '乌日区', '台湾,臺中,乌日区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3716, 722402, 2, 722024, '0', '新社区', '台湾,臺中,新社区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3717, 722474, 2, 722024, '0', '西屯区', '台湾,臺中,西屯区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3718, 722699, 2, 722024, '0', '北屯区', '台湾,臺中,北屯区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3719, 722879, 2, 722024, '0', '中区', '台湾,臺中,中区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3720, 722923, 2, 722024, '0', '大肚区', '台湾,臺中,大肚区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3721, 723021, 2, 722024, '0', '大甲区', '台湾,臺中,大甲区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3722, 723211, 2, 722024, '0', '大里区', '台湾,臺中,大里区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3723, 723592, 2, 722024, '0', '大雅区', '台湾,臺中,大雅区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3724, 723756, 2, 722024, '0', '大安区', '台湾,臺中,大安区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3725, 723802, 2, 722024, '0', '东势区', '台湾,臺中,东势区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3726, 723966, 2, 722024, '0', '东区', '台湾,臺中,东区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3727, 724148, 2, 722024, '0', '丰原区', '台湾,臺中,丰原区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3728, 724424, 2, 722024, '0', '和平区', '台湾,臺中,和平区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3729, 724504, 2, 722024, '0', '后里区', '台湾,臺中,后里区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3730, 724656, 2, 722024, '0', '龙井区', '台湾,臺中,龙井区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3731, 724797, 2, 722024, '0', '南屯区', '台湾,臺中,南屯区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3732, 724872, 2, 722024, '0', '北区', '台湾,臺中,北区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3733, 725199, 2, 722024, '0', '清水区', '台湾,臺中,清水区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3734, 725489, 2, 725488, '0', '佳里区', '台湾,臺南,佳里区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3735, 725588, 2, 725488, '0', '将军区', '台湾,臺南,将军区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3736, 725620, 2, 725488, '0', '六甲区', '台湾,臺南,六甲区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3737, 725679, 2, 725488, '0', '柳营区', '台湾,臺南,柳营区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3738, 725795, 2, 725488, '0', '龙崎区', '台湾,臺南,龙崎区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3739, 725841, 2, 725488, '0', '麻豆区', '台湾,臺南,麻豆区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3740, 725927, 2, 725488, '0', '南化区', '台湾,臺南,南化区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3741, 725938, 2, 725488, '0', '楠西区', '台湾,臺南,楠西区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3742, 725973, 2, 725488, '0', '北区', '台湾,臺南,北区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3743, 726300, 2, 725488, '0', '七股区', '台湾,臺南,七股区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3744, 726338, 2, 725488, '0', '仁德区', '台湾,臺南,仁德区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3745, 726539, 2, 725488, '0', '善化区', '台湾,臺南,善化区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3746, 726675, 2, 725488, '0', '山上区', '台湾,臺南,山上区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3747, 726691, 2, 725488, '0', '南区', '台湾,臺南,南区', '120.679305', '24.133453', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3748, 727041, 2, 725488, '0', '中西区', '台湾,臺南,中西区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3749, 727251, 2, 725488, '0', '下营区', '台湾,臺南,下营区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3750, 727339, 2, 725488, '0', '西港区', '台湾,臺南,西港区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3751, 727375, 2, 725488, '0', '新化区', '台湾,臺南,新化区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3752, 727425, 2, 725488, '0', '新市区', '台湾,臺南,新市区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3753, 727529, 2, 725488, '0', '新营区', '台湾,臺南,新营区', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3754, 727731, 2, 727730, '0', '北投区', '台湾,臺北,北投区', '121.517057', '25.048074', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3755, 727897, 2, 727730, '0', '大同区', '台湾,臺北,大同区', '121.517057', '25.048074', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3756, 728070, 2, 727730, '0', '大安区', '台湾,臺北,大安区', '121.517057', '25.048074', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3757, 728116, 2, 727730, '0', '南港区', '台湾,臺北,南港区', '121.517057', '25.048074', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3758, 728220, 2, 727730, '0', '内湖区', '台湾,臺北,内湖区', '121.517057', '25.048074', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3759, 728340, 2, 727730, '0', '士林区', '台湾,臺北,士林区', '121.517057', '25.048074', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3760, 728550, 2, 727730, '0', '松山区', '台湾,臺北,松山区', '121.517057', '25.048074', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3761, 728713, 2, 727730, '0', '万华区', '台湾,臺北,万华区', '121.517057', '25.048074', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3762, 728920, 2, 727730, '0', '文山区', '台湾,臺北,文山区', '121.517057', '25.048074', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3763, 729073, 2, 727730, '0', '信义区', '台湾,臺北,信义区', '121.517057', '25.048074', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3764, 729277, 2, 727730, '0', '中山区', '台湾,臺北,中山区', '121.517057', '25.048074', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3765, 729583, 2, 727730, '0', '中正区', '台湾,臺北,中正区', '121.517057', '25.048074', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3766, 729929, 2, 729928, '0', '卑南乡', '台湾,臺东,卑南', '121.117213', '22.781744', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3767, 729994, 2, 729928, '0', '长滨乡', '台湾,臺东,长滨', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3768, 730033, 2, 729928, '0', '成功镇', '台湾,臺东,成功', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3769, 730107, 2, 729928, '0', '池上乡', '台湾,臺东,池上', '121.212999', '23.123275', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3770, 730196, 2, 729928, '0', '达仁乡', '台湾,臺东,达仁', '120.878316', '22.296142', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3771, 730219, 2, 729928, '0', '大武乡', '台湾,臺东,大武', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3772, 730268, 2, 729928, '0', '东河乡', '台湾,臺东,东河', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3773, 730308, 2, 729928, '0', '关山镇', '台湾,臺东,关山', '121.158084', '23.047483', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3774, 730384, 2, 729928, '0', '海端乡', '台湾,臺东,海端', '121.172009', '23.101079', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3775, 730409, 2, 729928, '0', '金峰乡', '台湾,臺东,金峰', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3776, 730416, 2, 729928, '0', '兰屿乡', '台湾,臺东,兰屿', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3777, 730423, 2, 729928, '0', '绿岛乡', '台湾,臺东,绿岛', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3778, 730438, 2, 729928, '0', '鹿野乡', '台湾,臺东,鹿野', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3779, 730510, 2, 729928, '0', '太麻里乡', '台湾,臺东,太麻里', '120.999365', '22.610919', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3780, 730565, 2, 729928, '0', '臺东市', '台湾,臺东,臺东市', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3781, 730832, 2, 729928, '0', '延平乡', '台湾,臺东,延平', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3782, 730844, 2, 730843, '0', '八德区', '台湾,桃园,八德区', '121.083000', '25.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3783, 731212, 2, 730843, '0', '大溪区', '台湾,桃园,大溪区', '121.083000', '25.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3784, 731471, 2, 730843, '0', '大园区', '台湾,桃园,大园区', '121.083000', '25.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3785, 731767, 2, 730843, '0', '復兴区', '台湾,桃园,復兴区', '121.083000', '25.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3786, 731835, 2, 730843, '0', '观音区', '台湾,桃园,观音区', '121.083000', '25.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3787, 732079, 2, 730843, '0', '龟山区', '台湾,桃园,龟山区', '121.083000', '25.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3788, 732469, 2, 730843, '0', '龙潭区', '台湾,桃园,龙潭区', '121.083000', '25.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3789, 732800, 2, 730843, '0', '芦竹区', '台湾,桃园,芦竹区', '121.083000', '25.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3790, 733144, 2, 730843, '0', '平镇区', '台湾,桃园,平区', '121.083000', '25.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3791, 733179, 2, 730843, '0', '桃园区', '台湾,桃园,桃园区', '121.083000', '25.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3792, 733390, 2, 730843, '0', '新屋区', '台湾,桃园,新屋区', '121.083000', '25.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3793, 733537, 2, 730843, '0', '杨梅区', '台湾,桃园,杨梅区', '121.083000', '25.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3794, 733876, 2, 730843, '0', '中坜区', '台湾,桃园,中坜区', '121.083000', '25.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3795, 734180, 2, 734179, '0', '大同乡', '台湾,宜兰,大同', '121.500000', '24.600000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3796, 734246, 2, 734179, '0', '钓鱼臺', '台湾,宜兰,钓鱼臺', '121.500000', '24.600000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3797, 734248, 2, 734179, '0', '冬山乡', '台湾,宜兰,冬山', '121.500000', '24.600000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3798, 734579, 2, 734179, '0', '礁溪乡', '台湾,宜兰,礁溪', '121.500000', '24.600000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3799, 734681, 2, 734179, '0', '罗东镇', '台湾,宜兰,罗东', '121.500000', '24.600000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3800, 734842, 2, 734179, '0', '南澳乡', '台湾,宜兰,南澳', '121.500000', '24.600000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3801, 734865, 2, 734179, '0', '三星乡', '台湾,宜兰,三星', '121.500000', '24.600000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3802, 735104, 2, 734179, '0', '苏澳镇', '台湾,宜兰,苏澳', '121.500000', '24.600000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3803, 735319, 2, 734179, '0', '头城镇', '台湾,宜兰,头城', '121.500000', '24.600000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3804, 735419, 2, 734179, '0', '五结乡', '台湾,宜兰,五结', '121.796468', '24.685615', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3805, 735620, 2, 734179, '0', '宜兰市', '台湾,宜兰,宜兰市', '121.500000', '24.600000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3806, 735851, 2, 734179, '0', '员山乡', '台湾,宜兰,员山', '121.500000', '24.600000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3807, 735970, 2, 734179, '0', '壮围乡', '台湾,宜兰,壮围', '121.500000', '24.600000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3808, 736052, 2, 736051, '0', '草屯镇', '台湾,南投,草屯', '120.830000', '23.830000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3809, 736305, 2, 736051, '0', '国姓乡', '台湾,南投,国姓', '120.830000', '23.830000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3810, 736356, 2, 736051, '0', '集集镇', '台湾,南投,集集', '120.830000', '23.830000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3811, 736449, 2, 736051, '0', '鹿谷乡', '台湾,南投,鹿谷', '120.830000', '23.830000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3812, 736522, 2, 736051, '0', '名间乡', '台湾,南投,名间', '120.830000', '23.830000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3813, 736622, 2, 736051, '0', '南投市', '台湾,南投,南投市', '120.830000', '23.830000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3814, 736887, 2, 736051, '0', '埔里镇', '台湾,南投,埔里', '120.830000', '23.830000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3815, 737266, 2, 736051, '0', '仁爱乡', '台湾,南投,仁爱', '120.830000', '23.830000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3816, 737337, 2, 736051, '0', '水里乡', '台湾,南投,水里', '120.830000', '23.830000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3817, 737496, 2, 736051, '0', '信义乡', '台湾,南投,信义', '120.830000', '23.830000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3818, 737533, 2, 736051, '0', '鱼池乡', '台湾,南投,鱼池', '120.830000', '23.830000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3819, 737591, 2, 736051, '0', '中寮乡', '台湾,南投,中寮', '120.830000', '23.830000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3820, 737625, 2, 736051, '0', '竹山镇', '台湾,南投,竹山', '120.830000', '23.830000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3821, 737857, 2, 737856, '0', '东沙群岛', '台湾,南海岛,东沙群岛', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3822, 737859, 2, 737856, '0', '南沙群岛', '台湾,南海岛,南沙群岛', '0.000000', '0.000000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3823, 737862, 2, 737861, '0', '头屋乡', '台湾,苗栗,头屋', '120.818985', '24.561601', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3824, 737894, 2, 737861, '0', '西湖乡', '台湾,苗栗,西湖', '120.743700', '24.556610', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3825, 737948, 2, 737861, '0', '苑里镇', '台湾,苗栗,苑里', '120.818985', '24.561601', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3826, 738050, 2, 737861, '0', '造桥乡', '台湾,苗栗,造桥', '120.818985', '24.561601', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3827, 738158, 2, 737861, '0', '竹南镇', '台湾,苗栗,竹南', '120.872636', '24.685510', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3828, 738454, 2, 737861, '0', '卓兰镇', '台湾,苗栗,卓兰', '120.823440', '24.309510', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3829, 738528, 2, 737861, '0', '大湖乡', '台湾,苗栗,大湖', '120.863640', '24.422548', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3830, 738619, 2, 737861, '0', '公馆乡', '台湾,苗栗,公馆', '120.818985', '24.561601', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3831, 738695, 2, 737861, '0', '后龙镇', '台湾,苗栗,后龙', '120.786474', '24.612613', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3832, 738882, 2, 737861, '0', '苗栗市', '台湾,苗栗,苗栗市', '120.819288', '24.561582', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3833, 739250, 2, 737861, '0', '南庄乡', '台湾,苗栗,南庄', '120.818985', '24.561601', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3834, 739302, 2, 737861, '0', '三湾乡', '台湾,苗栗,三湾', '120.818985', '24.561601', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3835, 739369, 2, 737861, '0', '三义乡', '台湾,苗栗,三义', '120.765515', '24.413037', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3836, 739419, 2, 737861, '0', '狮潭乡', '台湾,苗栗,狮潭', '120.918024', '24.540004', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3837, 739465, 2, 737861, '0', '泰安乡', '台湾,苗栗,泰安', '120.818985', '24.561601', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3838, 739487, 2, 737861, '0', '铜锣乡', '台湾,苗栗,铜锣', '120.786475', '24.489502', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3839, 739564, 2, 737861, '0', '通霄镇', '台湾,苗栗,通霄', '120.676696', '24.489084', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3840, 739642, 2, 737861, '0', '头份市', '台湾,苗栗,头份市', '120.818985', '24.561601', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3841, 739958, 2, 739957, '0', '东区', '台湾,嘉义,东区', '120.452538', '23.481568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3842, 740140, 2, 739957, '0', '西区', '台湾,嘉义,西区', '120.452538', '23.481568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3843, 740511, 2, 740510, '0', '阿里山乡', '台湾,嘉义,阿里山', '120.452538', '23.481568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3844, 740536, 2, 740510, '0', '布袋镇', '台湾,嘉义,布袋', '120.452538', '23.481568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3845, 740625, 2, 740510, '0', '大林镇', '台湾,嘉义,大林', '120.452538', '23.481568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3846, 740746, 2, 740510, '0', '大埔乡', '台湾,嘉义,大埔', '120.452538', '23.481568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3847, 740792, 2, 740510, '0', '东石乡', '台湾,嘉义,东石', '120.452538', '23.481568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3848, 740845, 2, 740510, '0', '番路乡', '台湾,嘉义,番路', '120.452538', '23.481568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3849, 740943, 2, 740510, '0', '六脚乡', '台湾,嘉义,六脚', '120.452538', '23.481568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3850, 740975, 2, 740510, '0', '鹿草乡', '台湾,嘉义,鹿草', '120.452538', '23.481568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3851, 741010, 2, 740510, '0', '梅山乡', '台湾,嘉义,梅山', '120.452538', '23.481568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3852, 741137, 2, 740510, '0', '民雄乡', '台湾,嘉义,民雄', '120.452538', '23.481568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3853, 741312, 2, 740510, '0', '朴子市', '台湾,嘉义,朴子市', '120.452538', '23.481568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3854, 741451, 2, 740510, '0', '水上乡', '台湾,嘉义,水上', '120.452538', '23.481568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3855, 741550, 2, 740510, '0', '太保市', '台湾,嘉义,太保市', '120.332737', '23.459115', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3856, 741646, 2, 740510, '0', '溪口乡', '台湾,嘉义,溪口', '120.452538', '23.481568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3857, 741688, 2, 740510, '0', '新港乡', '台湾,嘉义,新港', '120.452538', '23.481568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3858, 741750, 2, 740510, '0', '义竹乡', '台湾,嘉义,义竹', '120.452538', '23.481568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3859, 741785, 2, 740510, '0', '中埔乡', '台湾,嘉义,中埔', '120.452538', '23.481568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3860, 741936, 2, 740510, '0', '竹崎乡', '台湾,嘉义,竹崎', '120.452538', '23.481568', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3861, 742127, 2, 742126, '0', '东区', '台湾,新竹,东区', '120.973544', '24.805226', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3862, 742309, 2, 742126, '0', '北区', '台湾,新竹,北区', '120.968798', '24.806738', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3863, 742637, 2, 742636, '0', '峨眉乡', '台湾,新竹,峨眉', '120.968798', '24.806738', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3864, 742674, 2, 742636, '0', '关西镇', '台湾,新竹,关西', '120.968798', '24.806738', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3865, 742797, 2, 742636, '0', '横山乡', '台湾,新竹,横山', '120.968798', '24.806738', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3866, 742852, 2, 742636, '0', '湖口乡', '台湾,新竹,湖口', '120.968798', '24.806738', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3867, 743201, 2, 742636, '0', '尖石乡', '台湾,新竹,尖石', '120.968798', '24.806738', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3868, 743246, 2, 742636, '0', '芎林乡', '台湾,新竹,芎林', '120.968798', '24.806738', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3869, 743298, 2, 742636, '0', '五峰乡', '台湾,新竹,五峰', '120.968798', '24.806738', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3870, 743319, 2, 742636, '0', '新丰乡', '台湾,新竹,新丰', '120.968798', '24.806738', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3871, 743414, 2, 742636, '0', '新埔镇', '台湾,新竹,新埔', '120.968798', '24.806738', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3872, 743527, 2, 742636, '0', '竹北市', '台湾,新竹,竹北市', '120.968798', '24.806738', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3873, 743565, 2, 742636, '0', '竹东镇', '台湾,新竹,竹东', '120.968798', '24.806738', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3874, 743725, 2, 742636, '0', '宝山乡', '台湾,新竹,宝山', '120.968798', '24.806738', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3875, 743888, 2, 742636, '0', '北埔乡', '台湾,新竹,北埔', '120.968798', '24.806738', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3876, 743939, 2, 743938, '0', '卓溪乡', '台湾,花莲,卓溪', '121.301890', '23.344908', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3877, 743956, 2, 743938, '0', '丰滨乡', '台湾,花莲,丰滨', '121.300000', '23.830000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3878, 743993, 2, 743938, '0', '凤林镇', '台湾,花莲,凤林', '121.300000', '23.830000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3879, 744128, 2, 743938, '0', '富里乡', '台湾,花莲,富里', '121.244694', '23.175468', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3880, 744185, 2, 743938, '0', '光復乡', '台湾,花莲,光復', '121.300000', '23.830000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3881, 744246, 2, 743938, '0', '花莲市', '台湾,花莲,花莲市', '121.606927', '23.981993', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3882, 744625, 2, 743938, '0', '吉安乡', '台湾,花莲,吉安', '121.300000', '23.830000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3883, 745050, 2, 743938, '0', '瑞穗乡', '台湾,花莲,瑞穗', '121.373373', '23.496080', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3884, 745196, 2, 743938, '0', '寿丰乡', '台湾,花莲,寿丰', '121.506030', '23.869774', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3885, 745354, 2, 743938, '0', '万荣乡', '台湾,花莲,万荣', '121.300000', '23.830000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3886, 745363, 2, 743938, '0', '新城乡', '台湾,花莲,新城', '121.604120', '24.039243', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3887, 745486, 2, 743938, '0', '秀林乡', '台湾,花莲,秀林', '121.300000', '23.830000', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3888, 745532, 2, 743938, '0', '玉里镇', '台湾,花莲,玉里', '121.312109', '23.334236', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3889, 745675, 2, 745674, '0', '阿莲区', '台湾,高雄,阿莲区', '120.311922', '22.620856', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3890, 745715, 2, 745674, '0', '大寮区', '台湾,高雄,大寮区', '120.311922', '22.620856', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3891, 746083, 2, 745674, '0', '大社区', '台湾,高雄,大社区', '120.311922', '22.620856', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3892, 746199, 2, 745674, '0', '大树区', '台湾,高雄,大树区', '120.311922', '22.620856', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3893, 746294, 2, 745674, '0', '凤山区', '台湾,高雄,凤山区', '120.311922', '22.620856', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3894, 746624, 2, 745674, '0', '冈山区', '台湾,高雄,冈山区', '120.311922', '22.620856', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3895, 746906, 2, 745674, '0', '鼓山区', '台湾,高雄,鼓山区', '120.311922', '22.620856', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3896, 747053, 2, 745674, '0', '湖内区', '台湾,高雄,湖内区', '120.311922', '22.620856', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3897, 747108, 2, 745674, '0', '甲仙区', '台湾,高雄,甲仙区', '120.587980', '23.083957', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3898, 747150, 2, 745674, '0', '苓雅区', '台湾,高雄,苓雅区', '120.311922', '22.620856', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3899, 747342, 2, 745674, '0', '林园区', '台湾,高雄,林园区', '120.311922', '22.620856', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3900, 747481, 2, 745674, '0', '六龟区', '台湾,高雄,六龟区', '120.311922', '22.620856', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3901, 747536, 2, 745674, '0', '路竹区', '台湾,高雄,路竹区', '120.311922', '22.620856', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3902, 747643, 2, 745674, '0', '茂林区', '台湾,高雄,茂林区', '120.311922', '22.620856', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3903, 747647, 2, 745674, '0', '美浓区', '台湾,高雄,美浓区', '120.542419', '22.894882', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3904, 747764, 2, 745674, '0', '弥陀区', '台湾,高雄,弥陀区', '120.250672', '22.781561', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3905, 747894, 2, 745674, '0', '那玛夏区', '台湾,高雄,那玛夏区', '120.311922', '22.620856', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3906, 747902, 2, 745674, '0', '楠梓区', '台湾,高雄,楠梓区', '120.311922', '22.620856', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3907, 748258, 2, 745674, '0', '内门区', '台湾,高雄,内门区', '120.311922', '22.620856', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3908, 748344, 2, 745674, '0', '鸟松区', '台湾,高雄,鸟松区', '120.311922', '22.620856', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3909, 748554, 2, 748553, '0', '安乐区', '台湾,基隆,安乐区', '121.746248', '25.130741', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3910, 748581, 2, 748553, '0', '暖暖区', '台湾,基隆,暖暖区', '121.746248', '25.130741', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3911, 748599, 2, 748553, '0', '七堵区', '台湾,基隆,七堵区', '121.746248', '25.130741', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3912, 748670, 2, 748553, '0', '仁爱区', '台湾,基隆,仁爱区', '121.746248', '25.130741', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3913, 748716, 2, 748553, '0', '信义区', '台湾,基隆,信义区', '121.746248', '25.130741', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3914, 748920, 2, 748553, '0', '中山区', '台湾,基隆,中山区', '121.746248', '25.130741', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3915, 749226, 2, 748553, '0', '中正区', '台湾,基隆,中正区', '121.768000', '25.151647', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3916, 749572, 2, 749571, '0', '金城镇', '台湾,金门,金城', '118.317089', '24.432706', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3917, 749647, 2, 749571, '0', '金湖镇', '台湾,金门,金湖', '118.317089', '24.432706', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3918, 749752, 2, 749571, '0', '金宁乡', '台湾,金门,金宁', '118.317089', '24.432706', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3919, 749810, 2, 749571, '0', '金沙镇', '台湾,金门,金沙', '118.317089', '24.432706', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3920, 749894, 2, 749571, '0', '烈屿乡', '台湾,金门,烈屿', '118.317089', '24.432706', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3921, 749928, 2, 749571, '0', '乌坵乡', '台湾,金门,乌坵', '118.317089', '24.432706', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3922, 749931, 2, 749930, '0', '北竿乡', '台湾,连江,北竿', '119.539704', '26.197364', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3923, 749938, 2, 749930, '0', '东引乡', '台湾,连江,东引', '119.539704', '26.197364', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3924, 749941, 2, 749930, '0', '莒光乡', '台湾,连江,莒光', '119.539704', '26.197364', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3925, 749947, 2, 749930, '0', '南竿乡', '台湾,连江,南竿', '119.539704', '26.197364', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3926, 749958, 2, 749957, '0', '褒忠乡', '台湾,云林,褒忠', '120.309069', '23.695652', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3927, 749991, 2, 749957, '0', '北港镇', '台湾,云林,北港', '120.296759', '23.572428', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3928, 750170, 2, 749957, '0', '莿桐乡', '台湾,云林,莿桐', '120.497033', '23.757251', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3929, 750218, 2, 749957, '0', '大埤乡', '台湾,云林,大埤', '120.527173', '23.696887', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3930, 750291, 2, 749957, '0', '东势乡', '台湾,云林,东势', '120.527173', '23.696887', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3931, 750363, 2, 749957, '0', '斗六市', '台湾,云林,斗六市', '120.527173', '23.696887', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3932, 750795, 2, 749957, '0', '斗南镇', '台湾,云林,斗南', '120.527173', '23.696887', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3933, 751009, 2, 749957, '0', '二崙乡', '台湾,云林,二崙', '120.527173', '23.696887', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3934, 751071, 2, 749957, '0', '古坑乡', '台湾,云林,古坑', '120.558553', '23.644734', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3935, 751147, 2, 749957, '0', '虎尾镇', '台湾,云林,虎尾', '120.429231', '23.707796', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3936, 751400, 2, 749957, '0', '口湖乡', '台湾,云林,口湖', '120.178640', '23.585506', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3937, 751493, 2, 749957, '0', '林内乡', '台湾,云林,林内', '120.527173', '23.696887', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3938, 751555, 2, 749957, '0', '崙背乡', '台湾,云林,崙背', '120.527173', '23.696887', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3939, 751674, 2, 749957, '0', '麦寮乡', '台湾,云林,麦寮', '120.527173', '23.696887', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3940, 751764, 2, 749957, '0', '水林乡', '台湾,云林,水林', '120.241228', '23.571067', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3941, 751832, 2, 749957, '0', '四湖乡', '台湾,云林,四湖', '120.220781', '23.635426', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3942, 751907, 2, 749957, '0', '臺西乡', '台湾,云林,臺西', '120.196139', '23.702821', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3943, 751956, 2, 749957, '0', '土库镇', '台湾,云林,土库', '120.527173', '23.696887', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3944, 752034, 2, 749957, '0', '西螺镇', '台湾,云林,西螺', '120.457123', '23.797412', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3945, 752149, 2, 749957, '0', '元长乡', '台湾,云林,元长', '120.311052', '23.649577', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3946, 752150, 1, 714368, '', '香港特别行政区', '香港特别行政区', '', '', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3947, 752151, 2, 752150, '', '中西区', '中西区', '', '', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3948, 752152, 2, 752150, '', '东区', '东区', '', '', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3949, 752153, 2, 752150, '', '九龙城区', '九龙城区', '', '', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3950, 752154, 2, 752150, '', '观塘区', '香港,九龙,观塘', '114.231268', '22.309430', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3951, 752155, 2, 752150, '', '南区', '香港,香港岛,南区', '114.174134', '22.246760', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3953, 752156, 2, 752150, '', '深水埗区', '香港特别行政区,香港特别行政区,深水埗区', '', '', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3954, 752157, 2, 752150, '', '湾仔区', '湾仔区', '', '', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3955, 752158, 2, 752150, '', '黄大仙区', '黄大仙区', '', '', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3956, 752159, 2, 752150, '', '油尖旺区', '油尖旺区', '', '', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3957, 752160, 2, 752150, '', '离岛区', '离岛区', '', '', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3958, 752161, 2, 752150, '', '葵青区', '葵青区', '', '', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3959, 752162, 2, 752150, '', '北区', '北区', '', '', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3960, 752163, 2, 752150, '', '西贡区', '西贡区', '', '', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3961, 752164, 2, 752150, '', '沙田区', '沙田区', '', '', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3962, 752165, 2, 752150, '', '屯门区', '屯门区', '', '', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3963, 752166, 2, 752150, '', '大埔区', '大埔区', '', '', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3964, 752167, 2, 752150, '', '荃湾区', '荃湾区', '', '', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3965, 752168, 2, 752150, '', '元朗区', '元朗区', '', '', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3966, 752169, 1, 714390, '', '澳门特别行政区', '澳门特别行政区', '', '', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3967, 752170, 2, 752169, '', '澳门半岛', '澳门半岛', '', '', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3968, 752171, 2, 752169, '', '凼仔', '凼仔', '', '', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3969, 752172, 2, 752169, '', '路凼城', '路凼城', '', '', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); -INSERT INTO `eb_system_city` VALUES (3970, 752173, 2, 752169, '', '路环', '路环', '', '', 1, '2021-07-16 11:33:35', '2021-07-16 11:33:35'); - --- ---------------------------- --- Table structure for eb_system_config --- ---------------------------- -DROP TABLE IF EXISTS `eb_system_config`; -CREATE TABLE `eb_system_config` ( - `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '配置id', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '字段名称', - `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '字段提示文字', - `form_id` int(10) NULL DEFAULT 0 COMMENT '表单id', - `value` varchar(5000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '值', - `status` tinyint(1) NULL DEFAULT 0 COMMENT '是否隐藏', - `create_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE, - INDEX `status+name`(`name`) USING BTREE, - INDEX `name`(`name`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 7814 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '配置表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of eb_system_config --- ---------------------------- -INSERT INTO `eb_system_config` VALUES (177, 'close_system', '', 0, '0', 0, '2020-05-14 15:20:25', '2020-05-14 16:37:47'); -INSERT INTO `eb_system_config` VALUES (195, 'store_postage', '', 0, '0', 0, '2020-05-14 15:20:25', '2020-05-14 16:37:47'); -INSERT INTO `eb_system_config` VALUES (202, 'main_business', '', 0, ' IT\\u79d1\\u6280 \\u4e92\\u8054\\u7f51|\\u7535\\u5b50\\u5546\\u52a1', 0, '2020-05-14 15:20:25', '2020-05-14 16:37:47'); -INSERT INTO `eb_system_config` VALUES (203, 'vice_business', '', 0, 'IT\\u79d1\\u6280 IT\\u8f6f\\u4ef6\\u4e0e\\u670d\\u52a1 ', 0, '2020-05-14 15:20:25', '2020-05-14 16:37:47'); -INSERT INTO `eb_system_config` VALUES (204, 'store_brokerage_rate_1', '', 0, '80', 0, '2020-05-14 15:20:25', '2020-07-14 16:44:50'); -INSERT INTO `eb_system_config` VALUES (205, 'user_extract_min_price', '', 0, '1', 0, '2020-05-14 15:20:25', '2020-05-14 16:37:47'); -INSERT INTO `eb_system_config` VALUES (206, 'sx_sign_min_int', '', 0, '1', 0, '2020-05-14 15:20:25', '2020-05-14 16:37:47'); -INSERT INTO `eb_system_config` VALUES (207, 'sx_sign_max_int', '', 0, '5', 0, '2020-05-14 15:20:25', '2020-05-14 16:37:47'); -INSERT INTO `eb_system_config` VALUES (208, 'about_us', '', 0, '', 0, '2020-05-14 15:20:25', '2020-05-14 16:37:47'); -INSERT INTO `eb_system_config` VALUES (218, 'store_brokerage_rate_2', '', 0, '60', 0, '2020-05-14 15:20:25', '2020-07-14 16:44:54'); -INSERT INTO `eb_system_config` VALUES (219, 'store_brokerage_status', 'store_brokerage_status', 0, '1', 0, '2020-05-14 15:20:25', '2020-08-05 17:42:38'); -INSERT INTO `eb_system_config` VALUES (227, 'user_extract_bank', '', 0, '中国银行\n建设银行\n农业银行', 0, '2020-05-14 15:20:25', '2020-06-09 17:43:00'); -INSERT INTO `eb_system_config` VALUES (228, 'fast_number', '', 0, '10', 0, '2020-05-14 15:20:25', '2020-05-14 16:37:47'); -INSERT INTO `eb_system_config` VALUES (229, 'bast_number', '', 0, '10', 0, '2020-05-14 15:20:25', '2020-05-14 16:37:47'); -INSERT INTO `eb_system_config` VALUES (230, 'first_number', '', 0, '10', 0, '2020-05-14 15:20:25', '2020-05-14 16:37:47'); -INSERT INTO `eb_system_config` VALUES (234, 'accessKey', '', 0, '111111', 0, '2020-05-14 15:20:25', '2020-06-03 17:20:54'); -INSERT INTO `eb_system_config` VALUES (235, 'secretKey', '', 0, '111111', 0, '2020-05-14 15:20:25', '2020-06-03 17:21:02'); -INSERT INTO `eb_system_config` VALUES (236, 'storage_name', '', 0, 'wuht-111111', 0, '2020-05-14 15:20:25', '2020-06-03 17:21:18'); -INSERT INTO `eb_system_config` VALUES (239, 'order_bargain_time', '', 0, '', 0, '2020-05-14 15:20:25', '2020-05-14 16:37:47'); -INSERT INTO `eb_system_config` VALUES (240, 'order_seckill_time', '', 0, '', 0, '2020-05-14 15:20:25', '2020-05-14 16:37:47'); -INSERT INTO `eb_system_config` VALUES (241, 'order_pink_time', '', 0, '', 0, '2020-05-14 15:20:25', '2020-05-14 16:37:47'); -INSERT INTO `eb_system_config` VALUES (242, 'storage_region', '', 0, 'ap-chengdu', 0, '2020-05-14 15:20:25', '2020-06-03 17:37:19'); -INSERT INTO `eb_system_config` VALUES (245, 'system_delivery_time', '', 0, '1', 0, '2020-05-14 15:20:25', '2020-05-14 16:37:47'); -INSERT INTO `eb_system_config` VALUES (254, 'cache_config', '', 0, '86400', 0, '2020-05-14 15:20:25', '2020-05-14 16:37:47'); -INSERT INTO `eb_system_config` VALUES (256, 'develop_id', '', 0, '', 0, '2020-05-14 15:20:25', '2020-05-14 16:37:47'); -INSERT INTO `eb_system_config` VALUES (257, 'printing_api_key', '', 0, '', 0, '2020-05-14 15:20:25', '2020-05-14 16:37:47'); -INSERT INTO `eb_system_config` VALUES (258, 'printing_client_id', '', 0, '', 0, '2020-05-14 15:20:25', '2020-05-14 16:37:47'); -INSERT INTO `eb_system_config` VALUES (259, 'terminal_number', '', 0, '', 0, '2020-05-14 15:20:25', '2020-05-14 16:37:47'); -INSERT INTO `eb_system_config` VALUES (262, 'confirmTakeOverSwitch', '', 0, '0', 0, '2020-05-14 15:20:25', '2020-06-17 09:34:31'); -INSERT INTO `eb_system_config` VALUES (267, 'new_goods_bananr', '', 0, '', 0, '2020-05-14 15:20:25', '2020-05-14 16:37:47'); -INSERT INTO `eb_system_config` VALUES (269, 'extract_time', '', 0, '0', 0, '2020-05-14 15:20:25', '2020-05-14 16:37:47'); -INSERT INTO `eb_system_config` VALUES (270, 'store_brokerage_price', '', 0, '1', 0, '2020-05-14 15:20:25', '2020-05-14 16:37:47'); -INSERT INTO `eb_system_config` VALUES (272, 'promotion_number', '', 0, '3', 0, '2020-05-14 15:20:25', '2020-05-14 16:37:47'); -INSERT INTO `eb_system_config` VALUES (278, 'form-1', '', 0, '{\n \"id\": 278,\n \"item\": [\n {\n \"name\": \"form-1-name\",\n \"value\": \"form-1-value\"\n },\n {\n \"name\": \"form-1-name1\",\n \"value\": \"form-1-value1\"\n }\n ]\n}', 0, '2020-05-14 16:57:27', '2020-05-14 17:07:04'); -INSERT INTO `eb_system_config` VALUES (645, 'importProductTB', '', 0, 'https://api03.1111.com/taobao/detail', 0, '2020-06-05 14:35:08', '2020-09-08 12:15:01'); -INSERT INTO `eb_system_config` VALUES (646, 'importProductJD', '', 0, 'https://api03.1111.com/jd/detail', 0, '2020-06-05 14:35:34', '2020-09-08 12:15:08'); -INSERT INTO `eb_system_config` VALUES (647, 'importProductSN', '', 0, 'https://api03.1111.com/suning/detail', 0, '2020-06-05 14:35:41', '2020-09-08 12:14:59'); -INSERT INTO `eb_system_config` VALUES (648, 'importProductPDD', '', 0, 'https://api03.1111.com/pdd/detail', 0, '2020-06-05 14:36:20', '2020-09-08 12:15:04'); -INSERT INTO `eb_system_config` VALUES (649, 'importProductTM', '', 0, 'https://api03.1111.com/tmall/detail', 0, '2020-06-09 14:24:32', '2020-09-08 12:14:57'); -INSERT INTO `eb_system_config` VALUES (657, 'sms_account', '', 0, '11111111111', 0, '2020-06-16 12:17:29', '2020-12-23 17:16:10'); -INSERT INTO `eb_system_config` VALUES (658, 'sms_token', '', 0, '123456', 0, '2020-06-16 12:17:35', '2020-12-23 17:16:09'); -INSERT INTO `eb_system_config` VALUES (988, 'integralRatio', 'integralRatio', 0, '0', 0, '2020-07-08 15:21:59', '2020-08-10 21:27:45'); -INSERT INTO `eb_system_config` VALUES (989, 'balance_func_status', 'balance_func_status', 0, '1', 0, '2020-07-09 10:09:33', '2020-07-14 19:02:16'); -INSERT INTO `eb_system_config` VALUES (991, 'brokerage_func_status', 'brokerage_func_status', 0, '1', 0, '2020-07-21 10:42:36', '2020-07-21 10:42:36'); -INSERT INTO `eb_system_config` VALUES (992, 'store_brokerage_ratio', 'store_brokerage_ratio', 0, '10', 0, '2020-07-21 10:45:10', '2020-12-18 11:34:26'); -INSERT INTO `eb_system_config` VALUES (993, 'store_brokerage_two', 'store_brokerage_two', 0, '5', 0, '2020-07-21 10:45:41', '2020-07-21 10:45:41'); -INSERT INTO `eb_system_config` VALUES (994, 'brokerage_bindind', 'brokerage_bindind', 0, '0', 0, '2020-07-21 15:29:25', '2020-07-21 15:29:25'); -INSERT INTO `eb_system_config` VALUES (2193, 'yunzhifu_appId', 'yunzhifu_appId', 121, '111111', 0, '2020-09-09 15:03:17', '2020-09-09 15:03:17'); -INSERT INTO `eb_system_config` VALUES (2194, 'yunzhifu_sign', 'yunzhifu_sign', 121, '111111', 0, '2020-09-09 15:03:17', '2020-09-09 15:03:17'); -INSERT INTO `eb_system_config` VALUES (3172, 'config_export_temp_id', 'config_export_temp_id', 0, '111111', 0, '2020-12-10 14:50:34', '2020-12-17 14:49:31'); -INSERT INTO `eb_system_config` VALUES (3173, 'config_export_id', 'config_export_id', 0, '23', 0, '2020-12-10 14:50:45', '2020-12-17 14:49:31'); -INSERT INTO `eb_system_config` VALUES (3174, 'config_export_com', 'config_export_com', 0, 'yuantongkuaiyun', 0, '2020-12-10 14:52:57', '2020-12-17 14:49:31'); -INSERT INTO `eb_system_config` VALUES (3396, 'importProductToken', 'importProductToken', 122, '111111', 0, '2020-12-22 16:11:25', '2020-12-22 16:11:25'); -INSERT INTO `eb_system_config` VALUES (4053, 'config_export_open', 'config_export_open', 129, '1', 0, '2021-02-04 11:21:21', '2021-02-04 11:21:21'); -INSERT INTO `eb_system_config` VALUES (4054, 'config_export_to_name', 'config_export_to_name', 129, '王大蛋', 0, '2021-02-04 11:21:21', '2021-02-04 11:21:21'); -INSERT INTO `eb_system_config` VALUES (4055, 'config_export_to_tel', 'config_export_to_tel', 129, '11111111111', 0, '2021-02-04 11:21:21', '2021-02-04 11:21:21'); -INSERT INTO `eb_system_config` VALUES (4056, 'config_export_to_address', 'config_export_to_address', 129, '陕西省西安市曲江新区', 0, '2021-02-04 11:21:21', '2021-02-04 11:21:21'); -INSERT INTO `eb_system_config` VALUES (4057, 'config_export_siid', 'config_export_siid', 129, '11111111111', 0, '2021-02-04 11:21:21', '2021-02-04 11:21:21'); -INSERT INTO `eb_system_config` VALUES (4410, 'bastInfo', 'bastInfo', 133, 'asda sd', 0, '2021-02-23 14:58:53', '2021-02-23 14:58:53'); -INSERT INTO `eb_system_config` VALUES (4411, 'firstInfo', 'firstInfo', 133, '1', 0, '2021-02-23 14:58:53', '2021-02-23 14:58:53'); -INSERT INTO `eb_system_config` VALUES (4412, 'salesInfo', 'salesInfo', 133, '1', 0, '2021-02-23 14:58:53', '2021-02-23 14:58:53'); -INSERT INTO `eb_system_config` VALUES (4413, 'hotInfo', 'hotInfo', 133, '1', 0, '2021-02-23 14:58:53', '2021-02-23 14:58:53'); -INSERT INTO `eb_system_config` VALUES (4432, 'offline_pay_status', 'offline_pay_status', 79, '0', 0, '2021-02-24 11:13:52', '2021-02-24 11:13:52'); -INSERT INTO `eb_system_config` VALUES (5736, 'system_product_copy_type', 'system_product_copy_type', 127, '1', 0, '2021-07-15 16:14:23', '2021-07-15 16:14:23'); -INSERT INTO `eb_system_config` VALUES (5737, 'copy_product_apikey', 'copy_product_apikey', 127, '111111', 0, '2021-07-15 16:14:24', '2021-07-15 16:14:24'); -INSERT INTO `eb_system_config` VALUES (5904, 'lowerOrderSwitch', 'lowerOrderSwitch', 111, '0', 0, '2021-07-16 09:47:20', '2021-07-16 09:47:20'); -INSERT INTO `eb_system_config` VALUES (5905, 'deliverGoodsSwitch', 'deliverGoodsSwitch', 111, '0', 0, '2021-07-16 09:47:20', '2021-07-16 09:47:20'); -INSERT INTO `eb_system_config` VALUES (5906, 'priceRevisionSwitch', 'priceRevisionSwitch', 111, '0', 0, '2021-07-16 09:47:20', '2021-07-16 09:47:20'); -INSERT INTO `eb_system_config` VALUES (5907, 'sms_code_expire', 'sms_code_expire', 111, '3', 0, '2021-07-16 09:47:20', '2021-07-16 09:47:20'); -INSERT INTO `eb_system_config` VALUES (5908, 'adminLowerOrderSwitch', 'adminLowerOrderSwitch', 111, '0', 0, '2021-07-16 09:47:20', '2021-07-16 09:47:20'); -INSERT INTO `eb_system_config` VALUES (5909, 'adminPaySuccessSwitch', 'adminPaySuccessSwitch', 111, '0', 0, '2021-07-16 09:47:20', '2021-07-16 09:47:20'); -INSERT INTO `eb_system_config` VALUES (5910, 'adminConfirmTakeOverSwitch', 'adminConfirmTakeOverSwitch', 111, '0', 0, '2021-07-16 09:47:20', '2021-07-16 09:47:20'); -INSERT INTO `eb_system_config` VALUES (5911, 'adminRefundSwitch', 'adminRefundSwitch', 111, '0', 0, '2021-07-16 09:47:20', '2021-07-16 09:47:20'); -INSERT INTO `eb_system_config` VALUES (5914, 'logistics_type', 'logistics_type', 128, '1', 0, '2021-07-16 09:55:24', '2021-07-16 09:55:24'); -INSERT INTO `eb_system_config` VALUES (5915, 'system_express_app_code', 'system_express_app_code', 128, '123123123123', 0, '2021-07-16 09:55:24', '2021-07-16 09:55:24'); -INSERT INTO `eb_system_config` VALUES (5916, 'change_color_config', 'change_color_config', 0, '4', 0, '2021-07-16 09:55:24', '2021-07-17 09:14:44'); -INSERT INTO `eb_system_config` VALUES (6041, 'yue_pay_status', 'yue_pay_status', 80, '1', 0, '2021-07-29 16:56:34', '2021-07-29 16:56:34'); -INSERT INTO `eb_system_config` VALUES (6081, 'category_page_config', 'category_page_config', 0, '1', 0, '2021-08-12 15:57:49', '2021-08-13 11:05:11'); -INSERT INTO `eb_system_config` VALUES (6082, 'is_show_category', 'is_show_category', 0, 'false', 0, '2021-08-12 15:59:56', '2021-08-13 11:05:14'); -INSERT INTO `eb_system_config` VALUES (6216, 'store_brokerage_quota', 'store_brokerage_quota', 0, '10', 0, '2021-07-16 09:55:24', '2021-07-16 09:55:24'); -INSERT INTO `eb_system_config` VALUES (6217, 'store_brokerage_is_bubble', 'store_brokerage_is_bubble', 0, '1', 0, '2021-08-18 11:57:17', '2021-08-18 12:23:14'); -INSERT INTO `eb_system_config` VALUES (6332, 'store_free_postage_switch', 'store_free_postage_switch', 74, 'true', 0, '2021-08-19 12:15:10', '2021-08-19 12:15:10'); -INSERT INTO `eb_system_config` VALUES (6333, 'store_free_postage', 'store_free_postage', 74, '0', 0, '2021-08-19 12:15:10', '2021-08-19 12:15:10'); -INSERT INTO `eb_system_config` VALUES (6334, 'tengxun_map_key', 'tengxun_map_key', 74, '11111111111', 0, '2021-08-19 12:15:10', '2021-08-19 12:15:10'); -INSERT INTO `eb_system_config` VALUES (6335, 'store_self_mention', 'store_self_mention', 74, 'true', 0, '2021-08-19 12:15:10', '2021-08-19 12:15:10'); -INSERT INTO `eb_system_config` VALUES (6417, 'APP_ID', '应用id', 1, '11111111111', 0, '2021-08-20 11:29:27', '2021-08-20 11:34:12'); -INSERT INTO `eb_system_config` VALUES (6418, 'APP_PRIVATE_KEY', '应用私钥', 1, '11111111111', 0, '2021-08-20 11:29:55', '2021-08-20 11:34:12'); -INSERT INTO `eb_system_config` VALUES (6419, 'CHARSET', '编码', 1, 'UTF-8', 0, '2021-08-20 11:30:13', '2021-08-20 11:34:13'); -INSERT INTO `eb_system_config` VALUES (6420, 'ALIPAY_PUBLIC_KEY', '支付宝公钥', 1, '11111111111', 0, '2021-08-20 11:30:32', '2021-08-20 11:34:13'); -INSERT INTO `eb_system_config` VALUES (6421, 'GETEWAY_URL', '网关', 1, '11111111111', 0, '2021-08-20 11:31:03', '2021-08-20 11:34:13'); -INSERT INTO `eb_system_config` VALUES (6422, 'FORMAT', '格式化', 1, 'json', 0, '2021-08-20 11:31:20', '2021-08-20 11:34:13'); -INSERT INTO `eb_system_config` VALUES (6423, 'SIGN_TYPE', '签名类型', 1, 'RSA2', 0, '2021-08-20 11:31:34', '2021-08-20 11:34:14'); -INSERT INTO `eb_system_config` VALUES (6424, 'NOTIFY', '回调地址', 1, 'http://localhost:8080/api/alipay/aliPayNotify', 0, '2021-08-20 11:39:54', '2021-08-20 11:40:11'); -INSERT INTO `eb_system_config` VALUES (6582, 'txUploadUrl', 'txUploadUrl', 83, 'https://wuht-11111111111.cos.ap-chengdu.myqcloud.com', 0, '2021-08-23 14:54:05', '2021-08-23 14:54:05'); -INSERT INTO `eb_system_config` VALUES (6583, 'txAccessKey', 'txAccessKey', 83, '11111111111', 0, '2021-08-23 14:54:05', '2021-08-23 14:54:05'); -INSERT INTO `eb_system_config` VALUES (6584, 'txSecretKey', 'txSecretKey', 83, '11111111111', 0, '2021-08-23 14:54:06', '2021-08-23 14:54:06'); -INSERT INTO `eb_system_config` VALUES (6585, 'txStorageName', 'txStorageName', 83, 'wuht-11111111111', 0, '2021-08-23 14:54:06', '2021-08-23 14:54:06'); -INSERT INTO `eb_system_config` VALUES (6586, 'txStorageRegion', 'txStorageRegion', 83, 'ap-chengdu', 0, '2021-08-23 14:54:06', '2021-08-23 14:54:06'); -INSERT INTO `eb_system_config` VALUES (6670, 'qnUploadUrl', 'qnUploadUrl', 82, 'https://qiniu.net', 0, '2021-08-23 18:01:03', '2021-08-23 18:01:03'); -INSERT INTO `eb_system_config` VALUES (6671, 'qnAccessKey', 'qnAccessKey', 82, '11111111111', 0, '2021-08-23 18:01:03', '2021-08-23 18:01:03'); -INSERT INTO `eb_system_config` VALUES (6672, 'qnSecretKey', 'qnSecretKey', 82, '11111111111', 0, '2021-08-23 18:01:03', '2021-08-23 18:01:03'); -INSERT INTO `eb_system_config` VALUES (6673, 'qnStorageName', 'qnStorageName', 82, 'crmeb-pro', 0, '2021-08-23 18:01:03', '2021-08-23 18:01:03'); -INSERT INTO `eb_system_config` VALUES (6674, 'qnStorageRegion', 'qnStorageRegion', 82, 'huabei', 0, '2021-08-23 18:01:03', '2021-08-23 18:01:03'); -INSERT INTO `eb_system_config` VALUES (6782, 'store_user_min_recharge', 'store_user_min_recharge', 78, '1', 0, '2021-08-23 18:55:52', '2021-08-23 18:55:52'); -INSERT INTO `eb_system_config` VALUES (6783, 'recharge_switch', 'recharge_switch', 78, 'true', 0, '2021-08-23 18:55:52', '2021-08-23 18:55:52'); -INSERT INTO `eb_system_config` VALUES (6784, 'recharge_attention', 'recharge_attention', 78, '1、充值金额最少为1元\n2、充值后只能用于消费\n3、提现金额需要手续费3%\n4、提现到账需要2~3天时间\n5、案件十大还是卡是今安徽省空间哈萨克就杀', 0, '2021-08-23 18:55:52', '2021-08-23 18:55:52'); -INSERT INTO `eb_system_config` VALUES (6814, 'alUploadUrl', 'alUploadUrl', 81, 'http://11111111111', 0, '2021-08-23 19:29:48', '2021-08-23 19:29:48'); -INSERT INTO `eb_system_config` VALUES (6815, 'alAccessKey', 'alAccessKey', 81, '11111111111', 0, '2021-08-23 19:29:48', '2021-08-23 19:29:48'); -INSERT INTO `eb_system_config` VALUES (6816, 'alSecretKey', 'alSecretKey', 81, '11111111111', 0, '2021-08-23 19:29:48', '2021-08-23 19:29:48'); -INSERT INTO `eb_system_config` VALUES (6817, 'alStorageName', 'alStorageName', 81, 'wuht', 0, '2021-08-23 19:29:48', '2021-08-23 19:29:48'); -INSERT INTO `eb_system_config` VALUES (6818, 'alStorageRegion', 'alStorageRegion', 81, '11111111111', 0, '2021-08-23 19:29:48', '2021-08-23 19:29:48'); -INSERT INTO `eb_system_config` VALUES (7178, 'homePageSaleListStyle', '', 0, '1', 0, '2021-10-28 09:27:31', '2021-10-28 09:27:31'); -INSERT INTO `eb_system_config` VALUES (7368, 'crmeb_tongji_js', 'crmeb_tongji_js', 141, '(function() {\n var _s = document.createElement(\'script\');\n _s.src=\"https://kefu.crmeb.net/customerServer.js\";\n _s.onload = function(){\n var option = {\n authInit:true,\n openUrl:\"https://kefu.crmeb.net\",\n token: \"4109fbb2d7bc3d5559348278816a20bc\",\n isShowTip:true,\n version:\"java\",\n windowStyle:\"center\",\n kefu_id:12\n };\n var canCustomerServer = new initCustomerServer(option);\n canCustomerServer.init();\n\n }\n document.head.appendChild(_s)\n})();', 0, '2021-11-30 15:38:14', '2021-11-30 15:38:14'); -INSERT INTO `eb_system_config` VALUES (7369, 'step', '', 0, '4', 0, '2021-12-03 14:12:20', '2021-12-03 14:12:20'); -INSERT INTO `eb_system_config` VALUES (7370, 'routine_appid', 'routine_appid', 66, '11111111111', 0, '2021-12-03 14:35:04', '2021-12-03 14:35:04'); -INSERT INTO `eb_system_config` VALUES (7371, 'routine_appsecret', 'routine_appsecret', 66, '11111111111', 0, '2021-12-03 14:35:04', '2021-12-03 14:35:04'); -INSERT INTO `eb_system_config` VALUES (7372, 'routine_name', 'routine_name', 66, '一码秦川', 0, '2021-12-03 14:35:04', '2021-12-03 14:35:04'); -INSERT INTO `eb_system_config` VALUES (7519, 'yzf_h5_url', 'yzf_h5_url', 76, 'https://cschat.antcloud.com.cn/index.htm', 0, '2021-12-10 12:15:43', '2021-12-10 12:15:43'); -INSERT INTO `eb_system_config` VALUES (7520, 'consumer_hotline', 'consumer_hotline', 76, '13800000000', 0, '2021-12-10 12:15:43', '2021-12-10 12:15:43'); -INSERT INTO `eb_system_config` VALUES (7521, 'telephone_service_switch', 'telephone_service_switch', 76, 'true', 0, '2021-12-10 12:15:43', '2021-12-10 12:15:43'); -INSERT INTO `eb_system_config` VALUES (7602, 'ylyprint_app_id', 'ylyprint_app_id', 143, '11111111111', 0, '2021-12-10 16:52:39', '2021-12-10 16:52:39'); -INSERT INTO `eb_system_config` VALUES (7603, 'ylyprint_app_secret', 'ylyprint_app_secret', 143, '11111111111', 0, '2021-12-10 16:52:39', '2021-12-10 16:52:39'); -INSERT INTO `eb_system_config` VALUES (7604, 'ylyprint_app_machine_code', 'ylyprint_app_machine_code', 143, '11111111111', 0, '2021-12-10 16:52:39', '2021-12-10 16:52:39'); -INSERT INTO `eb_system_config` VALUES (7605, 'ylyprint_app_machine_msign', 'ylyprint_app_machine_msign', 143, '11111111111', 0, '2021-12-10 16:52:39', '2021-12-10 16:52:39'); -INSERT INTO `eb_system_config` VALUES (7606, 'ylyprint_auto_status', 'ylyprint_auto_status', 143, '\'1\'', 0, '2021-12-10 16:52:39', '2021-12-10 16:52:39'); -INSERT INTO `eb_system_config` VALUES (7607, 'ylyprint_status', 'ylyprint_status', 143, '\'0\'', 0, '2021-12-10 16:52:39', '2021-12-10 16:52:39'); -INSERT INTO `eb_system_config` VALUES (7632, 'pay_routine_appid', 'pay_routine_appid', 68, '11111111111', 0, '2021-12-10 18:12:35', '2021-12-10 18:12:35'); -INSERT INTO `eb_system_config` VALUES (7633, 'pay_routine_appsecret', 'pay_routine_appsecret', 68, '11111111111', 0, '2021-12-10 18:12:35', '2021-12-10 18:12:35'); -INSERT INTO `eb_system_config` VALUES (7634, 'pay_routine_mchid', 'pay_routine_mchid', 68, '11111111111', 0, '2021-12-10 18:12:35', '2021-12-10 18:12:35'); -INSERT INTO `eb_system_config` VALUES (7635, 'pay_routine_key', 'pay_routine_key', 68, '11111111111', 0, '2021-12-10 18:12:35', '2021-12-10 18:12:35'); -INSERT INTO `eb_system_config` VALUES (7636, 'pay_mini_client_p12', 'pay_mini_client_p12', 68, 'file/operation11111111111.p12', 0, '2021-12-10 18:12:35', '2021-12-10 18:12:35'); -INSERT INTO `eb_system_config` VALUES (7637, 'pay_routine_certificate_path', 'pay_routine_certificate_path', 68, '/www/wwwroot/11111111111.p12', 0, '2021-12-10 18:12:35', '2021-12-10 18:12:35'); -INSERT INTO `eb_system_config` VALUES (7648, 'pay_weixin_appid', 'pay_weixin_appid', 67, '11111111111', 0, '2021-12-10 18:19:01', '2021-12-10 18:19:01'); -INSERT INTO `eb_system_config` VALUES (7649, 'pay_weixin_appsecret', 'pay_weixin_appsecret', 67, '11111111111', 0, '2021-12-10 18:19:01', '2021-12-10 18:19:01'); -INSERT INTO `eb_system_config` VALUES (7650, 'pay_weixin_mchid', 'pay_weixin_mchid', 67, '11111111111', 0, '2021-12-10 18:19:01', '2021-12-10 18:19:01'); -INSERT INTO `eb_system_config` VALUES (7651, 'pay_routine_client_p12', 'pay_routine_client_p12', 67, 'file/operation11111111111.p12', 0, '2021-12-10 18:19:01', '2021-12-10 18:19:01'); -INSERT INTO `eb_system_config` VALUES (7652, 'pay_weixin_certificate_path', 'pay_weixin_certificate_path', 67, '/www/wwwroot/11111111111.p12', 0, '2021-12-10 18:19:01', '2021-12-10 18:19:01'); -INSERT INTO `eb_system_config` VALUES (7653, 'pay_weixin_key', 'pay_weixin_key', 67, '11111111111', 0, '2021-12-10 18:19:01', '2021-12-10 18:19:01'); -INSERT INTO `eb_system_config` VALUES (7654, 'pay_weixin_open', 'pay_weixin_open', 67, '1', 0, '2021-12-10 18:19:01', '2021-12-10 18:19:01'); -INSERT INTO `eb_system_config` VALUES (7655, 'paydir', 'paydir', 67, '', 0, '2021-12-10 18:19:01', '2021-12-10 18:19:01'); -INSERT INTO `eb_system_config` VALUES (7689, 'authHost', '', 0, 'https://alimama.com', 0, '2021-12-14 16:21:32', '2021-12-14 16:21:32'); -INSERT INTO `eb_system_config` VALUES (7719, 'integral_ratio', 'integral_ratio', 109, '0.5', 0, '2021-12-21 15:01:12', '2021-12-21 15:01:12'); -INSERT INTO `eb_system_config` VALUES (7720, 'order_give_integral', 'order_give_integral', 109, '1', 0, '2021-12-21 15:01:12', '2021-12-21 15:01:12'); -INSERT INTO `eb_system_config` VALUES (7721, 'freeze_integral_day', 'freeze_integral_day', 109, '0', 0, '2021-12-21 15:01:12', '2021-12-21 15:01:12'); -INSERT INTO `eb_system_config` VALUES (7751, 'store_stock', 'store_stock', 77, '20', 0, '2021-12-25 12:18:52', '2021-12-25 12:18:52'); -INSERT INTO `eb_system_config` VALUES (7752, 'stor_reason', 'stor_reason', 77, '收货地址填错了\n与描述不符 \n信息填错了，重新拍 \n收到商品损坏了 \n未按预定时间发货 \n其它原因\n测试111', 0, '2021-12-25 12:18:52', '2021-12-25 12:18:52'); -INSERT INTO `eb_system_config` VALUES (7753, 'mobile_top_logo', 'mobile_top_logo', 77, 'crmebimage/public/maintain/2021/12/25/7de81090b87a4325a603e056a660c620q50t3etnee.png', 0, '2021-12-25 12:18:52', '2021-12-25 12:18:52'); -INSERT INTO `eb_system_config` VALUES (7754, 'mobile_login_logo', 'mobile_login_logo', 77, 'crmebimage/public/maintain/2021/12/25/8cf6cd4fd29c4a59a094ba028c8f3f4czyd21fctzc.png', 0, '2021-12-25 12:18:52', '2021-12-25 12:18:52'); -INSERT INTO `eb_system_config` VALUES (7755, 'order_cancel_time', 'order_cancel_time', 77, '1', 0, '2021-12-25 12:18:52', '2021-12-25 12:18:52'); -INSERT INTO `eb_system_config` VALUES (7756, 'order_activity_time', 'order_activity_time', 77, '1', 0, '2021-12-25 12:18:52', '2021-12-25 12:18:52'); -INSERT INTO `eb_system_config` VALUES (7757, 'site_name', 'site_name', 77, '一码秦川', 0, '2021-12-25 12:18:52', '2021-12-25 12:18:52'); -INSERT INTO `eb_system_config` VALUES (7758, 'site_url', 'site_url', 77, 'https://app.net', 0, '2021-12-25 12:18:52', '2021-12-25 12:18:52'); -INSERT INTO `eb_system_config` VALUES (7759, 'seo_title', 'seo_title', 77, '一码秦川', 0, '2021-12-25 12:18:52', '2021-12-25 12:18:52'); -INSERT INTO `eb_system_config` VALUES (7760, 'news_slides_limit', 'news_slides_limit', 77, '3', 0, '2021-12-25 12:18:52', '2021-12-25 12:18:52'); -INSERT INTO `eb_system_config` VALUES (7761, 'front_api_url', 'front_api_url', 77, 'http://127.0.0.1:8081', 0, '2021-12-25 12:18:52', '2021-12-25 12:18:52'); -INSERT INTO `eb_system_config` VALUES (7777, 'wechat_appid', 'wechat_appid', 65, '11111111111', 0, '2021-12-25 12:26:14', '2021-12-25 12:26:14'); -INSERT INTO `eb_system_config` VALUES (7778, 'wechat_appsecret', 'wechat_appsecret', 65, '11111111111', 0, '2021-12-25 12:26:14', '2021-12-25 12:26:14'); -INSERT INTO `eb_system_config` VALUES (7779, 'field101', 'field101', 65, 'crmebJava', 0, '2021-12-25 12:26:14', '2021-12-25 12:26:14'); -INSERT INTO `eb_system_config` VALUES (7780, 'field103', 'field103', 65, '11111111111', 0, '2021-12-25 12:26:14', '2021-12-25 12:26:14'); -INSERT INTO `eb_system_config` VALUES (7781, 'field104', 'field104', 65, '1', 0, '2021-12-25 12:26:14', '2021-12-25 12:26:14'); -INSERT INTO `eb_system_config` VALUES (7782, 'wechat_share_img', 'wechat_share_img', 65, 'crmebimage/public/maintain/2021/12/25/8cf6cd4fd29c4a59a094ba028c8f3f4czyd21fctzc.png', 0, '2021-12-25 12:26:14', '2021-12-25 12:26:14'); -INSERT INTO `eb_system_config` VALUES (7783, 'wechat_qrcode', 'wechat_qrcode', 65, 'crmebimage/public/operation/2021/12/25/0427b90c74b64a03ae3e7e5c628ef7d69038aimgou.jpg', 0, '2021-12-25 12:26:14', '2021-12-25 12:26:14'); -INSERT INTO `eb_system_config` VALUES (7784, 'wechat_share_title', 'wechat_share_title', 65, '一码秦川', 0, '2021-12-25 12:26:14', '2021-12-25 12:26:14'); -INSERT INTO `eb_system_config` VALUES (7785, 'wechat_share_synopsis', 'wechat_share_synopsis', 65, '一码秦川', 0, '2021-12-25 12:26:14', '2021-12-25 12:26:14'); -INSERT INTO `eb_system_config` VALUES (7786, 'h5_avatar', 'h5_avatar', 65, 'crmebimage/public/operation/2021/12/25/0427b90c74b64a03ae3e7e5c628ef7d69038aimgou.jpg', 0, '2021-12-25 12:26:14', '2021-12-25 12:26:14'); -INSERT INTO `eb_system_config` VALUES (7802, 'api_url', 'api_url', 64, 'http://127.0.0.1:8080', 0, '2021-12-25 16:53:20', '2021-12-25 16:53:20'); -INSERT INTO `eb_system_config` VALUES (7803, 'site_logo_lefttop', 'site_logo_lefttop', 64, 'crmebimage/public/operation/2021/12/25/6d292f4a663a453e8bcc9410eda89db55z1vksp7fx.png', 0, '2021-12-25 16:53:20', '2021-12-25 16:53:20'); -INSERT INTO `eb_system_config` VALUES (7804, 'site_logo_square', 'site_logo_square', 64, 'crmebimage/public/maintain/2021/12/25/8cf6cd4fd29c4a59a094ba028c8f3f4czyd21fctzc.png', 0, '2021-12-25 16:53:20', '2021-12-25 16:53:20'); -INSERT INTO `eb_system_config` VALUES (7805, 'site_logo_login', 'site_logo_login', 64, 'crmebimage/public/maintain/2021/12/25/8cf6cd4fd29c4a59a094ba028c8f3f4czyd21fctzc.png', 0, '2021-12-25 16:53:20', '2021-12-25 16:53:20'); -INSERT INTO `eb_system_config` VALUES (7806, 'admin_login_bg_pic', 'admin_login_bg_pic', 64, 'crmebimage/public/maintain/2021/12/25/0016d1efa86d41e38e76801a7cd743c6wcupy21hvb.jpg', 0, '2021-12-25 16:53:20', '2021-12-25 16:53:20'); -INSERT INTO `eb_system_config` VALUES (7807, 'localUploadUrl', 'localUploadUrl', 108, 'http://127.0.0.1:8080', 0, '2021-12-30 15:17:28', '2021-12-30 15:17:28'); -INSERT INTO `eb_system_config` VALUES (7808, 'image_ext_str', 'image_ext_str', 108, 'jpg,jpeg,gif,png,bmp,PNG,JPG,mp4', 0, '2021-12-30 15:17:28', '2021-12-30 15:17:28'); -INSERT INTO `eb_system_config` VALUES (7809, 'image_max_size', 'image_max_size', 108, '10', 0, '2021-12-30 15:17:28', '2021-12-30 15:17:28'); -INSERT INTO `eb_system_config` VALUES (7810, 'file_ext_str', 'file_ext_str', 108, 'zip,doc,docx,xls,xlsx,pdf,mp3,wma,wav,amr,mp4', 0, '2021-12-30 15:17:28', '2021-12-30 15:17:28'); -INSERT INTO `eb_system_config` VALUES (7811, 'file_max_size', 'file_max_size', 108, '20', 0, '2021-12-30 15:17:28', '2021-12-30 15:17:28'); -INSERT INTO `eb_system_config` VALUES (7812, 'uploadType', 'uploadType', 108, '1', 0, '2021-12-30 15:17:28', '2021-12-30 15:17:28'); -INSERT INTO `eb_system_config` VALUES (7813, 'file_is_save', 'file_is_save', 108, '1', 0, '2021-12-30 15:17:28', '2021-12-30 15:17:28'); - --- ---------------------------- --- Table structure for eb_system_form_temp --- ---------------------------- -DROP TABLE IF EXISTS `eb_system_form_temp`; -CREATE TABLE `eb_system_form_temp` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '表单模板id', - `name` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '表单名称', - `info` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '表单简介', - `content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '表单内容', - `create_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 144 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '表单模板' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of eb_system_form_temp --- ---------------------------- -INSERT INTO `eb_system_form_temp` VALUES (64, '基础配置', '系统设置-基础配置', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":300,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"Api地址【支付回调】\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"api_url\",\"placeholder\":\"webSiet网站地址Api地址【支付回调】Api地址【支付回调】\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"\",\"show-word-limit\":true,\"readonly\":false,\"disabled\":false},{\"__config__\":{\"label\":\"左上角菜单logo(236x64)\",\"tag\":\"self-upload\",\"tagIcon\":\"upload\",\"layout\":\"colFormItem\",\"defaultValue\":null,\"showLabel\":true,\"labelWidth\":null,\"required\":true,\"span\":24,\"showTip\":false,\"buttonText\":\"点击上传\",\"regList\":[],\"changeTag\":true,\"fileSize\":2,\"sizeUnit\":\"MB\",\"document\":\"https://element.eleme.cn/#/zh-CN/component/upload\",\"formId\":124,\"renderKey\":1595658064081,\"tips\":false},\"__slot__\":{\"list-type\":true},\"action\":\"https://jsonplaceholder.typicode.com/posts/\",\"disabled\":true,\"accept\":\"\",\"name\":\"file\",\"auto-upload\":true,\"list-type\":\"picture-card\",\"multiple\":false,\"__vModel__\":\"site_logo_lefttop\"},{\"__config__\":{\"label\":\"左上角缩回菜单logo(164x164)\",\"tag\":\"self-upload\",\"tagIcon\":\"upload\",\"layout\":\"colFormItem\",\"defaultValue\":null,\"showLabel\":true,\"labelWidth\":null,\"required\":true,\"span\":24,\"showTip\":false,\"buttonText\":\"点击上传\",\"regList\":[],\"changeTag\":true,\"fileSize\":2,\"sizeUnit\":\"MB\",\"document\":\"https://element.eleme.cn/#/zh-CN/component/upload\",\"formId\":127,\"renderKey\":1595658695317,\"tips\":false},\"__slot__\":{\"list-type\":true},\"action\":\"https://jsonplaceholder.typicode.com/posts/\",\"disabled\":true,\"accept\":\"\",\"name\":\"file\",\"auto-upload\":true,\"list-type\":\"text\",\"multiple\":false,\"__vModel__\":\"site_logo_square\"},{\"__config__\":{\"label\":\"登录页logo(164x164)\",\"tag\":\"self-upload\",\"tagIcon\":\"upload\",\"layout\":\"colFormItem\",\"defaultValue\":null,\"showLabel\":true,\"labelWidth\":null,\"required\":true,\"span\":24,\"showTip\":false,\"buttonText\":\"点击上传\",\"regList\":[],\"changeTag\":true,\"fileSize\":2,\"sizeUnit\":\"MB\",\"document\":\"https://element.eleme.cn/#/zh-CN/component/upload\",\"formId\":101,\"renderKey\":1612510257294,\"tips\":false},\"__slot__\":{\"list-type\":true},\"action\":\"https://jsonplaceholder.typicode.com/posts/\",\"disabled\":true,\"accept\":\"\",\"name\":\"file\",\"auto-upload\":true,\"list-type\":\"picture-card\",\"multiple\":false,\"__vModel__\":\"site_logo_login\"},{\"__config__\":{\"label\":\"登录页背景图(1920x1080)\",\"tag\":\"self-upload\",\"tagIcon\":\"upload\",\"layout\":\"colFormItem\",\"defaultValue\":null,\"showLabel\":true,\"labelWidth\":null,\"required\":true,\"span\":24,\"showTip\":false,\"buttonText\":\"点击上传\",\"regList\":[],\"changeTag\":true,\"fileSize\":2,\"sizeUnit\":\"MB\",\"document\":\"https://element.eleme.cn/#/zh-CN/component/upload\",\"formId\":152,\"renderKey\":1596017451389,\"tips\":false},\"__slot__\":{\"list-type\":true},\"action\":\"https://jsonplaceholder.typicode.com/posts/\",\"disabled\":true,\"accept\":\"\",\"name\":\"file\",\"auto-upload\":true,\"list-type\":\"text\",\"multiple\":false,\"__vModel__\":\"admin_login_bg_pic\"}]}', '2020-05-15 17:20:10', '2021-12-23 14:21:01'); -INSERT INTO `eb_system_form_temp` VALUES (65, '公众号配置', '应用配置', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":170,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"AppId\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":104,\"renderKey\":1589942266186,\"tips\":true,\"tipsIsLink\":true,\"tipsLink\":\"http://help.crmeb.net/crmeb_java/2103932\",\"tipsDesc\":\"点击查看详细\"},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入AppId\",\"style\":{\"width\":\"80%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"wechat_appid\"},{\"__config__\":{\"label\":\"AppSecret\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":105,\"renderKey\":1589942280095,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入AppSecret\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"wechat_appsecret\"},{\"__config__\":{\"label\":\"微信验证Token\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":101,\"renderKey\":1613723085302,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入微信验证Token\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"field101\"},{\"__config__\":{\"label\":\"EncodingAESKey\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":103,\"renderKey\":1613723136701,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入EncodingAESKey\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"field103\"},{\"__config__\":{\"label\":\"消息加密方式\",\"labelWidth\":null,\"showLabel\":true,\"tag\":\"el-radio-group\",\"tagIcon\":\"radio\",\"changeTag\":true,\"layout\":\"colFormItem\",\"span\":24,\"optionType\":\"default\",\"regList\":[],\"required\":true,\"border\":false,\"document\":\"https://element.eleme.cn/#/zh-CN/component/radio\",\"formId\":104,\"renderKey\":1613723166459,\"tips\":false},\"__slot__\":{\"options\":[{\"label\":\"明文模式\",\"value\":1},{\"label\":\"兼容模式\",\"value\":2},{\"label\":\"安全模式\",\"value\":3}]},\"style\":{},\"size\":\"medium\",\"disabled\":false,\"__vModel__\":\"field104\"},{\"__config__\":{\"label\":\"微信分享图片(400x400)\",\"tag\":\"self-upload\",\"tagIcon\":\"selfUpload\",\"layout\":\"colFormItem\",\"defaultValue\":null,\"showLabel\":true,\"labelWidth\":null,\"required\":false,\"span\":24,\"showTip\":false,\"buttonText\":\"点击上传\",\"regList\":[],\"changeTag\":true,\"fileSize\":2,\"sizeUnit\":\"MB\",\"document\":\"https://element.eleme.cn/#/zh-CN/component/upload\",\"formId\":123,\"renderKey\":1597063713790,\"tips\":false},\"__slot__\":{\"list-type\":true},\"action\":\"https://jsonplaceholder.typicode.com/posts/\",\"disabled\":true,\"accept\":\"\",\"name\":\"file\",\"auto-upload\":true,\"list-type\":\"text\",\"multiple\":false,\"__vModel__\":\"wechat_share_img\"},{\"__config__\":{\"label\":\"公众号关联二维码\",\"tag\":\"self-upload\",\"tagIcon\":\"selfUpload\",\"layout\":\"colFormItem\",\"defaultValue\":null,\"showLabel\":true,\"labelWidth\":null,\"required\":false,\"span\":24,\"showTip\":false,\"buttonText\":\"点击上传\",\"regList\":[],\"changeTag\":true,\"fileSize\":2,\"sizeUnit\":\"MB\",\"document\":\"https://element.eleme.cn/#/zh-CN/component/upload\",\"formId\":124,\"renderKey\":1597063784328,\"tips\":false},\"__slot__\":{\"list-type\":true},\"action\":\"https://jsonplaceholder.typicode.com/posts/\",\"disabled\":true,\"accept\":\"\",\"name\":\"file\",\"auto-upload\":true,\"list-type\":\"text\",\"multiple\":false,\"__vModel__\":\"wechat_qrcode\"},{\"__config__\":{\"label\":\"微信分享标题\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":135,\"renderKey\":1591000910252,\"defaultValue\":\"CRMEB\",\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入微信分享标题\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"wechat_share_title\"},{\"__config__\":{\"label\":\"微信分享简介\",\"labelWidth\":null,\"showLabel\":true,\"tag\":\"el-input\",\"tagIcon\":\"textarea\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"regList\":[],\"changeTag\":true,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"formId\":136,\"renderKey\":1591001203576,\"defaultValue\":\"CRMEB\",\"tips\":false},\"type\":\"textarea\",\"placeholder\":\"请输入微信分享简介\",\"autosize\":{\"minRows\":4,\"maxRows\":4},\"style\":{\"width\":\"100%\"},\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"wechat_share_synopsis\"},{\"__config__\":{\"label\":\"用户H5默认头像(90x90)\",\"tag\":\"self-upload\",\"tagIcon\":\"selfUpload\",\"layout\":\"colFormItem\",\"defaultValue\":null,\"showLabel\":true,\"labelWidth\":null,\"required\":false,\"span\":24,\"showTip\":false,\"buttonText\":\"点击上传\",\"regList\":[],\"changeTag\":true,\"fileSize\":2,\"sizeUnit\":\"MB\",\"document\":\"https://element.eleme.cn/#/zh-CN/component/upload\",\"formId\":126,\"renderKey\":1597063821840,\"tips\":false},\"__slot__\":{\"list-type\":true},\"action\":\"https://jsonplaceholder.typicode.com/posts/\",\"disabled\":true,\"accept\":\"\",\"name\":\"file\",\"auto-upload\":true,\"list-type\":\"text\",\"multiple\":false,\"__vModel__\":\"h5_avatar\"}]}', '2020-05-15 17:22:16', '2021-12-23 14:24:23'); -INSERT INTO `eb_system_form_temp` VALUES (66, '小程序配置', '应用配置', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":140,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"appId\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":101,\"renderKey\":1589942764174,\"tips\":true,\"tipsIsLink\":true,\"tipsLink\":\"http://help.crmeb.net/crmeb_java/2095774\",\"tipsDesc\":\"点击查看详细\"},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入appId\",\"style\":{\"width\":\"80%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"routine_appid\"},{\"__config__\":{\"label\":\"AppSecret\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":102,\"renderKey\":1589942771851,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入AppSecret\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"routine_appsecret\"},{\"__config__\":{\"label\":\"小程序名称\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":104,\"renderKey\":1589942826385,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入小程序名称\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"routine_name\"}]}', '2020-05-15 17:39:17', '2021-11-02 16:46:29'); -INSERT INTO `eb_system_form_temp` VALUES (67, '公众号支付配置', '支付配置', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":150,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"appId\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":101,\"renderKey\":1589942880822,\"tips\":true,\"tipsIsLink\":true,\"tipsLink\":\"http://help.crmeb.net/crmeb_java/2095783\",\"tipsDesc\":\"点击查看详细\"},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入appId\",\"style\":{\"width\":\"80%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"pay_weixin_appid\"},{\"__config__\":{\"label\":\"Appsecret\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":102,\"renderKey\":1589942891565,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入Appsecret\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"pay_weixin_appsecret\"},{\"__config__\":{\"label\":\"Mchid\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":103,\"renderKey\":1589942909192,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入Mchid\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"pay_weixin_mchid\"},{\"__config__\":{\"label\":\"公众号商户证书\",\"tag\":\"upload-file\",\"tagIcon\":\"uploadPicture\",\"layout\":\"colFormItem\",\"defaultValue\":null,\"showLabel\":true,\"labelWidth\":null,\"required\":false,\"span\":24,\"showTip\":false,\"buttonText\":\"点击上传\",\"regList\":[],\"changeTag\":true,\"document\":\"https://element.eleme.cn/#/zh-CN/component/upload\",\"formId\":101,\"renderKey\":1606895770397,\"tips\":false},\"__slot__\":{\"list-type\":true},\"name\":\"upfile\",\"__vModel__\":\"pay_routine_client_p12\"},{\"__config__\":{\"label\":\"商户证书绝对路径\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":101,\"renderKey\":1620460466542,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入商户证书绝对路径商户证书绝对路径商户证书绝对路径\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"pay_weixin_certificate_path\"},{\"__config__\":{\"label\":\"Key\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":106,\"renderKey\":1589942961506,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入Key\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"pay_weixin_key\"},{\"__config__\":{\"label\":\"微信支付\",\"labelWidth\":null,\"showLabel\":true,\"tag\":\"el-radio-group\",\"tagIcon\":\"radio\",\"changeTag\":true,\"layout\":\"colFormItem\",\"span\":24,\"optionType\":\"default\",\"regList\":[],\"required\":true,\"border\":false,\"document\":\"https://element.eleme.cn/#/zh-CN/component/radio\",\"formId\":107,\"renderKey\":1589942970321,\"defaultValue\":1,\"tips\":false},\"__slot__\":{\"options\":[{\"label\":\"开启\",\"value\":1},{\"label\":\"关闭\",\"value\":2}]},\"style\":{},\"size\":\"medium\",\"disabled\":false,\"__vModel__\":\"pay_weixin_open\"},{\"__config__\":{\"label\":\"配置目录\",\"labelWidth\":null,\"showLabel\":true,\"tag\":\"el-input\",\"tagIcon\":\"textarea\",\"required\":false,\"layout\":\"colFormItem\",\"span\":24,\"regList\":[],\"changeTag\":true,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"formId\":108,\"renderKey\":1589942998404,\"tips\":false},\"type\":\"textarea\",\"placeholder\":\"请输入配置目录\",\"autosize\":{\"minRows\":4,\"maxRows\":4},\"style\":{\"width\":\"100%\"},\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"paydir\"}]}', '2020-05-16 10:19:37', '2021-11-02 16:47:12'); -INSERT INTO `eb_system_form_temp` VALUES (68, '小程序支付配置', '支付配置', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":150,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"Appid\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":101,\"renderKey\":1589943059385,\"tips\":true,\"tipsIsLink\":true,\"tipsLink\":\"http://help.crmeb.net/crmeb_java/2095784\",\"tipsDesc\":\"点击查看详细\"},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入Appid\",\"style\":{\"width\":\"80%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"pay_routine_appid\"},{\"__config__\":{\"label\":\"Appsecret\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":102,\"renderKey\":1589943069474,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入Appsecret\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"pay_routine_appsecret\"},{\"__config__\":{\"label\":\"Mchid\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":103,\"renderKey\":1589943084448,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入Mchid\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"pay_routine_mchid\"},{\"__config__\":{\"label\":\"Key\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":104,\"renderKey\":1589943093596,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入Key\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"pay_routine_key\"},{\"__config__\":{\"label\":\"小程序商户证书\",\"tag\":\"upload-file\",\"tagIcon\":\"uploadPicture\",\"layout\":\"colFormItem\",\"defaultValue\":null,\"showLabel\":true,\"labelWidth\":null,\"required\":true,\"span\":24,\"showTip\":false,\"buttonText\":\"点击上传\",\"regList\":[],\"changeTag\":true,\"document\":\"https://element.eleme.cn/#/zh-CN/component/upload\",\"formId\":101,\"renderKey\":1606877259081,\"tips\":false},\"__slot__\":{\"list-type\":true},\"name\":\"upfile\",\"__vModel__\":\"pay_mini_client_p12\"},{\"__config__\":{\"label\":\"商户证书绝对路径\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":101,\"renderKey\":1620461041708,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"商户证书绝对路径商户证书绝对路径\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"pay_routine_certificate_path\"}]}', '2020-05-16 10:35:06', '2021-11-02 16:46:15'); -INSERT INTO `eb_system_form_temp` VALUES (70, '编辑城市', '编辑城市', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"上级名称\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":false,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[]},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"parentName\",\"placeholder\":\"上级名称\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":11,\"show-word-limit\":false,\"readonly\":true,\"disabled\":false},{\"__config__\":{\"label\":\"名称\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":109,\"renderKey\":1589790937111},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入名称\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"20\",\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"name\"}]}', '2020-05-18 16:39:58', '2021-08-14 16:43:09'); -INSERT INTO `eb_system_form_temp` VALUES (71, '添加物流公司', '添加物流公司', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"公司名称\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"defaultValue\":\"\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[]},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"name\",\"placeholder\":\"请输入公司名称公司名称公司名称公司名称\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":11,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false},{\"__config__\":{\"label\":\"编码\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":false,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":109,\"renderKey\":1589858082280},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入编码\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"code\"},{\"__config__\":{\"label\":\"排序\",\"showLabel\":true,\"changeTag\":true,\"labelWidth\":0,\"tag\":\"el-input-number\",\"tagIcon\":\"number\",\"span\":24,\"layout\":\"colFormItem\",\"required\":false,\"regList\":[],\"document\":\"https://element.eleme.cn/#/zh-CN/component/input-number\",\"formId\":114,\"renderKey\":1589858279409,\"defaultValue\":0},\"placeholder\":\"0\",\"step\":1,\"step-strictly\":true,\"controls-position\":\"right\",\"disabled\":false,\"__vModel__\":\"sort\",\"min\":0},{\"__config__\":{\"label\":\"单选框组\",\"labelWidth\":null,\"showLabel\":true,\"tag\":\"el-radio-group\",\"tagIcon\":\"radio\",\"changeTag\":true,\"layout\":\"colFormItem\",\"span\":24,\"optionType\":\"default\",\"regList\":[],\"required\":true,\"border\":false,\"document\":\"https://element.eleme.cn/#/zh-CN/component/radio\",\"formId\":101,\"renderKey\":1597721904770,\"defaultValue\":0},\"__slot__\":{\"options\":[{\"label\":\"隐藏\",\"value\":0},{\"label\":\"显示\",\"value\":1}]},\"style\":{},\"size\":\"medium\",\"disabled\":false,\"__vModel__\":\"isShow\"}]}', '2020-05-19 11:17:03', '2020-08-18 11:46:40'); -INSERT INTO `eb_system_form_temp` VALUES (72, '上传文件配置-基础配置', '上传文件配置-基础配置', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":130,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"layout\":\"rowFormItem\",\"tagIcon\":\"row\",\"label\":\"行容器\",\"layoutTree\":true,\"children\":[],\"document\":\"https://element.eleme.cn/#/zh-CN/component/layout\",\"formId\":101,\"span\":24,\"renderKey\":1592474288129,\"componentName\":\"row101\",\"gutter\":15},\"type\":\"default\",\"justify\":\"start\",\"align\":\"top\"}]}', '2020-05-19 17:10:40', '2020-06-18 17:58:09'); -INSERT INTO `eb_system_form_temp` VALUES (74, '物流配置', '物流配置', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":23,\"formBtns\":true,\"unFocusedComponentBorder\":false,\"fields\":[{\"__config__\":{\"label\":\"全场满额包邮开关\",\"labelWidth\":180,\"showLabel\":true,\"tag\":\"el-radio-group\",\"tagIcon\":\"radio\",\"changeTag\":true,\"layout\":\"colFormItem\",\"span\":23,\"optionType\":\"default\",\"regList\":[],\"required\":false,\"border\":false,\"document\":\"https://element.eleme.cn/#/zh-CN/component/radio\",\"formId\":102,\"renderKey\":1613806479762,\"defaultValue\":false,\"tips\":false},\"__slot__\":{\"options\":[{\"label\":\"关闭\",\"value\":\"false\"},{\"label\":\"开启\",\"value\":\"true\"}]},\"style\":{},\"size\":\"medium\",\"disabled\":false,\"__vModel__\":\"store_free_postage_switch\"},{\"__config__\":{\"label\":\"全场满额包邮（元）\",\"showLabel\":true,\"changeTag\":true,\"labelWidth\":180,\"tag\":\"el-input-number\",\"tagIcon\":\"number\",\"span\":18,\"layout\":\"colFormItem\",\"required\":false,\"regList\":[],\"document\":\"https://element.eleme.cn/#/zh-CN/component/input-number\",\"formId\":101,\"renderKey\":1589939942507,\"defaultValue\":1,\"tips\":false},\"placeholder\":\"全场满额包邮（元）全场满额包邮（元）全场满额包邮（元）\",\"step\":1,\"step-strictly\":true,\"controls-position\":\"right\",\"disabled\":false,\"__vModel__\":\"store_free_postage\",\"min\":0},{\"__config__\":{\"label\":\"腾讯地图KEY\",\"labelWidth\":180,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":false,\"layout\":\"colFormItem\",\"span\":23,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":105,\"renderKey\":1589940263502,\"tips\":true,\"tipsIsLink\":true,\"tipsLink\":\"http://help.crmeb.net/crmeb_java/2275635\",\"tipsDesc\":\"点击查看详细\"},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入腾讯地图KEY\",\"style\":{\"width\":\"80%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"tengxun_map_key\"},{\"__config__\":{\"label\":\"是否开启提货点自提\",\"labelWidth\":180,\"showLabel\":true,\"tag\":\"el-radio-group\",\"tagIcon\":\"radio\",\"changeTag\":true,\"layout\":\"colFormItem\",\"span\":23,\"optionType\":\"default\",\"regList\":[],\"required\":false,\"border\":false,\"document\":\"https://element.eleme.cn/#/zh-CN/component/radio\",\"formId\":107,\"renderKey\":1589940326254,\"defaultValue\":false,\"tips\":false},\"__slot__\":{\"options\":[{\"label\":\"关闭\",\"value\":\"false\"},{\"label\":\"开启\",\"value\":\"true\"}]},\"style\":{},\"size\":\"medium\",\"disabled\":false,\"__vModel__\":\"store_self_mention\"}]}', '2020-05-20 10:07:14', '2021-11-02 17:00:22'); -INSERT INTO `eb_system_form_temp` VALUES (76, '云智服', '云智服', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":120,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"客服H5链接\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":101,\"renderKey\":1599641784700,\"tips\":true,\"tipsIsLink\":true,\"tipsLink\":\"http://help.crmeb.net/crmeb_java/2322225\",\"tipsDesc\":\"点击查看详细\"},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入客服H5链接\",\"style\":{\"width\":\"80%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"yzf_h5_url\"},{\"__config__\":{\"label\":\"客服电话\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"info\":false,\"desc\":\"\",\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":102,\"renderKey\":1634805887754,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入客服电话\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"consumer_hotline\"},{\"__config__\":{\"label\":\"电话服务\",\"tag\":\"el-switch\",\"tagIcon\":\"switch\",\"defaultValue\":false,\"span\":24,\"showLabel\":true,\"labelWidth\":null,\"layout\":\"colFormItem\",\"required\":true,\"info\":true,\"desc\":\"开启电话服务后，移动端点击客服直接唤起拨号\",\"regList\":[],\"changeTag\":true,\"document\":\"https://element.eleme.cn/#/zh-CN/component/switch\",\"formId\":103,\"renderKey\":1634805899756,\"tips\":false},\"style\":{},\"disabled\":false,\"active-text\":\"\",\"inactive-text\":\"\",\"active-color\":null,\"inactive-color\":null,\"active-value\":true,\"inactive-value\":false,\"__vModel__\":\"telephone_service_switch\"}]}', '2020-05-21 11:07:21', '2021-11-02 16:43:06'); -INSERT INTO `eb_system_form_temp` VALUES (77, '商城基础配置', '商城配置-商城基础配置', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":300,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"警戒库存\",\"showLabel\":true,\"changeTag\":true,\"labelWidth\":300,\"tag\":\"el-input-number\",\"tagIcon\":\"number\",\"span\":24,\"layout\":\"colFormItem\",\"required\":true,\"regList\":[],\"document\":\"https://element.eleme.cn/#/zh-CN/component/input-number\",\"formId\":102,\"renderKey\":1590032029141,\"defaultValue\":2,\"tips\":false},\"placeholder\":\"警戒库存\",\"step\":1,\"step-strictly\":false,\"controls-position\":\"\",\"disabled\":false,\"__vModel__\":\"store_stock\",\"max\":99999,\"min\":0},{\"__config__\":{\"label\":\"退货理由\",\"labelWidth\":300,\"showLabel\":true,\"tag\":\"el-input\",\"tagIcon\":\"textarea\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"regList\":[],\"changeTag\":true,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"formId\":103,\"renderKey\":1590032054065,\"defaultValue\":\"收货地址填错了 与描述不符 信息填错了，重新拍 收到商品损坏了 未按预定时间发货 其它原因\",\"tips\":false},\"type\":\"textarea\",\"placeholder\":\"请填写退货理由退货理由\",\"autosize\":{\"minRows\":4,\"maxRows\":4},\"style\":{\"width\":\"100%\"},\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"stor_reason\"},{\"__config__\":{\"label\":\"移动端顶部logo图标(127*45)\",\"tag\":\"self-upload\",\"tagIcon\":\"upload\",\"layout\":\"colFormItem\",\"defaultValue\":null,\"showLabel\":true,\"labelWidth\":300,\"required\":true,\"span\":24,\"showTip\":false,\"buttonText\":\"点击上传\",\"regList\":[],\"changeTag\":true,\"fileSize\":2,\"sizeUnit\":\"MB\",\"document\":\"https://element.eleme.cn/#/zh-CN/component/upload\",\"formId\":124,\"renderKey\":1595659136385,\"tips\":false},\"__slot__\":{\"list-type\":true},\"action\":\"https://jsonplaceholder.typicode.com/posts/\",\"disabled\":true,\"accept\":\"\",\"name\":\"file\",\"auto-upload\":true,\"list-type\":\"text\",\"multiple\":false,\"__vModel__\":\"mobile_top_logo\"},{\"__config__\":{\"label\":\"移动端登录页logo(90x90)\",\"tag\":\"self-upload\",\"tagIcon\":\"upload\",\"layout\":\"colFormItem\",\"defaultValue\":null,\"showLabel\":true,\"labelWidth\":300,\"required\":true,\"span\":24,\"showTip\":false,\"buttonText\":\"点击上传\",\"regList\":[],\"changeTag\":true,\"fileSize\":2,\"sizeUnit\":\"MB\",\"document\":\"https://element.eleme.cn/#/zh-CN/component/upload\",\"formId\":102,\"renderKey\":1629094835969,\"tips\":false},\"__slot__\":{\"list-type\":true},\"action\":\"https://jsonplaceholder.typicode.com/posts/\",\"disabled\":true,\"accept\":\"\",\"name\":\"file\",\"auto-upload\":true,\"list-type\":\"text\",\"multiple\":false,\"__vModel__\":\"mobile_login_logo\"},{\"__config__\":{\"label\":\"普通商品未支付取消订单时间(单位:小时)\",\"showLabel\":true,\"changeTag\":true,\"labelWidth\":300,\"tag\":\"el-input-number\",\"tagIcon\":\"number\",\"span\":24,\"layout\":\"colFormItem\",\"required\":true,\"regList\":[],\"document\":\"https://element.eleme.cn/#/zh-CN/component/input-number\",\"formId\":105,\"renderKey\":1590032096481,\"defaultValue\":2,\"tips\":false},\"placeholder\":\"普通商品未支付取消订单时间(单位:小时)\",\"step\":1,\"step-strictly\":false,\"controls-position\":\"\",\"disabled\":false,\"__vModel__\":\"order_cancel_time\",\"max\":99999,\"min\":0,\"precision\":0},{\"__config__\":{\"label\":\"活动商品未支付取消订单时间(单位小时)\",\"showLabel\":true,\"changeTag\":true,\"labelWidth\":300,\"tag\":\"el-input-number\",\"tagIcon\":\"number\",\"span\":24,\"layout\":\"colFormItem\",\"required\":true,\"regList\":[],\"document\":\"https://element.eleme.cn/#/zh-CN/component/input-number\",\"formId\":106,\"renderKey\":1590032112020,\"defaultValue\":2,\"tips\":false},\"placeholder\":\"活动商品未支付取消订单时间(单位:小时)\",\"step\":1,\"step-strictly\":false,\"controls-position\":\"\",\"disabled\":false,\"__vModel__\":\"order_activity_time\",\"max\":99999,\"min\":0,\"precision\":0},{\"__config__\":{\"label\":\"网站名称\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":101,\"renderKey\":1629086692739,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入网站名称\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"site_name\"},{\"__config__\":{\"label\":\"网站地址\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":102,\"renderKey\":1629086763346,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"webSiet网站地址网站地址网站地址\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":true,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"site_url\"},{\"__config__\":{\"label\":\"SEO标题\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":102,\"renderKey\":1629087874359,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入SEO标题\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"seo_title\"},{\"__config__\":{\"label\":\"新闻幻灯片数量上限\",\"showLabel\":true,\"changeTag\":true,\"labelWidth\":null,\"tag\":\"el-input-number\",\"tagIcon\":\"number\",\"span\":24,\"layout\":\"colFormItem\",\"required\":true,\"regList\":[],\"document\":\"https://element.eleme.cn/#/zh-CN/component/input-number\",\"formId\":101,\"renderKey\":1629087608122,\"defaultValue\":1,\"tips\":false},\"placeholder\":\"新闻幻灯片数量上限新闻幻灯片数量上限新闻幻灯片数量上限新闻幻灯片数量上限\",\"step\":1,\"step-strictly\":false,\"controls-position\":\"\",\"disabled\":false,\"__vModel__\":\"news_slides_limit\",\"min\":1,\"max\":3},{\"__config__\":{\"label\":\"移动商城api\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":101,\"renderKey\":1639127436585,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"移动商城api_小程序源码下载前必须配置\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":true,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"front_api_url\"}]}', '2020-05-16 10:19:37', '2021-12-23 14:15:09'); -INSERT INTO `eb_system_form_temp` VALUES (78, '充值配置', '商城配置-充值配置', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":200,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"用户最低充值金额\",\"showLabel\":true,\"changeTag\":true,\"labelWidth\":null,\"tag\":\"el-input-number\",\"tagIcon\":\"number\",\"span\":24,\"layout\":\"colFormItem\",\"required\":true,\"regList\":[],\"document\":\"https://element.eleme.cn/#/zh-CN/component/input-number\",\"formId\":101,\"renderKey\":1590032399200,\"defaultValue\":1},\"placeholder\":\"用户最低充值金额\",\"step\":1,\"step-strictly\":false,\"controls-position\":\"\",\"disabled\":false,\"__vModel__\":\"store_user_min_recharge\",\"min\":1,\"precision\":2},{\"__config__\":{\"label\":\"小程序充值开关\",\"labelWidth\":null,\"showLabel\":true,\"tag\":\"el-radio-group\",\"tagIcon\":\"radio\",\"changeTag\":true,\"layout\":\"colFormItem\",\"span\":24,\"optionType\":\"default\",\"regList\":[],\"required\":true,\"border\":false,\"document\":\"https://element.eleme.cn/#/zh-CN/component/radio\",\"formId\":102,\"renderKey\":1590032438060,\"defaultValue\":\"true\"},\"__slot__\":{\"options\":[{\"label\":\"开启\",\"value\":\"true\"},{\"label\":\"关闭\",\"value\":\"false\"}]},\"style\":{},\"size\":\"medium\",\"disabled\":false,\"__vModel__\":\"recharge_switch\"},{\"__config__\":{\"label\":\"充值注意事项\",\"labelWidth\":null,\"showLabel\":true,\"tag\":\"el-input\",\"tagIcon\":\"textarea\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"regList\":[],\"changeTag\":true,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"formId\":103,\"renderKey\":1590032466493,\"defaultValue\":\"充值后帐户的金额不能提现，可用于商城消费使用 佣金导入账户之后不能再次导出、不可提现 账户充值出现问题可联系商城客服，也可拨打商城客服热线：4008888888\"},\"type\":\"textarea\",\"placeholder\":\"请输入充值注意事项\",\"autosize\":{\"minRows\":4,\"maxRows\":4},\"style\":{\"width\":\"100%\"},\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"recharge_attention\"}]}', '2020-05-21 11:41:45', '2021-07-22 09:32:00'); -INSERT INTO `eb_system_form_temp` VALUES (79, '线下支付', '支付设置-线下支付', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":150,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"线下支付状态\",\"labelWidth\":null,\"showLabel\":true,\"tag\":\"el-radio-group\",\"tagIcon\":\"radio\",\"changeTag\":true,\"layout\":\"colFormItem\",\"span\":24,\"optionType\":\"default\",\"regList\":[],\"required\":true,\"border\":false,\"document\":\"https://element.eleme.cn/#/zh-CN/component/radio\",\"formId\":101,\"renderKey\":1590041613118,\"defaultValue\":1},\"__slot__\":{\"options\":[{\"label\":\"开启\",\"value\":1},{\"label\":\"关闭\",\"value\":0}]},\"style\":{},\"size\":\"medium\",\"disabled\":false,\"__vModel__\":\"offline_pay_status\"}]}', '2020-05-21 14:14:10', '2021-01-09 11:26:55'); -INSERT INTO `eb_system_form_temp` VALUES (80, '余额支付', '支付配置-余额支付', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":150,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"余额支付状态\",\"labelWidth\":null,\"showLabel\":true,\"tag\":\"el-radio-group\",\"tagIcon\":\"radio\",\"changeTag\":true,\"layout\":\"colFormItem\",\"span\":24,\"optionType\":\"default\",\"regList\":[],\"required\":true,\"border\":false,\"document\":\"https://element.eleme.cn/#/zh-CN/component/radio\",\"formId\":101,\"renderKey\":1590041613118,\"defaultValue\":0},\"__slot__\":{\"options\":[{\"label\":\"开启\",\"value\":1},{\"label\":\"关闭\",\"value\":0}]},\"style\":{},\"size\":\"medium\",\"disabled\":false,\"__vModel__\":\"yue_pay_status\"}]}', '2020-05-21 14:14:49', '2021-01-08 11:52:28'); -INSERT INTO `eb_system_form_temp` VALUES (81, '阿里云配置', '阿里云配置', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":150,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"空间域名 Domain\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":101,\"renderKey\":1590041796581,\"tips\":true,\"tipsIsLink\":true,\"tipsLink\":\"https://doc.crmeb.com/web/java/crmeb_java/701\",\"tipsDesc\":\"地址怎么配置？\",\"defaultValue\":\"http://yourdomain\"},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入单行文本空间域名 Domain空间域名 Domain\",\"style\":{\"width\":\"80%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"alUploadUrl\"},{\"__config__\":{\"label\":\"accessKey\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":102,\"renderKey\":1590041835433,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入单行文本accessKey\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"alAccessKey\"},{\"__config__\":{\"label\":\"secretKey\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":103,\"renderKey\":1590041835651,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入单行文本secretKey\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"alSecretKey\"},{\"__config__\":{\"label\":\"存储空间名称\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":104,\"renderKey\":1590041835857,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入单行文本存储空间名称\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"alStorageName\"},{\"__config__\":{\"label\":\"所属地域\",\"showLabel\":true,\"labelWidth\":null,\"tag\":\"el-select\",\"tagIcon\":\"select\",\"layout\":\"colFormItem\",\"span\":24,\"required\":true,\"regList\":[],\"changeTag\":true,\"document\":\"https://element.eleme.cn/#/zh-CN/component/select\",\"formId\":101,\"renderKey\":1629717898666,\"tips\":false},\"__slot__\":{\"options\":[{\"label\":\"华北2（北京）｜11111111111\",\"value\":\"11111111111\"},{\"label\":\"华北 3（张家口）｜oss-cn-zhangjiakou.aliyuncs.com\",\"value\":\"oss-cn-zhangjiakou.aliyuncs.com\"},{\"label\":\"华东1（杭州）｜oss-cn-hangzhou.aliyuncs.com\",\"value\":\"oss-cn-hangzhou.aliyuncs.com\"},{\"label\":\"华东2（上海）｜oss-cn-shanghai.aliyuncs.com\",\"value\":\"oss-cn-shanghai.aliyuncs.com\"},{\"label\":\"华北1（青岛）｜oss-cn-qingdao.aliyuncs.com\",\"value\":\"oss-cn-qingdao.aliyuncs.com\"},{\"label\":\"华北5（呼和浩特）｜oss-cn-huhehaote.aliyuncs.com\",\"value\":\"oss-cn-huhehaote.aliyuncs.com\"},{\"label\":\"华北6（乌兰察布）｜oss-cn-wulanchabu.aliyuncs.com\",\"value\":\"oss-cn-wulanchabu.aliyuncs.com\"},{\"label\":\"华南1（深圳）｜oss-cn-shenzhen.aliyuncs.com\",\"value\":\"oss-cn-shenzhen.aliyuncs.com\"},{\"label\":\"华南2（河源）｜oss-cn-heyuan.aliyuncs.com\",\"value\":\"oss-cn-heyuan.aliyuncs.com\"},{\"label\":\"华南3（广州）｜oss-cn-guangzhou.aliyuncs.com\",\"value\":\"oss-cn-guangzhou.aliyuncs.com\"},{\"label\":\"西南1（成都）｜oss-cn-chengdu.aliyuncs.com\",\"value\":\"oss-cn-chengdu.aliyuncs.com\"},{\"label\":\"华南2（河源）｜oss-cn-heyuan.aliyuncs.com\",\"value\":\"oss-cn-heyuan.aliyuncs.com\"},{\"label\":\"华南3（广州）｜oss-cn-guangzhou.aliyuncs.com\",\"value\":\"oss-cn-guangzhou.aliyuncs.com\"},{\"label\":\"西南1（成都）｜oss-cn-chengdu.aliyuncs.com\",\"value\":\"oss-cn-chengdu.aliyuncs.com\"},{\"label\":\"中国（香港）｜oss-cn-hongkong.aliyuncs.com\",\"value\":\"oss-cn-hongkong.aliyuncs.com\"},{\"label\":\"美国西部1（硅谷）｜oss-us-west-1.aliyuncs.com\",\"value\":\"oss-us-west-1.aliyuncs.com\"},{\"label\":\"美国东部1（弗吉尼亚）｜oss-us-east-1.aliyuncs.com\",\"value\":\"oss-us-east-1.aliyuncs.com\"},{\"label\":\"亚太东南1（新加坡）｜oss-ap-southeast-1.aliyuncs.com\",\"value\":\"oss-ap-southeast-1.aliyuncs.com\"},{\"label\":\"亚太东南2（悉尼）｜oss-ap-southeast-2.aliyuncs.com\",\"value\":\"oss-ap-southeast-2.aliyuncs.com\"},{\"label\":\"亚太东南3（吉隆坡）｜oss-ap-southeast-3.aliyuncs.com\",\"value\":\"oss-ap-southeast-3.aliyuncs.com\"},{\"label\":\"亚太东南5（雅加达）｜oss-ap-southeast-5.aliyuncs.com\",\"value\":\"oss-ap-southeast-5.aliyuncs.com\"},{\"label\":\"亚太东北1（日本）｜oss-ap-northeast-1.aliyuncs.com\",\"value\":\"oss-ap-northeast-1.aliyuncs.com\"},{\"label\":\"亚太南部1（孟买）｜oss-ap-south-1.aliyuncs.com\",\"value\":\"oss-ap-south-1.aliyuncs.com\"},{\"label\":\"欧洲中部1（法兰克福）｜oss-eu-central-1.aliyuncs.com\",\"value\":\"oss-eu-central-1.aliyuncs.com\"},{\"label\":\"英国（伦敦）｜oss-eu-west-1.aliyuncs.com\",\"value\":\"oss-eu-west-1.aliyuncs.com\"},{\"label\":\"中东东部1（迪拜）｜oss-me-east-1.aliyuncs.com\",\"value\":\"oss-me-east-1.aliyuncs.com\"}]},\"placeholder\":\"请选择下拉选择所属地域所属地域所属地域所属地域\",\"style\":{\"width\":\"100%\"},\"clearable\":false,\"disabled\":false,\"filterable\":false,\"multiple\":false,\"__vModel__\":\"alStorageRegion\"}]}', '2020-05-21 14:18:12', '2021-12-24 11:11:12'); -INSERT INTO `eb_system_form_temp` VALUES (82, '七牛云配置', '七牛云配置', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":150,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"空间域名 Domain\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":101,\"renderKey\":1590041796581,\"tips\":true,\"tipsIsLink\":true,\"tipsLink\":\"http://help.crmeb.net/crmeb_java/2102105\",\"tipsDesc\":\"点击查看详细\"},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入单行文本空间域名 Domain\",\"style\":{\"width\":\"80%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"qnUploadUrl\"},{\"__config__\":{\"label\":\"accessKey\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":102,\"renderKey\":1590041835433,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入单行文本accessKey\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"qnAccessKey\"},{\"__config__\":{\"label\":\"qnSecretKey\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":103,\"renderKey\":1590041835651,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入单行文本qnSecretKey\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"qnSecretKey\"},{\"__config__\":{\"label\":\"存储空间名称\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":104,\"renderKey\":1590041835857,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入单行文本存储空间名称\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"qnStorageName\"},{\"__config__\":{\"label\":\"所属地域\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":105,\"renderKey\":1590041836043,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入单行文本所属地域\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"qnStorageRegion\"}]}', '2020-05-21 14:18:29', '2021-11-02 16:53:27'); -INSERT INTO `eb_system_form_temp` VALUES (83, '腾讯云配置', '腾讯云配置', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":150,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"空间域名 Domain\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":101,\"renderKey\":1590041796581,\"tips\":true,\"tipsIsLink\":true,\"tipsLink\":\"http://help.crmeb.net/crmeb_java/2102106\",\"tipsDesc\":\"点击查看详细\"},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入单行文本空间域名 Domain\",\"style\":{\"width\":\"80%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"txUploadUrl\"},{\"__config__\":{\"label\":\"accessKey\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":102,\"renderKey\":1590041835433,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入单行文本accessKeyaccessKeyaccessKeyaccessKey\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"txAccessKey\"},{\"__config__\":{\"label\":\"secretKey\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":103,\"renderKey\":1590041835651,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入单行文本secretKey\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"txSecretKey\"},{\"__config__\":{\"label\":\"存储空间名称\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":104,\"renderKey\":1590041835857,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入单行文本存储空间名称\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"txStorageName\"},{\"__config__\":{\"label\":\"所属地域\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":105,\"renderKey\":1590041836043,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入单行文本所属地域\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"txStorageRegion\"}]}', '2020-05-21 14:18:46', '2021-11-02 16:52:54'); -INSERT INTO `eb_system_form_temp` VALUES (84, '微信菜单编辑', '微信菜单编辑', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"菜单名称\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":101,\"renderKey\":1590118075352},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入菜单名称\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"name\"},{\"__config__\":{\"label\":\"规则状态\",\"showLabel\":true,\"labelWidth\":null,\"tag\":\"el-select\",\"tagIcon\":\"select\",\"layout\":\"colFormItem\",\"span\":24,\"required\":true,\"regList\":[],\"changeTag\":true,\"document\":\"https://element.eleme.cn/#/zh-CN/component/select\",\"formId\":103,\"renderKey\":1590118119244},\"__slot__\":{\"options\":[{\"label\":\"关键字\",\"value\":1},{\"label\":\"跳转网页\",\"value\":2},{\"label\":\"小程序\",\"value\":3}]},\"placeholder\":\"请选择规则状态\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"disabled\":false,\"filterable\":false,\"multiple\":false,\"__vModel__\":\"type\"},{\"__config__\":{\"label\":\"关键字\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":102,\"renderKey\":1590118097394},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入关键字\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"key\"}]}', '2020-05-22 11:29:22', '2020-05-22 15:56:20'); -INSERT INTO `eb_system_form_temp` VALUES (86, '秒杀配置', '秒杀配置', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":158,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"开始时间(整数小时)\",\"showLabel\":true,\"changeTag\":true,\"labelWidth\":null,\"tag\":\"el-input-number\",\"tagIcon\":\"number\",\"span\":24,\"layout\":\"colFormItem\",\"required\":true,\"regList\":[],\"document\":\"https://element.eleme.cn/#/zh-CN/component/input-number\",\"formId\":101,\"renderKey\":1590387965990},\"placeholder\":\"计数器开始时间(整数小时)\",\"step\":1,\"step-strictly\":false,\"controls-position\":\"\",\"disabled\":false,\"__vModel__\":\"field101\"},{\"__config__\":{\"label\":\"持续时间(整数小时)\",\"showLabel\":true,\"changeTag\":true,\"labelWidth\":null,\"tag\":\"el-input-number\",\"tagIcon\":\"number\",\"span\":24,\"layout\":\"colFormItem\",\"required\":true,\"regList\":[],\"document\":\"https://element.eleme.cn/#/zh-CN/component/input-number\",\"formId\":102,\"renderKey\":1590388014422},\"placeholder\":\"计数器持续时间(整数小时)\",\"step\":1,\"step-strictly\":false,\"controls-position\":\"\",\"disabled\":false,\"__vModel__\":\"field102\"},{\"__config__\":{\"label\":\"幻灯片\",\"tag\":\"el-upload\",\"tagIcon\":\"upload\",\"layout\":\"colFormItem\",\"defaultValue\":null,\"showLabel\":true,\"labelWidth\":null,\"required\":false,\"span\":24,\"showTip\":false,\"buttonText\":\"点击上传\",\"regList\":[],\"changeTag\":true,\"fileSize\":2,\"sizeUnit\":\"MB\",\"document\":\"https://element.eleme.cn/#/zh-CN/component/upload\",\"formId\":103,\"renderKey\":1590388029048},\"__slot__\":{\"list-type\":true},\"action\":\"https://jsonplaceholder.typicode.com/posts/\",\"disabled\":false,\"accept\":\"\",\"name\":\"file\",\"auto-upload\":true,\"list-type\":\"picture-card\",\"multiple\":false,\"__vModel__\":\"field103\"},{\"__config__\":{\"label\":\"排序\",\"showLabel\":true,\"changeTag\":true,\"labelWidth\":null,\"tag\":\"el-input-number\",\"tagIcon\":\"number\",\"span\":24,\"layout\":\"colFormItem\",\"required\":true,\"regList\":[],\"document\":\"https://element.eleme.cn/#/zh-CN/component/input-number\",\"formId\":104,\"renderKey\":1590388040940,\"defaultValue\":0},\"placeholder\":\"排序\",\"step\":1,\"step-strictly\":false,\"controls-position\":\"\",\"disabled\":false,\"__vModel__\":\"field104\"},{\"__config__\":{\"label\":\"状态\",\"labelWidth\":null,\"showLabel\":true,\"tag\":\"el-radio-group\",\"tagIcon\":\"radio\",\"changeTag\":true,\"layout\":\"colFormItem\",\"span\":24,\"optionType\":\"default\",\"regList\":[],\"required\":true,\"border\":false,\"document\":\"https://element.eleme.cn/#/zh-CN/component/radio\",\"formId\":106,\"renderKey\":1590388076282,\"defaultValue\":\"‘0’\"},\"__slot__\":{\"options\":[{\"label\":\"显示\",\"value\":\"‘0’\"},{\"label\":\"隐藏\",\"value\":\"‘1’\"}]},\"style\":{},\"size\":\"medium\",\"disabled\":false,\"__vModel__\":\"field106\"},{\"__config__\":{\"label\":\"我是梁总\",\"tag\":\"el-checkbox-group\",\"tagIcon\":\"checkbox\",\"defaultValue\":[],\"span\":24,\"showLabel\":true,\"labelWidth\":null,\"layout\":\"colFormItem\",\"optionType\":\"default\",\"required\":true,\"regList\":[],\"changeTag\":true,\"border\":false,\"document\":\"https://element.eleme.cn/#/zh-CN/component/checkbox\",\"formId\":101,\"renderKey\":1616152329724},\"__slot__\":{\"options\":[{\"label\":\"选项一\",\"value\":1},{\"label\":\"选项二\",\"value\":2}]},\"style\":{},\"size\":\"medium\",\"disabled\":false,\"__vModel__\":\"field101\"}]}', '2020-05-25 14:28:50', '2021-03-19 19:12:19'); -INSERT INTO `eb_system_form_temp` VALUES (87, '签到', '签到', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"显示标题\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[]},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"title\",\"placeholder\":\"请输入显示标题显示标题显示标题显示标题显示标题显示标题显示标题\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"el-icon-mobile\",\"suffix-icon\":\"\",\"maxlength\":\"3\",\"show-word-limit\":true,\"readonly\":false,\"disabled\":false},{\"__config__\":{\"label\":\"第几天\",\"showLabel\":true,\"changeTag\":true,\"labelWidth\":null,\"tag\":\"el-input-number\",\"tagIcon\":\"number\",\"span\":24,\"layout\":\"colFormItem\",\"required\":true,\"regList\":[],\"document\":\"https://element.eleme.cn/#/zh-CN/component/input-number\",\"formId\":127,\"renderKey\":1590647892129,\"defaultValue\":1},\"placeholder\":\"第几天第几天\",\"step\":1,\"step-strictly\":false,\"controls-position\":\"\",\"disabled\":false,\"__vModel__\":\"day\",\"min\":0},{\"__config__\":{\"label\":\"积分\",\"showLabel\":true,\"changeTag\":true,\"labelWidth\":null,\"tag\":\"el-input-number\",\"tagIcon\":\"number\",\"span\":24,\"layout\":\"colFormItem\",\"required\":true,\"regList\":[],\"document\":\"https://element.eleme.cn/#/zh-CN/component/input-number\",\"formId\":129,\"renderKey\":1590649451776,\"defaultValue\":1},\"placeholder\":\"积分值\",\"step\":1,\"step-strictly\":false,\"controls-position\":\"\",\"disabled\":false,\"__vModel__\":\"integral\",\"min\":1},{\"__config__\":{\"label\":\"经验\",\"showLabel\":true,\"changeTag\":true,\"labelWidth\":null,\"tag\":\"el-input-number\",\"tagIcon\":\"number\",\"span\":24,\"layout\":\"colFormItem\",\"required\":true,\"regList\":[],\"document\":\"https://element.eleme.cn/#/zh-CN/component/input-number\",\"formId\":128,\"renderKey\":1590649448797,\"defaultValue\":1},\"placeholder\":\"经验值\",\"step\":1,\"step-strictly\":false,\"controls-position\":\"\",\"disabled\":false,\"__vModel__\":\"experience\"}]}', '2020-05-28 14:33:02', '2021-07-08 19:28:56'); -INSERT INTO `eb_system_form_temp` VALUES (89, '个人中心菜单', '个人中心菜单', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"菜单名\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[]},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"name\",\"placeholder\":\"请输入菜单名菜单名菜单名菜单名菜单名\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":11,\"show-word-limit\":true,\"readonly\":false,\"disabled\":false},{\"__config__\":{\"label\":\"图标(48*48)\",\"tag\":\"self-upload\",\"tagIcon\":\"selfUpload\",\"layout\":\"colFormItem\",\"defaultValue\":null,\"showLabel\":true,\"labelWidth\":null,\"required\":true,\"span\":24,\"showTip\":false,\"buttonText\":\"点击上传\",\"regList\":[],\"changeTag\":true,\"fileSize\":2,\"sizeUnit\":\"MB\",\"document\":\"https://element.eleme.cn/#/zh-CN/component/upload\",\"formId\":105,\"renderKey\":1596072707659},\"__slot__\":{\"list-type\":true},\"action\":\"https://jsonplaceholder.typicode.com/posts/\",\"disabled\":true,\"accept\":\"\",\"name\":\"file\",\"auto-upload\":true,\"list-type\":\"text\",\"multiple\":false,\"__vModel__\":\"pic\"},{\"__config__\":{\"label\":\"小程序链接\",\"showLabel\":true,\"labelWidth\":null,\"tag\":\"el-select\",\"tagIcon\":\"select\",\"layout\":\"colFormItem\",\"span\":24,\"required\":true,\"regList\":[],\"changeTag\":true,\"document\":\"https://element.eleme.cn/#/zh-CN/component/select\",\"formId\":142,\"renderKey\":1591060899296},\"__slot__\":{\"options\":[{\"label\":\"地址管理\",\"value\":\"/pages/users/user_address_list/index\"},{\"label\":\"会员中心\",\"value\":\"/pages/users/user_vip/index\"},{\"label\":\"砍价记录\",\"value\":\"/pages/activity/bargain/index\"},{\"label\":\"推广中心\",\"value\":\"/pages/users/user_spread_user/index\"},{\"label\":\"我的余额\",\"value\":\"/pages/users/user_money/index\"},{\"label\":\"我的收藏\",\"value\":\"/pages/users/user_goods_collection/index\"},{\"label\":\"优惠券\",\"value\":\"/pages/users/user_coupon/index\"},{\"label\":\"后台订单管理\",\"value\":\"/pages/admin/order/index\"},{\"label\":\"联系客服\",\"value\":\"/pages/service/index\"},{\"label\":\"订单核销\",\"value\":\"/pages/admin/order_cancellation/index\"}]},\"placeholder\":\"请选择小程序跳转链接\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"disabled\":false,\"filterable\":true,\"multiple\":false,\"__vModel__\":\"url\"},{\"__config__\":{\"label\":\"公众号链接\",\"showLabel\":true,\"labelWidth\":null,\"tag\":\"el-select\",\"tagIcon\":\"select\",\"layout\":\"colFormItem\",\"span\":24,\"required\":true,\"regList\":[],\"changeTag\":true,\"document\":\"https://element.eleme.cn/#/zh-CN/component/select\",\"formId\":140,\"renderKey\":1591064071606},\"__slot__\":{\"options\":[{\"label\":\"地址管理\",\"value\":\"/pages/users/user_address_list/index\"},{\"label\":\"会员中心\",\"value\":\"/pages/users/user_vip/index\"},{\"label\":\"砍价记录\",\"value\":\"/pages/activity/bargain/index\"},{\"label\":\"推广中心\",\"value\":\"/pages/users/user_spread_user/index\"},{\"label\":\"我的余额\",\"value\":\"/pages/users/user_money/index\"},{\"label\":\"我的收藏\",\"value\":\"/pages/users/user_goods_collection/index\"},{\"label\":\"优惠券\",\"value\":\"/pages/users/user_coupon/index\"},{\"label\":\"后台订单管理\",\"value\":\"/pages/admin/order/index\"},{\"label\":\"联系客服\",\"value\":\"https://yzf.qq.com/xv/web/static/chat/index.html?sign=37ef9b97db2656c32340cde61ce2b56a2176efe72ac7ed421c77607b5c816611ec4775a17c7605b33df1ffe1d22a4ce7464dd07b\"},{\"label\":\"订单核销\",\"value\":\"/pages/admin/order_cancellation/index\"}]},\"placeholder\":\"请选择跳转链接公众号链接公众号链接\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"disabled\":false,\"filterable\":true,\"multiple\":false,\"__vModel__\":\"wap_url\"}]}', '2020-06-02 09:24:19', '2020-09-09 15:55:20'); -INSERT INTO `eb_system_form_temp` VALUES (90, '个人中心轮播图', '个人中心轮播图', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":120,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"图片(690x138)\",\"tag\":\"self-upload\",\"tagIcon\":\"selfUpload\",\"layout\":\"colFormItem\",\"defaultValue\":null,\"showLabel\":true,\"labelWidth\":null,\"required\":true,\"span\":24,\"showTip\":false,\"buttonText\":\"点击上传\",\"regList\":[],\"changeTag\":true,\"fileSize\":2,\"sizeUnit\":\"MB\",\"document\":\"https://element.eleme.cn/#/zh-CN/component/upload\",\"formId\":102,\"renderKey\":1597289113769,\"tips\":false},\"__slot__\":{\"list-type\":true},\"action\":\"https://jsonplaceholder.typicode.com/posts/\",\"disabled\":true,\"accept\":\"\",\"name\":\"file\",\"auto-upload\":true,\"list-type\":\"text\",\"multiple\":false,\"__vModel__\":\"pic\"},{\"__config__\":{\"label\":\"跳转链接\",\"labelWidth\":120,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":140,\"renderKey\":1591064520353,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入跳转跳转链接跳转链接\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"url\"}]}', '2020-06-02 10:24:06', '2021-12-22 16:18:44'); -INSERT INTO `eb_system_form_temp` VALUES (91, '首页精品推荐benner图', '首页精品推荐benner图', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"标题\",\"labelWidth\":130,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"name\",\"placeholder\":\"请输入标题标题标题标题标题\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"\",\"show-word-limit\":true,\"readonly\":false,\"disabled\":false},{\"__config__\":{\"label\":\"跳转链接\",\"labelWidth\":130,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":101,\"renderKey\":1591065625767,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"url\",\"placeholder\":\"请输入跳转链接\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"\",\"show-word-limit\":true,\"readonly\":false,\"disabled\":false},{\"__config__\":{\"label\":\"图片(720x320)\",\"tag\":\"self-upload\",\"tagIcon\":\"selfUpload\",\"layout\":\"colFormItem\",\"defaultValue\":\"\",\"showLabel\":true,\"labelWidth\":130,\"required\":true,\"span\":24,\"showTip\":false,\"buttonText\":\"点击上传\",\"regList\":[],\"changeTag\":true,\"fileSize\":2,\"sizeUnit\":\"MB\",\"document\":\"https://element.eleme.cn/#/zh-CN/component/upload\",\"formId\":101,\"renderKey\":1597286116626,\"tips\":false,\"tipsDesc\":\"\"},\"__slot__\":{\"list-type\":true},\"action\":\"https://jsonplaceholder.typicode.com/posts/\",\"disabled\":true,\"accept\":\"\",\"name\":\"file\",\"auto-upload\":true,\"list-type\":\"text\",\"multiple\":false,\"__vModel__\":\"pic\"}]}', '2020-06-02 10:41:29', '2021-12-22 16:09:40'); -INSERT INTO `eb_system_form_temp` VALUES (92, '首发新品推荐Banner图片', '首发新品推荐Banner图片', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"标题\",\"labelWidth\":120,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"name\",\"placeholder\":\"请输入标题标题标题\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"\",\"show-word-limit\":true,\"readonly\":false,\"disabled\":false},{\"__config__\":{\"label\":\"跳转链接\",\"labelWidth\":120,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":101,\"renderKey\":1591065625767,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"url\",\"placeholder\":\"请输入跳转链接\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"\",\"show-word-limit\":true,\"readonly\":false,\"disabled\":false},{\"__config__\":{\"label\":\"图片(720x320)\",\"tag\":\"self-upload\",\"tagIcon\":\"selfUpload\",\"layout\":\"colFormItem\",\"defaultValue\":null,\"showLabel\":true,\"labelWidth\":120,\"required\":false,\"span\":24,\"showTip\":false,\"buttonText\":\"\",\"regList\":[],\"changeTag\":true,\"document\":\"https://element.eleme.cn/#/zh-CN/component/upload\",\"formId\":102,\"renderKey\":1613962570936,\"tips\":false},\"__slot__\":{\"list-type\":true},\"disabled\":true,\"accept\":\"image\",\"name\":\"file\",\"multiple\":false,\"__vModel__\":\"pic\"}]}', '2020-06-02 10:41:29', '2021-12-22 16:11:54'); -INSERT INTO `eb_system_form_temp` VALUES (93, '首页促销单品推荐Banner图片', '首页促销单品推荐Banner图片', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"标题\",\"labelWidth\":130,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[]},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"name\",\"placeholder\":\"请输入标题标题\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"\",\"show-word-limit\":true,\"readonly\":false,\"disabled\":false},{\"__config__\":{\"label\":\"跳转链接\",\"labelWidth\":130,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":101,\"renderKey\":1591065625767},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"url\",\"placeholder\":\"请输入跳转链接跳转链接\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"\",\"show-word-limit\":true,\"readonly\":false,\"disabled\":false},{\"__config__\":{\"label\":\"图片(710*280)\",\"tag\":\"self-upload\",\"tagIcon\":\"selfUpload\",\"layout\":\"colFormItem\",\"defaultValue\":null,\"showLabel\":true,\"labelWidth\":130,\"required\":true,\"span\":24,\"showTip\":false,\"buttonText\":\"点击上传\",\"regList\":[],\"changeTag\":true,\"fileSize\":2,\"sizeUnit\":\"MB\",\"document\":\"https://element.eleme.cn/#/zh-CN/component/upload\",\"formId\":101,\"renderKey\":1597286206728},\"__slot__\":{\"list-type\":true},\"action\":\"https://jsonplaceholder.typicode.com/posts/\",\"disabled\":true,\"accept\":\"\",\"name\":\"file\",\"auto-upload\":true,\"list-type\":\"text\",\"multiple\":false,\"__vModel__\":\"pic\"}]}', '2020-06-02 10:41:29', '2020-08-13 10:37:37'); -INSERT INTO `eb_system_form_temp` VALUES (94, '热门榜单推荐Banner图片', '热门榜单推荐Banner图片', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":120,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"标题\",\"labelWidth\":120,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"name\",\"placeholder\":\"请输入标题标题标题\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"\",\"show-word-limit\":true,\"readonly\":false,\"disabled\":false},{\"__config__\":{\"label\":\"跳转链接\",\"labelWidth\":120,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":101,\"renderKey\":1591065625767,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"url\",\"placeholder\":\"请输入跳转链接\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"\",\"show-word-limit\":true,\"readonly\":false,\"disabled\":false},{\"__config__\":{\"label\":\"图片(720x320)\",\"tag\":\"self-upload\",\"tagIcon\":\"selfUpload\",\"layout\":\"colFormItem\",\"defaultValue\":null,\"showLabel\":true,\"labelWidth\":null,\"required\":true,\"span\":24,\"showTip\":false,\"buttonText\":\"\",\"regList\":[],\"changeTag\":true,\"document\":\"https://element.eleme.cn/#/zh-CN/component/upload\",\"formId\":102,\"renderKey\":1614154650561,\"tips\":false},\"__slot__\":{\"list-type\":true},\"disabled\":true,\"accept\":\"image\",\"name\":\"file\",\"multiple\":false,\"__vModel__\":\"pic\"}]}', '2020-06-02 10:41:29', '2021-12-22 16:11:03'); -INSERT INTO `eb_system_form_temp` VALUES (95, '首页banner滚动图', '首页banner滚动图', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"标题\",\"labelWidth\":130,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"name\",\"placeholder\":\"请输入标题标题标题标题\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"\",\"show-word-limit\":true,\"readonly\":false,\"disabled\":false},{\"__config__\":{\"label\":\"跳转链接\",\"labelWidth\":130,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":101,\"renderKey\":1591065625767,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"url\",\"placeholder\":\"请输入跳转链接\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"\",\"show-word-limit\":true,\"readonly\":false,\"disabled\":false},{\"__config__\":{\"label\":\"图片(750 x 375)\",\"tag\":\"self-upload\",\"tagIcon\":\"selfUpload\",\"layout\":\"colFormItem\",\"defaultValue\":null,\"showLabel\":true,\"labelWidth\":130,\"required\":true,\"span\":24,\"showTip\":false,\"buttonText\":\"点击上传\",\"regList\":[],\"changeTag\":true,\"fileSize\":2,\"sizeUnit\":\"MB\",\"document\":\"https://element.eleme.cn/#/zh-CN/component/upload\",\"formId\":102,\"renderKey\":1597286491734,\"tips\":false,\"tipsDesc\":\"\"},\"__slot__\":{\"list-type\":true},\"action\":\"https://jsonplaceholder.typicode.com/posts/\",\"disabled\":true,\"accept\":\"\",\"name\":\"file\",\"auto-upload\":true,\"list-type\":\"text\",\"multiple\":false,\"__vModel__\":\"pic\"}]}', '2020-06-02 10:41:29', '2021-12-22 16:06:49'); -INSERT INTO `eb_system_form_temp` VALUES (96, '导航模块', '导航模块', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":120,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"标题\",\"labelWidth\":120,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"name\",\"placeholder\":\"请输入标题标题标题标题标题标题\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"\",\"show-word-limit\":true,\"readonly\":false,\"disabled\":false},{\"__config__\":{\"label\":\"图片(90x90)\",\"tag\":\"self-upload\",\"tagIcon\":\"selfUpload\",\"layout\":\"colFormItem\",\"defaultValue\":null,\"showLabel\":true,\"labelWidth\":null,\"required\":true,\"span\":24,\"showTip\":false,\"buttonText\":\"点击上传\",\"regList\":[],\"changeTag\":true,\"fileSize\":2,\"sizeUnit\":\"MB\",\"document\":\"https://element.eleme.cn/#/zh-CN/component/upload\",\"formId\":101,\"renderKey\":1597287354047,\"tips\":false},\"__slot__\":{\"list-type\":true},\"action\":\"https://jsonplaceholder.typicode.com/posts/\",\"disabled\":true,\"accept\":\"\",\"name\":\"file\",\"auto-upload\":true,\"list-type\":\"text\",\"multiple\":false,\"__vModel__\":\"pic\"},{\"__config__\":{\"label\":\"跳转链接\",\"showLabel\":true,\"labelWidth\":null,\"tag\":\"el-select\",\"tagIcon\":\"select\",\"layout\":\"colFormItem\",\"span\":24,\"required\":true,\"regList\":[],\"changeTag\":true,\"document\":\"https://element.eleme.cn/#/zh-CN/component/select\",\"formId\":102,\"renderKey\":1591080591082,\"tips\":false},\"__slot__\":{\"options\":[{\"label\":\"商城首页\",\"value\":\"/pages/index/index\"},{\"label\":\"个人推广\",\"value\":\"/pages/user_spread_user/index\"},{\"label\":\"优惠券\",\"value\":\"/pages/users/user_get_coupon/index\"},{\"label\":\"个人中心\",\"value\":\"/pages/user/user\"},{\"label\":\"秒杀列表\",\"value\":\"/pages/activity/goods_seckill/index\"},{\"label\":\"拼团列表页\",\"value\":\"/pages/activity/goods_combination/index\"},{\"label\":\"砍价列表\",\"value\":\"/pages/activity/goods_bargain/index\"},{\"label\":\"分类页面\",\"value\":\"/pages/goods_cate/goods_cate\"},{\"label\":\"地址列表\",\"value\":\"/pages/users/user_address_list/index\"},{\"label\":\"提现页面\",\"value\":\"/pages/user_cash/index\"},{\"label\":\"推广统计\",\"value\":\"/pages/promoter-list/index\"},{\"label\":\"账户金额\",\"value\":\"/pages/users/user_goods_collection/index\"},{\"label\":\"推广二维码页面\",\"value\":\"/pages/promotion-card/promotion-card\"},{\"label\":\"购物车页面\",\"value\":\"/pages/order_addcart/order_addcart\"},{\"label\":\"订单列表页面\",\"value\":\"/pages/users/order_list/index\"},{\"label\":\"文章列表页\",\"value\":\"/pages/news_list/index\"},{\"label\":\"我要签到\",\"value\":\"/pages/users/user_sgin/index\"},{\"label\":\"我的收藏\",\"value\":\"/pages/users/user_goods_collection/index\"}]},\"placeholder\":\"请选择跳转链接\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"disabled\":false,\"filterable\":true,\"multiple\":false,\"__vModel__\":\"url\"},{\"__config__\":{\"label\":\"底部菜单\",\"labelWidth\":null,\"showLabel\":true,\"tag\":\"el-radio-group\",\"tagIcon\":\"radio\",\"changeTag\":true,\"layout\":\"colFormItem\",\"span\":24,\"optionType\":\"default\",\"regList\":[],\"required\":true,\"border\":false,\"document\":\"https://element.eleme.cn/#/zh-CN/component/radio\",\"formId\":103,\"renderKey\":1591080806108,\"defaultValue\":1,\"tips\":false},\"__slot__\":{\"options\":[{\"label\":\"是\",\"value\":1},{\"label\":\"否\",\"value\":2}]},\"style\":{},\"size\":\"medium\",\"disabled\":false,\"__vModel__\":\"show\"}]}', '2020-06-02 10:41:29', '2021-12-22 16:20:21'); -INSERT INTO `eb_system_form_temp` VALUES (97, '首页滚动新闻', '首页滚动新闻', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"滚动文字\",\"labelWidth\":120,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[]},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"info\",\"placeholder\":\"请输入滚动文字滚动文字\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"\",\"show-word-limit\":true,\"readonly\":false,\"disabled\":false},{\"__config__\":{\"label\":\"跳转链接\",\"showLabel\":true,\"labelWidth\":120,\"tag\":\"el-select\",\"tagIcon\":\"select\",\"layout\":\"colFormItem\",\"span\":24,\"required\":true,\"regList\":[],\"changeTag\":true,\"document\":\"https://element.eleme.cn/#/zh-CN/component/select\",\"formId\":102,\"renderKey\":1591080591082},\"__slot__\":{\"options\":[{\"label\":\"商城首页\",\"value\":\"/pages/index/index\"},{\"label\":\"个人推广\",\"value\":\"/pages/user_spread_user/index\"},{\"label\":\"优惠券\",\"value\":\"/pages/users/user_get_coupon/index\"},{\"label\":\"个人中心\",\"value\":\"/pages/user/user\"},{\"label\":\"秒杀列表\",\"value\":\"/pages/activity/goods_seckill/index\"},{\"label\":\"拼团列表页\",\"value\":\"/pages/activity/goods_combination/index\"},{\"label\":\"砍价列表\",\"value\":\"/pages/activity/goods_bargain/index\"},{\"label\":\"分类页面\",\"value\":\"/pages/goods_cate/goods_cate\"},{\"label\":\"地址列表\",\"value\":\"/pages/users/user_address_list/index\"},{\"label\":\"提现页面\",\"value\":\"/pages/user_cash/index\"},{\"label\":\"推广统计\",\"value\":\"/pages/promoter-list/index\"},{\"label\":\"账户金额\",\"value\":\"/pages/users/user_goods_collection/index\"},{\"label\":\"推广二维码页面\",\"value\":\"/pages/promotion-card/promotion-card\"},{\"label\":\"购物车页面\",\"value\":\"/pages/order_addcart/order_addcart\"},{\"label\":\"订单列表页面\",\"value\":\"/pages/users/order_list/index\"},{\"label\":\"文章列表页\",\"value\":\"/pages/news_list/index\"}]},\"placeholder\":\"请选择跳转链接\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"disabled\":false,\"filterable\":true,\"multiple\":false,\"__vModel__\":\"url\"},{\"__config__\":{\"label\":\"底部菜单\",\"labelWidth\":120,\"showLabel\":true,\"tag\":\"el-radio-group\",\"tagIcon\":\"radio\",\"changeTag\":true,\"layout\":\"colFormItem\",\"span\":24,\"optionType\":\"default\",\"regList\":[],\"required\":true,\"border\":false,\"document\":\"https://element.eleme.cn/#/zh-CN/component/radio\",\"formId\":103,\"renderKey\":1591080806108,\"defaultValue\":1},\"__slot__\":{\"options\":[{\"label\":\"是\",\"value\":1},{\"label\":\"否\",\"value\":2}]},\"style\":{},\"size\":\"medium\",\"disabled\":false,\"__vModel__\":\"show\"}]}', '2020-06-02 10:41:29', '2020-08-13 10:35:02'); -INSERT INTO `eb_system_form_temp` VALUES (98, '首页活动区域图片', '首页活动区域图片', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"图片(710*280)\",\"tag\":\"self-upload\",\"tagIcon\":\"selfUpload\",\"layout\":\"colFormItem\",\"defaultValue\":null,\"showLabel\":true,\"labelWidth\":130,\"required\":true,\"span\":24,\"showTip\":false,\"buttonText\":\"点击上传\",\"regList\":[],\"changeTag\":true,\"fileSize\":2,\"sizeUnit\":\"MB\",\"document\":\"https://element.eleme.cn/#/zh-CN/component/upload\",\"formId\":102,\"renderKey\":1597286612904},\"__slot__\":{\"list-type\":true},\"action\":\"https://jsonplaceholder.typicode.com/posts/\",\"disabled\":true,\"accept\":\"\",\"name\":\"file\",\"auto-upload\":true,\"list-type\":\"text\",\"multiple\":false,\"__vModel__\":\"image\"},{\"__config__\":{\"label\":\"标题\",\"labelWidth\":130,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[]},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"title\",\"placeholder\":\"请输入标题标题标题\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"\",\"show-word-limit\":true,\"readonly\":false,\"disabled\":false},{\"__config__\":{\"label\":\"简介\",\"labelWidth\":130,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":101,\"renderKey\":1591081196107},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"info\",\"placeholder\":\"请输入简介\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"\",\"show-word-limit\":true,\"readonly\":false,\"disabled\":false},{\"__config__\":{\"label\":\"跳转链接\",\"showLabel\":true,\"labelWidth\":130,\"tag\":\"el-select\",\"tagIcon\":\"select\",\"layout\":\"colFormItem\",\"span\":24,\"required\":true,\"regList\":[],\"changeTag\":true,\"document\":\"https://element.eleme.cn/#/zh-CN/component/select\",\"formId\":102,\"renderKey\":1591080591082},\"__slot__\":{\"options\":[{\"label\":\"秒杀列表\",\"value\":\"/pages/activity/goods_seckill/index\"},{\"label\":\"拼团列表页\",\"value\":\"/pages/activity/goods_combination/index\"},{\"label\":\"砍价列表\",\"value\":\"/pages/activity/goods_bargain/index\"}]},\"placeholder\":\"请选择跳转链接\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"disabled\":false,\"filterable\":true,\"multiple\":false,\"__vModel__\":\"link\"}]}', '2020-06-02 10:41:29', '2020-08-13 10:44:02'); -INSERT INTO `eb_system_form_temp` VALUES (99, '首页超值爆款', '首页超值爆款', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"图片(710*280)\",\"tag\":\"self-upload\",\"tagIcon\":\"selfUpload\",\"layout\":\"colFormItem\",\"defaultValue\":null,\"showLabel\":true,\"labelWidth\":130,\"required\":true,\"span\":24,\"showTip\":false,\"buttonText\":\"点击上传\",\"regList\":[],\"changeTag\":true,\"fileSize\":2,\"sizeUnit\":\"MB\",\"document\":\"https://element.eleme.cn/#/zh-CN/component/upload\",\"formId\":101,\"renderKey\":1597286019454,\"tips\":false},\"__slot__\":{\"list-type\":true},\"action\":\"https://jsonplaceholder.typicode.com/posts/\",\"disabled\":true,\"accept\":\"\",\"name\":\"file\",\"auto-upload\":true,\"list-type\":\"text\",\"multiple\":false,\"__vModel__\":\"pic\"},{\"__config__\":{\"label\":\"标题\",\"labelWidth\":130,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"name\",\"placeholder\":\"请输入标题标题标题\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"\",\"show-word-limit\":true,\"readonly\":false,\"disabled\":false},{\"__config__\":{\"label\":\"简介\",\"labelWidth\":130,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":101,\"renderKey\":1591081196107,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"info\",\"placeholder\":\"请输入简介简介\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"\",\"show-word-limit\":true,\"readonly\":false,\"disabled\":false},{\"__config__\":{\"label\":\"类型\",\"showLabel\":true,\"labelWidth\":130,\"tag\":\"el-select\",\"tagIcon\":\"select\",\"layout\":\"colFormItem\",\"span\":24,\"required\":true,\"regList\":[],\"changeTag\":true,\"document\":\"https://element.eleme.cn/#/zh-CN/component/select\",\"formId\":102,\"renderKey\":1591080591082,\"tips\":false},\"__slot__\":{\"options\":[{\"label\":\"精品推荐\",\"value\":1},{\"label\":\"热门榜单\",\"value\":2},{\"label\":\"首发新品\",\"value\":3},{\"label\":\"促销单品\",\"value\":4}]},\"placeholder\":\"请选择类型\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"disabled\":false,\"filterable\":true,\"multiple\":false,\"__vModel__\":\"type\"}]}', '2020-06-02 10:41:29', '2021-12-23 16:00:42'); -INSERT INTO `eb_system_form_temp` VALUES (100, '首页文字配置', '首页文字配置', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"快速选择简介\",\"labelWidth\":120,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[]},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"fast_info\",\"placeholder\":\"请输入快速选择简介\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"\",\"show-word-limit\":true,\"readonly\":false,\"disabled\":false},{\"__config__\":{\"label\":\"精品推荐简介\",\"labelWidth\":120,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":101,\"renderKey\":1591081579041},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"bast_info\",\"placeholder\":\"请输入精品推荐简介\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"\",\"show-word-limit\":true,\"readonly\":false,\"disabled\":false},{\"__config__\":{\"label\":\"首发新品简介\",\"labelWidth\":120,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":102,\"renderKey\":1591081598503},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"first_info\",\"placeholder\":\"请输入首发新品简介\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"\",\"show-word-limit\":true,\"readonly\":false,\"disabled\":false},{\"__config__\":{\"label\":\"促销单品简介\",\"labelWidth\":120,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":103,\"renderKey\":1591081599048},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"sales_info\",\"placeholder\":\"请输入促销单品简介\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"\",\"show-word-limit\":true,\"readonly\":false,\"disabled\":false}]}', '2020-06-02 15:07:11', '2020-06-02 15:07:11'); -INSERT INTO `eb_system_form_temp` VALUES (101, '首页精品推荐benner图', '首页精品推荐benner图', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"图片\",\"tag\":\"self-upload\",\"tagIcon\":\"selfUpload\",\"layout\":\"colFormItem\",\"defaultValue\":null,\"showLabel\":true,\"labelWidth\":null,\"required\":true,\"span\":24,\"showTip\":false,\"buttonText\":\"点击上传\",\"regList\":[],\"changeTag\":true,\"fileSize\":2,\"sizeUnit\":\"MB\",\"document\":\"https://element.eleme.cn/#/zh-CN/component/upload\",\"formId\":101,\"renderKey\":1597285983911},\"__slot__\":{\"list-type\":true},\"action\":\"https://jsonplaceholder.typicode.com/posts/\",\"disabled\":true,\"accept\":\"\",\"name\":\"file\",\"auto-upload\":true,\"list-type\":\"text\",\"multiple\":false,\"__vModel__\":\"img\"},{\"__config__\":{\"label\":\"描述\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":102,\"renderKey\":1591083877308},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入描述\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"comment\"},{\"__config__\":{\"label\":\"跳转链接\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":103,\"renderKey\":1591083894228},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入跳转链接\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"link\"}]}', '2020-06-02 15:45:01', '2020-08-13 10:33:18'); -INSERT INTO `eb_system_form_temp` VALUES (102, '热门搜索', '热门搜索', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"标签\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[]},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"title\",\"placeholder\":\"请输入标签\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":11,\"show-word-limit\":true,\"readonly\":false,\"disabled\":false}]}', '2020-06-03 11:34:29', '2020-06-03 11:34:29'); -INSERT INTO `eb_system_form_temp` VALUES (103, '充值金额设置', '设置充值金额额度选择', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"售价\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":104,\"renderKey\":1591773075965},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入售价\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"price\"},{\"__config__\":{\"label\":\"赠送\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":103,\"renderKey\":1591773074670},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入赠送\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"give_money\"}]}', '2020-06-10 15:12:15', '2020-06-10 15:12:15'); -INSERT INTO `eb_system_form_temp` VALUES (104, '修改订单', '修改订单', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"订单编号\",\"labelWidth\":130,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[]},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"订单编号订单编号订单编号订单编号订单编号订单编号\",\"style\":{\"width\":\"50%\"},\"clearable\":false,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":true,\"disabled\":false,\"__vModel__\":\"orderId\"},{\"__config__\":{\"label\":\"商品总价\",\"showLabel\":true,\"changeTag\":true,\"labelWidth\":130,\"tag\":\"el-input-number\",\"tagIcon\":\"number\",\"span\":24,\"layout\":\"colFormItem\",\"required\":true,\"regList\":[],\"document\":\"https://element.eleme.cn/#/zh-CN/component/input-number\",\"formId\":108,\"renderKey\":1592186382632,\"defaultValue\":0},\"placeholder\":\"商品总价\",\"step\":1,\"step-strictly\":false,\"controls-position\":\"\",\"disabled\":true,\"__vModel__\":\"totalPrice\",\"min\":0},{\"__config__\":{\"label\":\"原始邮费\",\"showLabel\":true,\"changeTag\":true,\"labelWidth\":130,\"tag\":\"el-input-number\",\"tagIcon\":\"number\",\"span\":24,\"layout\":\"colFormItem\",\"required\":true,\"regList\":[],\"document\":\"https://element.eleme.cn/#/zh-CN/component/input-number\",\"formId\":104,\"renderKey\":1592186354404,\"defaultValue\":0},\"placeholder\":\"原始邮费\",\"step\":1,\"step-strictly\":false,\"controls-position\":\"\",\"disabled\":true,\"__vModel__\":\"totalPostage\",\"min\":0},{\"__config__\":{\"label\":\"实际支付金额\",\"showLabel\":true,\"changeTag\":true,\"labelWidth\":130,\"tag\":\"el-input-number\",\"tagIcon\":\"number\",\"span\":24,\"layout\":\"colFormItem\",\"required\":true,\"regList\":[],\"document\":\"https://element.eleme.cn/#/zh-CN/component/input-number\",\"formId\":106,\"renderKey\":1592186379453,\"defaultValue\":0},\"placeholder\":\"实际支付金额\",\"step\":1,\"step-strictly\":false,\"controls-position\":\"\",\"disabled\":false,\"__vModel__\":\"payPrice\",\"min\":0},{\"__config__\":{\"label\":\"实际支付邮费\",\"showLabel\":true,\"changeTag\":true,\"labelWidth\":130,\"tag\":\"el-input-number\",\"tagIcon\":\"number\",\"span\":24,\"layout\":\"colFormItem\",\"required\":true,\"regList\":[],\"document\":\"https://element.eleme.cn/#/zh-CN/component/input-number\",\"formId\":107,\"renderKey\":1592186381287,\"defaultValue\":0},\"placeholder\":\"实际支付邮费\",\"step\":1,\"step-strictly\":false,\"controls-position\":\"\",\"disabled\":true,\"__vModel__\":\"payPostage\",\"min\":0}]}', '2020-06-15 10:11:19', '2021-03-24 11:07:33'); -INSERT INTO `eb_system_form_temp` VALUES (105, '模板消息', '模板消息', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"模板编号\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[]},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"tempKey\",\"placeholder\":\"请输入模板编号\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"\",\"show-word-limit\":true,\"readonly\":false,\"disabled\":false},{\"__config__\":{\"label\":\"模板ID\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":106,\"renderKey\":1592281492122},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入模板ID\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"tempId\"},{\"__config__\":{\"label\":\"模板名\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":105,\"renderKey\":1592281490129},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入模板名\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"name\"},{\"__config__\":{\"label\":\"回复内容\",\"labelWidth\":null,\"showLabel\":true,\"tag\":\"el-input\",\"tagIcon\":\"textarea\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"regList\":[],\"changeTag\":true,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"formId\":104,\"renderKey\":1592281487212},\"type\":\"textarea\",\"placeholder\":\"请输入回复内容\",\"autosize\":{\"minRows\":4,\"maxRows\":4},\"style\":{\"width\":\"100%\"},\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"content\"},{\"__config__\":{\"label\":\"状态\",\"labelWidth\":null,\"showLabel\":true,\"tag\":\"el-radio-group\",\"tagIcon\":\"radio\",\"changeTag\":true,\"layout\":\"colFormItem\",\"span\":24,\"optionType\":\"default\",\"regList\":[],\"required\":true,\"border\":false,\"document\":\"https://element.eleme.cn/#/zh-CN/component/radio\",\"formId\":109,\"renderKey\":1592289933100,\"defaultValue\":0},\"__slot__\":{\"options\":[{\"label\":\"开启\",\"value\":1},{\"label\":\"关闭\",\"value\":0}]},\"style\":{},\"size\":\"medium\",\"disabled\":false,\"__vModel__\":\"status\"}]}', '2020-06-16 12:28:38', '2020-12-04 16:49:38'); -INSERT INTO `eb_system_form_temp` VALUES (106, '拒绝退款', '拒绝退款', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"拒绝退款单号\",\"labelWidth\":120,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[]},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"orderId\",\"placeholder\":\"请输入拒绝退款单号拒绝退款单号\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"\",\"show-word-limit\":true,\"readonly\":true,\"disabled\":false},{\"__config__\":{\"label\":\"不退款原因\",\"labelWidth\":120,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"textarea\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":112,\"renderKey\":1592451273684},\"type\":\"textarea\",\"placeholder\":\"请输入不退款原因\",\"autosize\":{\"minRows\":4,\"maxRows\":4},\"style\":{\"width\":\"100%\"},\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"reason\"}]}', '2020-06-18 11:36:28', '2020-06-18 11:45:56'); -INSERT INTO `eb_system_form_temp` VALUES (107, '立即退款', '立即退款', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"退款单号\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[]},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"orderId\",\"placeholder\":\"请输入退款单号退款单号退款单号退款单号\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"\",\"show-word-limit\":true,\"readonly\":true,\"disabled\":false},{\"__config__\":{\"label\":\"退款金额\",\"showLabel\":true,\"changeTag\":true,\"labelWidth\":null,\"tag\":\"el-input-number\",\"tagIcon\":\"number\",\"span\":24,\"layout\":\"colFormItem\",\"required\":true,\"regList\":[],\"document\":\"https://element.eleme.cn/#/zh-CN/component/input-number\",\"formId\":110,\"renderKey\":1592452495718},\"placeholder\":\"退款金额\",\"step\":1,\"step-strictly\":false,\"controls-position\":\"\",\"disabled\":false,\"__vModel__\":\"amount\",\"min\":0}]}', '2020-06-18 11:57:03', '2021-01-06 14:43:22'); -INSERT INTO `eb_system_form_temp` VALUES (108, '文件上传-基础配置', '文件上传-本地配置', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"本地图片域名\",\"labelWidth\":270,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":101,\"renderKey\":1592476026393,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入本地图片域名\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"localUploadUrl\"},{\"__config__\":{\"label\":\"允许上传图片后缀\",\"labelWidth\":270,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":103,\"renderKey\":1598344152903,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"允许上传图片后缀，多个英文逗号分割允许上传图片后缀\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"image_ext_str\"},{\"__config__\":{\"label\":\"允许上传最大图片(单位 M，最大值50 )\",\"labelWidth\":270,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input-number\",\"tagIcon\":\"number\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input-number\",\"regList\":[],\"formId\":104,\"renderKey\":1598344206314,\"tips\":false},\"placeholder\":\"单位 M允许上传最大图片(单位 M，最大值50 )\",\"step\":1,\"step-strictly\":false,\"controls-position\":\"\",\"disabled\":false,\"__vModel__\":\"image_max_size\",\"min\":1,\"max\":50},{\"__config__\":{\"label\":\"允许上传文件后缀\",\"labelWidth\":270,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":106,\"renderKey\":1598344273484,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"，多个英文逗号分割\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"file_ext_str\"},{\"__config__\":{\"label\":\"允许上传最大文件(单位 M，最大值500 )\",\"labelWidth\":270,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input-number\",\"tagIcon\":\"number\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input-number\",\"regList\":[],\"formId\":107,\"renderKey\":1598344275586,\"tips\":false},\"placeholder\":\"单位 M允许上传最大文件(单位 M，最大值500 )\",\"step\":1,\"step-strictly\":false,\"controls-position\":\"\",\"disabled\":false,\"__vModel__\":\"file_max_size\",\"min\":1,\"max\":500},{\"__config__\":{\"label\":\"文件存储\",\"showLabel\":true,\"labelWidth\":270,\"tag\":\"el-select\",\"tagIcon\":\"select\",\"layout\":\"colFormItem\",\"span\":24,\"required\":true,\"regList\":[],\"changeTag\":true,\"document\":\"https://element.eleme.cn/#/zh-CN/component/select\",\"formId\":102,\"renderKey\":1599545811870,\"defaultValue\":1,\"tips\":false},\"__slot__\":{\"options\":[{\"label\":\"本地\",\"value\":1},{\"label\":\"七牛云\",\"value\":2},{\"label\":\"阿里云\",\"value\":3},{\"label\":\"腾讯云\",\"value\":4}]},\"placeholder\":\"请选择文件存储文件存储\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"disabled\":false,\"filterable\":true,\"multiple\":false,\"__vModel__\":\"uploadType\"},{\"__config__\":{\"label\":\"文件是否保存本地（云存储）\",\"labelWidth\":270,\"showLabel\":true,\"tag\":\"el-radio-group\",\"tagIcon\":\"radio\",\"changeTag\":true,\"layout\":\"colFormItem\",\"span\":24,\"optionType\":\"default\",\"regList\":[],\"required\":true,\"border\":false,\"document\":\"https://element.eleme.cn/#/zh-CN/component/radio\",\"formId\":102,\"renderKey\":1629358181244,\"defaultValue\":1,\"tips\":false},\"__slot__\":{\"options\":[{\"label\":\"保存\",\"value\":1},{\"label\":\"不保存\",\"value\":0}]},\"style\":{},\"size\":\"medium\",\"disabled\":false,\"__vModel__\":\"file_is_save\"}]}', '2020-06-18 18:28:13', '2021-12-09 14:33:45'); -INSERT INTO `eb_system_form_temp` VALUES (109, '积分设置', '积分设置', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":23,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"积分抵用比例(1积分抵多少金额)\",\"labelWidth\":350,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input-number\",\"tagIcon\":\"number\",\"defaultValue\":3,\"required\":true,\"layout\":\"colFormItem\",\"span\":23,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input-number\",\"regList\":[]},\"placeholder\":\"请输入积分抵用比例积分抵用比例(1积分抵多少金额)积分抵用比例(1积分抵多少金额)积分抵用比例(1积分抵多少金额)积分抵用比例(1积分抵多少金额)积分抵用比例(1积分抵多少金额)积分抵用比例(1积分抵多少金额)积分抵用比例(1积分抵多少金额)积分抵用比例(1积分抵多少金额)\",\"step\":1,\"step-strictly\":false,\"controls-position\":\"\",\"disabled\":false,\"__vModel__\":\"integral_ratio\",\"min\":0,\"precision\":1,\"max\":99},{\"__config__\":{\"label\":\"下单赠送积分比例（实际支付1元赠送多少积分）\",\"labelWidth\":350,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input-number\",\"tagIcon\":\"number\",\"defaultValue\":1,\"required\":true,\"layout\":\"colFormItem\",\"span\":23,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input-number\",\"regList\":[],\"formId\":105,\"renderKey\":1594871750052},\"placeholder\":\"请输入下单赠送积分比例（实际支付1元赠送多少积分）\",\"step\":1,\"step-strictly\":false,\"controls-position\":\"\",\"disabled\":false,\"__vModel__\":\"order_give_integral\",\"min\":0,\"precision\":0},{\"__config__\":{\"label\":\"积分冻结时间(天)\",\"showLabel\":true,\"changeTag\":true,\"labelWidth\":350,\"tag\":\"el-input-number\",\"tagIcon\":\"number\",\"span\":23,\"layout\":\"colFormItem\",\"required\":true,\"regList\":[],\"document\":\"https://element.eleme.cn/#/zh-CN/component/input-number\",\"formId\":103,\"renderKey\":1614734147419,\"defaultValue\":0},\"placeholder\":\"积分冻结时间(天)\",\"step\":1,\"step-strictly\":false,\"controls-position\":\"\",\"disabled\":false,\"__vModel__\":\"freeze_integral_day\",\"min\":0,\"precision\":0,\"max\":99}]}', '2020-07-16 12:01:34', '2021-03-03 09:20:21'); -INSERT INTO `eb_system_form_temp` VALUES (110, '短信模板消息', '短信模板消息', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"模板名称\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":140,\"renderKey\":1595402251597},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入模板名称\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"title\"},{\"__config__\":{\"label\":\"模板内容\",\"labelWidth\":null,\"showLabel\":true,\"tag\":\"el-input\",\"tagIcon\":\"textarea\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"regList\":[],\"changeTag\":true,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"formId\":141,\"renderKey\":1595402320867,\"defaultValue\":\"您的验证码是：{$code}，有效期为{$time}分钟。如非本人操作，可不用理会。模板中的{$code}和{$time}需要替换成对应的变量，请开发者知晓。修改此项无效！\"},\"type\":\"textarea\",\"placeholder\":\"请输入模板内容\",\"autosize\":{\"minRows\":4},\"style\":{\"width\":\"100%\"},\"maxlength\":null,\"show-word-limit\":true,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"content\"},{\"__config__\":{\"label\":\"模板类型\",\"labelWidth\":null,\"showLabel\":true,\"tag\":\"el-radio-group\",\"tagIcon\":\"radio\",\"changeTag\":true,\"layout\":\"colFormItem\",\"span\":24,\"optionType\":\"default\",\"regList\":[],\"required\":true,\"border\":false,\"document\":\"https://element.eleme.cn/#/zh-CN/component/radio\",\"formId\":142,\"renderKey\":1595402411016,\"defaultValue\":1},\"__slot__\":{\"options\":[{\"label\":\"验证码\",\"value\":1},{\"label\":\"通知\",\"value\":2},{\"label\":\"推广\",\"value\":3}]},\"style\":{},\"size\":\"medium\",\"disabled\":false,\"__vModel__\":\"type\"}]}', '2020-07-22 15:21:26', '2020-12-01 11:56:33'); -INSERT INTO `eb_system_form_temp` VALUES (111, '短信设置', '短信设置', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":300,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":16,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"验证码有效时间 (分钟)\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input-number\",\"tagIcon\":\"number\",\"required\":true,\"layout\":\"colFormItem\",\"span\":16,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input-number\",\"regList\":[],\"formId\":103,\"renderKey\":1598497111542,\"defaultValue\":1,\"tips\":false},\"placeholder\":\"请输入验证码有效时间 (分钟)\",\"step\":1,\"step-strictly\":true,\"controls-position\":\"\",\"disabled\":false,\"__vModel__\":\"sms_code_expire\",\"min\":1}]}', '2020-07-22 17:00:03', '2021-12-11 09:45:52'); -INSERT INTO `eb_system_form_temp` VALUES (113, '推广分享海报', '推广分享海报', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"名称\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"title\",\"placeholder\":\"请输入名称名称名称名称\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"\",\"show-word-limit\":true,\"readonly\":false,\"disabled\":false},{\"__config__\":{\"label\":\"背景图(600x1000)\",\"tag\":\"self-upload\",\"tagIcon\":\"upload\",\"layout\":\"colFormItem\",\"defaultValue\":null,\"showLabel\":true,\"labelWidth\":null,\"required\":true,\"span\":24,\"showTip\":true,\"buttonText\":\"点击上传\",\"regList\":[],\"changeTag\":true,\"fileSize\":2,\"sizeUnit\":\"MB\",\"document\":\"https://element.eleme.cn/#/zh-CN/component/upload\",\"formId\":104,\"renderKey\":1596006415029,\"tips\":false,\"tipsDesc\":\"\"},\"__slot__\":{\"list-type\":true},\"action\":\"https://jsonplaceholder.typicode.com/posts/\",\"disabled\":true,\"accept\":\"\",\"name\":\"file\",\"auto-upload\":true,\"list-type\":\"text\",\"multiple\":false,\"__vModel__\":\"pic\"}]}', '2020-07-29 15:07:42', '2021-12-22 16:13:48'); -INSERT INTO `eb_system_form_temp` VALUES (114, '后台登录页轮播图', '后台登录页轮播图', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":130,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"轮播图(286x420)\",\"tag\":\"self-upload\",\"tagIcon\":\"upload\",\"layout\":\"colFormItem\",\"defaultValue\":null,\"showLabel\":true,\"labelWidth\":null,\"required\":true,\"span\":24,\"showTip\":false,\"buttonText\":\"点击上传\",\"regList\":[],\"changeTag\":true,\"fileSize\":2,\"sizeUnit\":\"MB\",\"document\":\"https://element.eleme.cn/#/zh-CN/component/upload\",\"formId\":101,\"renderKey\":1596017879033,\"tips\":false},\"__slot__\":{\"list-type\":true},\"action\":\"https://jsonplaceholder.typicode.com/posts/\",\"disabled\":true,\"accept\":\"\",\"name\":\"file\",\"auto-upload\":true,\"list-type\":\"text\",\"multiple\":false,\"__vModel__\":\"pic\"}]}', '2020-07-29 18:15:46', '2021-12-22 16:23:15'); -INSERT INTO `eb_system_form_temp` VALUES (115, '订单详情状态图', '订单详情状态图', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"订单状态\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"orderStatus\",\"placeholder\":\"0=未支付,1=待发货,2=待收货,3=待评价,4=已完成订单状态订单状态订单状态\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"\",\"show-word-limit\":true,\"readonly\":false,\"disabled\":false},{\"__config__\":{\"label\":\"透明动图\",\"tag\":\"self-upload\",\"tagIcon\":\"selfUpload\",\"layout\":\"colFormItem\",\"defaultValue\":null,\"showLabel\":true,\"labelWidth\":null,\"required\":true,\"tips\":false,\"tipsDesc\":\"\",\"tipsIsLink\":false,\"tipsLink\":\"\",\"span\":24,\"showTip\":false,\"buttonText\":\"\",\"regList\":[],\"changeTag\":true,\"document\":\"https://element.eleme.cn/#/zh-CN/component/upload\",\"formId\":101,\"renderKey\":1640163223626},\"__slot__\":{\"list-type\":true},\"disabled\":true,\"accept\":\"image\",\"name\":\"file\",\"multiple\":false,\"__vModel__\":\"image\"}]}', '2020-07-29 19:40:23', '2021-12-22 17:29:12'); -INSERT INTO `eb_system_form_temp` VALUES (122, '99api', '99api', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"ApiKey\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":101,\"renderKey\":1599538285999,\"tips\":true,\"tipsDesc\":\"点击查看详细\",\"tipsIsLink\":true,\"tipsLink\":\"http://help.crmeb.net/crmeb_java/2103903\"},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入ApiKey\",\"style\":{\"width\":\"80%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"importProductToken\"}]}', '2020-09-08 12:17:06', '2021-11-02 16:40:49'); -INSERT INTO `eb_system_form_temp` VALUES (123, '秒杀配置', '秒杀配置', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"名称\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[]},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"name\",\"placeholder\":\"请输入名称\",\"style\":{\"width\":\"445px\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"20\",\"show-word-limit\":false,\"readonly\":false,\"disabled\":false},{\"__config__\":{\"label\":\"时间范围\",\"tag\":\"time-select\",\"tagIcon\":\"time-select\",\"span\":24,\"showLabel\":true,\"labelWidth\":null,\"layout\":\"colFormItem\",\"defaultValue\":null,\"required\":true,\"regList\":[],\"changeTag\":true,\"document\":\"https://element.eleme.cn/#/zh-CN/component/time-picker\",\"formId\":121,\"renderKey\":1600316421235},\"style\":{\"width\":\"100%\"},\"disabled\":false,\"clearable\":true,\"placeholder\":\"请选择时间范围\",\"format\":\"HH:mm\",\"value-format\":\"HH:mm\",\"__vModel__\":\"time\"},{\"__config__\":{\"label\":\"幻灯片\",\"tag\":\"self-upload\",\"tagIcon\":\"selfUpload\",\"layout\":\"colFormItem\",\"defaultValue\":null,\"showLabel\":true,\"labelWidth\":null,\"required\":true,\"span\":24,\"showTip\":false,\"buttonText\":\"\",\"regList\":[],\"changeTag\":true,\"document\":\"https://element.eleme.cn/#/zh-CN/component/upload\",\"formId\":122,\"renderKey\":1600316451807},\"__slot__\":{\"list-type\":true},\"disabled\":true,\"accept\":\"image\",\"name\":\"file\",\"multiple\":true,\"__vModel__\":\"silderImgs\"},{\"__config__\":{\"label\":\"状态\",\"tag\":\"el-switch\",\"tagIcon\":\"switch\",\"defaultValue\":1,\"span\":24,\"showLabel\":true,\"labelWidth\":null,\"layout\":\"colFormItem\",\"required\":true,\"regList\":[],\"changeTag\":true,\"document\":\"https://element.eleme.cn/#/zh-CN/component/switch\",\"formId\":124,\"renderKey\":1600316508895},\"style\":{},\"disabled\":false,\"active-text\":\"开启\",\"inactive-text\":\"关闭\",\"active-color\":null,\"inactive-color\":null,\"active-value\":1,\"inactive-value\":0,\"__vModel__\":\"status\"}]}', '2020-09-17 12:23:38', '2020-10-20 17:57:52'); -INSERT INTO `eb_system_form_temp` VALUES (124, '微信提现申请', '微信提现申请', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"姓名\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"realName\",\"placeholder\":\"请输入姓名\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"20\",\"show-word-limit\":false,\"readonly\":false,\"disabled\":false},{\"__config__\":{\"label\":\"提现金额\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":126,\"renderKey\":1600828362052,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入提现金额\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":true,\"disabled\":false,\"__vModel__\":\"extractPrice\"},{\"__config__\":{\"label\":\"微信号\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":127,\"renderKey\":1600828491788,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入微信号\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"wechat\"},{\"__config__\":{\"label\":\"备注\",\"labelWidth\":null,\"showLabel\":true,\"tag\":\"el-input\",\"tagIcon\":\"textarea\",\"required\":false,\"layout\":\"colFormItem\",\"span\":24,\"regList\":[],\"changeTag\":true,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"formId\":128,\"renderKey\":1600828493137,\"tips\":false},\"type\":\"textarea\",\"placeholder\":\"请输入备注\",\"autosize\":{\"minRows\":4,\"maxRows\":4},\"style\":{\"width\":\"100%\"},\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"mark\"}]}', '2020-09-23 10:38:16', '2021-10-30 11:46:02'); -INSERT INTO `eb_system_form_temp` VALUES (125, '银行卡提现申请', '银行卡提现申请', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"姓名\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"defaultValue\":\"\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"realName\",\"placeholder\":\"请输入姓名\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"15\",\"show-word-limit\":true,\"readonly\":false,\"disabled\":false},{\"__config__\":{\"label\":\"提现金额\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":101,\"renderKey\":1603703481683,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入提现金额\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":true,\"disabled\":false,\"__vModel__\":\"extractPrice\"},{\"__config__\":{\"label\":\"银行卡号\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":102,\"renderKey\":1603703520389,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入银行卡号\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"bankCode\"},{\"__config__\":{\"label\":\"开户行\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":103,\"renderKey\":1603703557229,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入开户行\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"bankName\"},{\"__config__\":{\"label\":\"备注\",\"labelWidth\":null,\"showLabel\":true,\"tag\":\"el-input\",\"tagIcon\":\"textarea\",\"required\":false,\"layout\":\"colFormItem\",\"span\":24,\"regList\":[],\"changeTag\":true,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"formId\":104,\"renderKey\":1603703559381,\"tips\":false},\"type\":\"textarea\",\"placeholder\":\"请输入备注\",\"autosize\":{\"minRows\":4,\"maxRows\":4},\"style\":{\"width\":\"100%\"},\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"mark\"}]}', '2020-10-26 17:14:21', '2021-10-30 11:46:11'); -INSERT INTO `eb_system_form_temp` VALUES (127, '采集商品配置', '采集商品配置', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"接口选择\",\"labelWidth\":150,\"showLabel\":true,\"tag\":\"el-radio-group\",\"tagIcon\":\"radio\",\"changeTag\":true,\"layout\":\"colFormItem\",\"span\":24,\"optionType\":\"default\",\"regList\":[],\"required\":true,\"border\":false,\"document\":\"https://element.eleme.cn/#/zh-CN/component/radio\",\"formId\":101,\"renderKey\":1607573281676,\"defaultValue\":2,\"tips\":true,\"tipsIsLink\":true,\"tipsLink\":\"http://help.crmeb.net/crmeb_java/2516275\",\"tipsDesc\":\"点击查看详细\"},\"__slot__\":{\"options\":[{\"label\":\"一号通\",\"value\":1},{\"label\":\"99Api\",\"value\":2}]},\"style\":{},\"size\":\"medium\",\"disabled\":false,\"__vModel__\":\"system_product_copy_type\"},{\"__config__\":{\"label\":\"99Api apiKey\",\"labelWidth\":150,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":107,\"renderKey\":1607574237325,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入99Api apiKey\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"copy_product_apikey\"}]}', '2020-12-10 12:04:13', '2021-11-02 16:57:27'); -INSERT INTO `eb_system_form_temp` VALUES (128, '物流查询', '物流查询', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"接口选择\",\"labelWidth\":150,\"showLabel\":true,\"tag\":\"el-radio-group\",\"tagIcon\":\"radio\",\"changeTag\":true,\"layout\":\"colFormItem\",\"span\":24,\"optionType\":\"default\",\"regList\":[],\"required\":true,\"border\":false,\"document\":\"https://element.eleme.cn/#/zh-CN/component/radio\",\"formId\":101,\"renderKey\":1607573397849,\"defaultValue\":1,\"tips\":true,\"tipsIsLink\":true,\"tipsLink\":\"http://help.crmeb.net/crmeb_java/2098998\",\"tipsDesc\":\"点击查看详细\"},\"__slot__\":{\"options\":[{\"label\":\"一号通\",\"value\":1},{\"label\":\"阿里云物流查询\",\"value\":2}]},\"style\":{},\"size\":\"medium\",\"disabled\":false,\"__vModel__\":\"logistics_type\"},{\"__config__\":{\"label\":\"快递查询密钥\",\"labelWidth\":150,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":101,\"renderKey\":1607574358258,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"阿里云云市场快递查询接口密钥购买地址：https://market.aliyun.com/products/57126001/cmapi021863.html?userCode=dligum2z\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"system_express_app_code\"}]}', '2020-12-10 12:11:38', '2021-11-02 16:56:00'); -INSERT INTO `eb_system_form_temp` VALUES (129, '电子面单', '电子面单', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"电子面单是否开启\",\"labelWidth\":150,\"showLabel\":true,\"tag\":\"el-radio-group\",\"tagIcon\":\"radio\",\"changeTag\":true,\"layout\":\"colFormItem\",\"span\":24,\"optionType\":\"default\",\"regList\":[],\"required\":true,\"border\":false,\"document\":\"https://element.eleme.cn/#/zh-CN/component/radio\",\"formId\":101,\"renderKey\":1607573397849,\"defaultValue\":1,\"tips\":true,\"tipsIsLink\":true,\"tipsLink\":\"http://help.crmeb.net/crmeb_java/2098999\",\"tipsDesc\":\"点击查看详细\"},\"__slot__\":{\"options\":[{\"label\":\"打开\",\"value\":1},{\"label\":\"关闭\",\"value\":2}]},\"style\":{},\"size\":\"medium\",\"disabled\":false,\"__vModel__\":\"config_export_open\"},{\"__config__\":{\"label\":\"发货人姓名\",\"labelWidth\":150,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":101,\"renderKey\":1607573602374,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"快递面单发货人姓名\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"el-icon-warning-outline\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"config_export_to_name\"},{\"__config__\":{\"label\":\"发货人电话\",\"labelWidth\":150,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":103,\"renderKey\":1607573608679,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"快递面单发货人电话\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"config_export_to_tel\"},{\"__config__\":{\"label\":\"发货人详细地址\",\"labelWidth\":150,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":104,\"renderKey\":1607573609130,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"快递面单发货人详细地址\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"config_export_to_address\"},{\"__config__\":{\"label\":\"电子面单打印机编号\",\"labelWidth\":150,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":105,\"renderKey\":1607573609617,\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请购买快递100电子面单打印机，淘宝地址：https://m.tb.cn/h.437NvI0 官网：https://www.kuaidi100.com/cloud/print/cloudprinterSecond.shtml\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"el-icon-warning-outline\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"config_export_siid\"}]}', '2020-12-10 12:18:18', '2021-11-02 16:55:15'); -INSERT INTO `eb_system_form_temp` VALUES (130, '充值退款', '充值退款', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"编号\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"formId\":102,\"renderKey\":1608271559043},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"placeholder\":\"请输入编号\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":true,\"__vModel__\":\"id\"},{\"__config__\":{\"label\":\"退款单号\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[]},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"orderId\",\"placeholder\":\"请输入退款单号退款单号退款单号\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"\",\"show-word-limit\":true,\"readonly\":true,\"disabled\":false},{\"__config__\":{\"label\":\"状态\",\"labelWidth\":null,\"showLabel\":true,\"tag\":\"el-radio-group\",\"tagIcon\":\"radio\",\"changeTag\":true,\"layout\":\"colFormItem\",\"span\":24,\"optionType\":\"default\",\"regList\":[],\"required\":true,\"border\":false,\"document\":\"https://element.eleme.cn/#/zh-CN/component/radio\",\"formId\":101,\"renderKey\":1608263757741,\"defaultValue\":1},\"__slot__\":{\"options\":[{\"label\":\"本金+赠送\",\"value\":2},{\"label\":\"仅本金\",\"value\":1}]},\"style\":{},\"size\":\"medium\",\"disabled\":false,\"__vModel__\":\"type\"}]}', '2020-12-18 11:56:49', '2020-12-18 14:49:17'); -INSERT INTO `eb_system_form_temp` VALUES (133, '首页配置', '首页配置', '{\"formRef\":\"stivepeimEdited\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":140,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"精品推荐简介\",\"labelWidth\":null,\"showLabel\":true,\"tag\":\"el-input\",\"tagIcon\":\"textarea\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"regList\":[],\"changeTag\":true,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"formId\":103,\"renderKey\":1591148546642},\"type\":\"textarea\",\"placeholder\":\"请输入精品推荐简介\",\"autosize\":{\"minRows\":4,\"maxRows\":4},\"style\":{\"width\":\"100%\"},\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"bastInfo\"},{\"__config__\":{\"label\":\"首发新品简介\",\"labelWidth\":null,\"showLabel\":true,\"tag\":\"el-input\",\"tagIcon\":\"textarea\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"regList\":[],\"changeTag\":true,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"formId\":104,\"renderKey\":1591148566944},\"type\":\"textarea\",\"placeholder\":\"请输入首发新品简介\",\"autosize\":{\"minRows\":4,\"maxRows\":4},\"style\":{\"width\":\"100%\"},\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"firstInfo\"},{\"__config__\":{\"label\":\"促销单品简介\",\"labelWidth\":null,\"showLabel\":true,\"tag\":\"el-input\",\"tagIcon\":\"textarea\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"regList\":[],\"changeTag\":true,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"formId\":105,\"renderKey\":1591148567412},\"type\":\"textarea\",\"placeholder\":\"请输入促销单品简介\",\"autosize\":{\"minRows\":4,\"maxRows\":4},\"style\":{\"width\":\"100%\"},\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"salesInfo\"},{\"__config__\":{\"label\":\"热门推荐简介\",\"labelWidth\":null,\"showLabel\":true,\"tag\":\"el-input\",\"tagIcon\":\"textarea\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"regList\":[],\"changeTag\":true,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"formId\":102,\"renderKey\":1597821020375},\"type\":\"textarea\",\"placeholder\":\"请输入热门推荐简介\",\"autosize\":{\"minRows\":4,\"maxRows\":4},\"style\":{\"width\":\"100%\"},\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"hotInfo\"}]}', '2021-02-06 11:19:43', '2021-02-06 11:19:43'); -INSERT INTO `eb_system_form_temp` VALUES (136, '拼团列表banner', '拼团列表banner', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":120,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"图片(690x300)\",\"tag\":\"self-upload\",\"tagIcon\":\"selfUpload\",\"layout\":\"colFormItem\",\"defaultValue\":null,\"showLabel\":true,\"labelWidth\":null,\"required\":true,\"span\":24,\"showTip\":false,\"buttonText\":\"\",\"regList\":[],\"changeTag\":true,\"document\":\"https://element.eleme.cn/#/zh-CN/component/upload\",\"formId\":102,\"renderKey\":1620439915360,\"tips\":false},\"__slot__\":{\"list-type\":true},\"disabled\":true,\"accept\":\"image\",\"name\":\"file\",\"multiple\":false,\"__vModel__\":\"image\"}]}', '2021-05-08 10:12:43', '2021-12-22 17:34:37'); -INSERT INTO `eb_system_form_temp` VALUES (139, '商城配置', '商城配置', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"Api地址【支付回调】\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[]},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"api_url\",\"placeholder\":\"webSiet网站地址Api地址【支付回调】Api地址【支付回调】\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"\",\"show-word-limit\":true,\"readonly\":false,\"disabled\":false},{\"__config__\":{\"label\":\"主页左上角logo[后台]\",\"tag\":\"self-upload\",\"tagIcon\":\"upload\",\"layout\":\"colFormItem\",\"defaultValue\":null,\"showLabel\":true,\"labelWidth\":null,\"required\":true,\"span\":24,\"showTip\":false,\"buttonText\":\"点击上传\",\"regList\":[],\"changeTag\":true,\"fileSize\":2,\"sizeUnit\":\"MB\",\"document\":\"https://element.eleme.cn/#/zh-CN/component/upload\",\"formId\":124,\"renderKey\":1595658064081},\"__slot__\":{\"list-type\":true},\"action\":\"https://jsonplaceholder.typicode.com/posts/\",\"disabled\":true,\"accept\":\"\",\"name\":\"file\",\"auto-upload\":true,\"list-type\":\"picture-card\",\"multiple\":false,\"__vModel__\":\"site_logo_lefttop\"},{\"__config__\":{\"label\":\"主页左上角缩回菜单logo[后台]\",\"tag\":\"self-upload\",\"tagIcon\":\"upload\",\"layout\":\"colFormItem\",\"defaultValue\":null,\"showLabel\":true,\"labelWidth\":null,\"required\":true,\"span\":24,\"showTip\":false,\"buttonText\":\"点击上传\",\"regList\":[],\"changeTag\":true,\"fileSize\":2,\"sizeUnit\":\"MB\",\"document\":\"https://element.eleme.cn/#/zh-CN/component/upload\",\"formId\":127,\"renderKey\":1595658695317},\"__slot__\":{\"list-type\":true},\"action\":\"https://jsonplaceholder.typicode.com/posts/\",\"disabled\":true,\"accept\":\"\",\"name\":\"file\",\"auto-upload\":true,\"list-type\":\"text\",\"multiple\":false,\"__vModel__\":\"site_logo_square\"},{\"__config__\":{\"label\":\"登录页logo[后台]\",\"tag\":\"self-upload\",\"tagIcon\":\"upload\",\"layout\":\"colFormItem\",\"defaultValue\":null,\"showLabel\":true,\"labelWidth\":null,\"required\":true,\"span\":24,\"showTip\":false,\"buttonText\":\"点击上传\",\"regList\":[],\"changeTag\":true,\"fileSize\":2,\"sizeUnit\":\"MB\",\"document\":\"https://element.eleme.cn/#/zh-CN/component/upload\",\"formId\":101,\"renderKey\":1612510257294},\"__slot__\":{\"list-type\":true},\"action\":\"https://jsonplaceholder.typicode.com/posts/\",\"disabled\":true,\"accept\":\"\",\"name\":\"file\",\"auto-upload\":true,\"list-type\":\"picture-card\",\"multiple\":false,\"__vModel__\":\"site_logo_login\"},{\"__config__\":{\"label\":\"登录页背景图\",\"tag\":\"self-upload\",\"tagIcon\":\"upload\",\"layout\":\"colFormItem\",\"defaultValue\":null,\"showLabel\":true,\"labelWidth\":null,\"required\":true,\"span\":24,\"showTip\":false,\"buttonText\":\"点击上传\",\"regList\":[],\"changeTag\":true,\"fileSize\":2,\"sizeUnit\":\"MB\",\"document\":\"https://element.eleme.cn/#/zh-CN/component/upload\",\"formId\":152,\"renderKey\":1596017451389},\"__slot__\":{\"list-type\":true},\"action\":\"https://jsonplaceholder.typicode.com/posts/\",\"disabled\":true,\"accept\":\"\",\"name\":\"file\",\"auto-upload\":true,\"list-type\":\"text\",\"multiple\":false,\"__vModel__\":\"admin_login_bg_pic\"}]}', '2021-08-19 15:15:38', '2021-08-19 15:15:38'); -INSERT INTO `eb_system_form_temp` VALUES (140, '导航下拉菜单', '导航下拉菜单', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"标题\",\"labelWidth\":null,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[{\"pattern\":\"/^1(3|4|5|7|8|9)\\\\d{9}$/\",\"message\":\"手机号格式错误\"}],\"tips\":false},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"select_nav_name\",\"placeholder\":\"请输入标题标题标题\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"el-icon-mobile\",\"suffix-icon\":\"\",\"maxlength\":11,\"show-word-limit\":true,\"readonly\":false,\"disabled\":false}]}', '2021-09-08 10:45:37', '2021-10-29 18:36:06'); -INSERT INTO `eb_system_form_temp` VALUES (141, '统计', '统计', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"统计代码\",\"labelWidth\":null,\"showLabel\":true,\"tag\":\"el-input\",\"tagIcon\":\"textarea\",\"required\":false,\"layout\":\"colFormItem\",\"span\":24,\"regList\":[],\"changeTag\":true,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"formId\":101,\"renderKey\":1631689599398,\"tips\":true,\"tipsDesc\":\"用于前端动态执行的一段js代码\"},\"type\":\"textarea\",\"placeholder\":\"请粘贴统计JS代码\",\"autosize\":{\"minRows\":4,\"maxRows\":4},\"style\":{\"width\":\"95%\"},\"maxlength\":null,\"show-word-limit\":false,\"readonly\":false,\"disabled\":false,\"__vModel__\":\"crmeb_tongji_js\"}]}', '2021-09-15 15:09:21', '2021-10-29 18:35:38'); -INSERT INTO `eb_system_form_temp` VALUES (143, '易联云打印设置', '易联云打印设置', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true,\"fields\":[{\"__config__\":{\"label\":\"易联云应用ID\",\"labelWidth\":180,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"tips\":true,\"tipsDesc\":\"易联云 官网获取\"},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"ylyprint_app_id\",\"placeholder\":\"请输入易联云应用ID易联云应用ID易联云应用ID易联云应用ID易联云应用ID易联云应用ID易联云应用ID易联云应用ID\",\"style\":{\"width\":\"97%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":11,\"show-word-limit\":true,\"readonly\":false,\"disabled\":false},{\"__config__\":{\"label\":\"易联云应用密钥\",\"labelWidth\":180,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"tips\":false,\"formId\":101,\"renderKey\":1638000310366},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"ylyprint_app_secret\",\"placeholder\":\"请输入易联云应用密钥\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"\",\"show-word-limit\":true,\"readonly\":false,\"disabled\":false},{\"__config__\":{\"label\":\"易联云打印机设备码\",\"labelWidth\":180,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"tips\":false,\"formId\":102,\"renderKey\":1638000357901},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"ylyprint_app_machine_code\",\"placeholder\":\"请输入易联云打印机设备码\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"\",\"show-word-limit\":true,\"readonly\":false,\"disabled\":false},{\"__config__\":{\"label\":\"易联云打印机设备密钥\",\"labelWidth\":180,\"showLabel\":true,\"changeTag\":true,\"tag\":\"el-input\",\"tagIcon\":\"input\",\"required\":true,\"layout\":\"colFormItem\",\"span\":24,\"document\":\"https://element.eleme.cn/#/zh-CN/component/input\",\"regList\":[],\"tips\":false,\"formId\":103,\"renderKey\":1638000464706},\"__slot__\":{\"prepend\":\"\",\"append\":\"\"},\"__vModel__\":\"ylyprint_app_machine_msign\",\"placeholder\":\"请输入易联云打印机设备密钥\",\"style\":{\"width\":\"100%\"},\"clearable\":true,\"prefix-icon\":\"\",\"suffix-icon\":\"\",\"maxlength\":\"\",\"show-word-limit\":true,\"readonly\":false,\"disabled\":false},{\"__config__\":{\"label\":\"支付成功自动打印开关\",\"tag\":\"el-switch\",\"tagIcon\":\"switch\",\"defaultValue\":\"\'0\'\",\"span\":24,\"showLabel\":true,\"labelWidth\":180,\"layout\":\"colFormItem\",\"required\":true,\"tips\":false,\"tipsDesc\":\"\",\"tipsIsLink\":false,\"tipsLink\":\"\",\"regList\":[],\"changeTag\":true,\"document\":\"https://element.eleme.cn/#/zh-CN/component/switch\",\"formId\":101,\"renderKey\":1638002536348},\"style\":{},\"disabled\":false,\"active-text\":\"\",\"inactive-text\":\"\",\"active-color\":null,\"inactive-color\":null,\"active-value\":\"\'1\'\",\"inactive-value\":\"\'0\'\",\"__vModel__\":\"ylyprint_auto_status\"},{\"__config__\":{\"label\":\"打印开关\",\"tag\":\"el-switch\",\"tagIcon\":\"switch\",\"defaultValue\":\"\'1\'\",\"span\":24,\"showLabel\":true,\"labelWidth\":180,\"layout\":\"colFormItem\",\"required\":true,\"tips\":false,\"tipsDesc\":\"\",\"tipsIsLink\":false,\"tipsLink\":\"\",\"regList\":[],\"changeTag\":true,\"document\":\"https://element.eleme.cn/#/zh-CN/component/switch\",\"formId\":102,\"renderKey\":1638156858490},\"style\":{},\"disabled\":false,\"active-text\":\"\",\"inactive-text\":\"\",\"active-color\":null,\"inactive-color\":null,\"active-value\":\"\'1\'\",\"inactive-value\":\"\'0\'\",\"__vModel__\":\"ylyprint_status\"}]}', '2021-11-27 16:09:51', '2021-12-10 12:17:01'); - --- ---------------------------- --- Table structure for eb_system_group --- ---------------------------- -DROP TABLE IF EXISTS `eb_system_group`; -CREATE TABLE `eb_system_group` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '组合数据ID', - `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '数据组名称', - `info` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '简介', - `form_id` int(11) NOT NULL DEFAULT 0 COMMENT 'form 表单 id', - `create_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 74 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '组合数据表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of eb_system_group --- ---------------------------- -INSERT INTO `eb_system_group` VALUES (37, '移动端_首页中部推荐banner图', '移动端_首页中部推荐banner图', 95, '2020-05-15 10:38:22', '2021-02-24 18:24:35'); -INSERT INTO `eb_system_group` VALUES (48, '移动端_首页banner滚动图', '移动端_首页banner滚动图', 95, '2020-05-15 10:38:22', '2021-02-24 18:24:06'); -INSERT INTO `eb_system_group` VALUES (52, '移动端_首页_精品推荐benner图', '移动端_首页_精品推荐benner图', 91, '2020-05-15 10:38:22', '2021-02-24 18:11:47'); -INSERT INTO `eb_system_group` VALUES (53, '移动端_订单详情状态图', '移动端_订单详情状态图', 115, '2020-05-15 10:38:22', '2021-02-24 18:23:25'); -INSERT INTO `eb_system_group` VALUES (54, '移动端_个人中心功能菜单', '移动端_个人中心功能菜单', 89, '2020-05-15 10:38:22', '2021-02-24 18:22:22'); -INSERT INTO `eb_system_group` VALUES (55, '移动端_我的_签到天数配置', '移动端_我的_签到天数配置', 87, '2020-05-15 10:38:22', '2021-02-24 18:21:38'); -INSERT INTO `eb_system_group` VALUES (57, '移动端_首页_热门榜单推荐图片', '移动端_首页_热门榜单推荐图片', 94, '2020-05-15 10:38:22', '2021-02-24 18:11:34'); -INSERT INTO `eb_system_group` VALUES (58, '移动端_首页_首发新品推荐图片', '移动端_首页_首发新品推荐图片', 92, '2020-05-15 10:38:22', '2021-02-24 18:11:18'); -INSERT INTO `eb_system_group` VALUES (59, '移动端_首页活动_促销单品推荐图片', '移动端_首页活动_促销单品推荐图片', 93, '2020-05-15 10:38:22', '2021-02-24 18:10:29'); -INSERT INTO `eb_system_group` VALUES (60, '移动端_我的推广_分享海报', '移动端_我的推广_分享海报', 113, '2020-05-15 10:38:22', '2021-02-24 18:10:08'); -INSERT INTO `eb_system_group` VALUES (62, '移动端_充值金额设置', '移动端_设置充值金额额度选择', 103, '2020-05-15 10:38:22', '2021-02-24 18:08:56'); -INSERT INTO `eb_system_group` VALUES (65, '移动端_个人中心轮播图', '移动端_个人中心轮播图', 90, '2020-06-02 10:25:03', '2021-02-24 17:38:12'); -INSERT INTO `eb_system_group` VALUES (67, '移动端_首页导航', '移动端_首页导航', 96, '2020-06-02 14:54:41', '2021-02-24 17:37:59'); -INSERT INTO `eb_system_group` VALUES (68, '移动端_首页滚动新闻_二期配置', '移动端_首页滚动新闻_二期配置', 97, '2020-06-02 18:00:47', '2021-02-24 18:08:45'); -INSERT INTO `eb_system_group` VALUES (70, '移动端_首页超值爆款区域', '移动端_首页超值爆款渔区', 99, '2020-06-02 18:01:10', '2021-02-24 16:43:57'); -INSERT INTO `eb_system_group` VALUES (71, '移动端_热门搜索', '移动端_热门搜索', 102, '2020-06-03 11:34:42', '2021-02-24 16:43:36'); -INSERT INTO `eb_system_group` VALUES (72, 'WEBPC管理端_登录页轮播图', 'WEBPC管理端_登录页轮播图', 114, '2020-07-29 18:16:11', '2021-02-24 16:42:50'); -INSERT INTO `eb_system_group` VALUES (73, '移动端_拼团列表banner', '移动端_拼团列表banner', 136, '2021-05-08 10:13:24', '2021-05-08 10:13:24'); - --- ---------------------------- --- Table structure for eb_system_group_data --- ---------------------------- -DROP TABLE IF EXISTS `eb_system_group_data`; -CREATE TABLE `eb_system_group_data` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '组合数据详情ID', - `gid` int(11) NOT NULL DEFAULT 0 COMMENT '对应的数据组id', - `value` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '数据组对应的数据值（json数据）', - `sort` int(11) NOT NULL DEFAULT 0 COMMENT '数据排序', - `status` tinyint(1) NOT NULL DEFAULT 1 COMMENT '状态（1：开启；2：关闭；）', - `create_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1250 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '组合数据详情表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of eb_system_group_data --- ---------------------------- -INSERT INTO `eb_system_group_data` VALUES (39, 55, '{\"fields\":[{\"name\":\"title\",\"title\":\"title\",\"value\":\"第一天\"},{\"name\":\"day\",\"title\":\"day\",\"value\":\"1\"},{\"name\":\"integral\",\"title\":\"integral\",\"value\":\"10\"},{\"name\":\"experience\",\"title\":\"experience\",\"value\":\"10\"}],\"id\":87,\"sort\":1,\"status\":true}', 1, 1, '2020-05-28 14:34:00', '2020-05-28 15:08:02'); -INSERT INTO `eb_system_group_data` VALUES (40, 55, '{\"fields\":[{\"name\":\"title\",\"title\":\"title\",\"value\":\"第二天\"},{\"name\":\"day\",\"title\":\"day\",\"value\":\"2\"},{\"name\":\"integral\",\"title\":\"integral\",\"value\":\"20\"},{\"name\":\"experience\",\"title\":\"experience\",\"value\":\"20\"}],\"id\":87,\"sort\":2,\"status\":true}', 2, 1, '2020-05-28 14:34:09', '2020-05-28 15:08:08'); -INSERT INTO `eb_system_group_data` VALUES (41, 55, '{\"fields\":[{\"name\":\"title\",\"title\":\"title\",\"value\":\"第三天\"},{\"name\":\"day\",\"title\":\"day\",\"value\":\"3\"},{\"name\":\"integral\",\"title\":\"integral\",\"value\":\"30\"},{\"name\":\"experience\",\"title\":\"experience\",\"value\":\"30\"}],\"id\":87,\"sort\":3,\"status\":true}', 3, 1, '2020-05-28 14:34:14', '2020-05-28 15:08:14'); -INSERT INTO `eb_system_group_data` VALUES (42, 55, '{\"fields\":[{\"name\":\"title\",\"title\":\"title\",\"value\":\"第四天\"},{\"name\":\"day\",\"title\":\"day\",\"value\":\"4\"},{\"name\":\"integral\",\"title\":\"integral\",\"value\":\"40\"},{\"name\":\"experience\",\"title\":\"experience\",\"value\":\"40\"}],\"id\":87,\"sort\":4,\"status\":true}', 4, 1, '2020-05-28 14:34:19', '2020-05-28 15:08:20'); -INSERT INTO `eb_system_group_data` VALUES (43, 55, '{\"fields\":[{\"name\":\"title\",\"title\":\"title\",\"value\":\"第五天\"},{\"name\":\"day\",\"title\":\"day\",\"value\":\"5\"},{\"name\":\"integral\",\"title\":\"integral\",\"value\":\"50\"},{\"name\":\"experience\",\"title\":\"experience\",\"value\":\"50\"}],\"id\":87,\"sort\":5,\"status\":true}', 5, 1, '2020-05-28 14:34:34', '2020-05-28 15:08:26'); -INSERT INTO `eb_system_group_data` VALUES (44, 55, '{\"fields\":[{\"name\":\"title\",\"title\":\"title\",\"value\":\"第六天\"},{\"name\":\"day\",\"title\":\"day\",\"value\":\"6\"},{\"name\":\"integral\",\"title\":\"integral\",\"value\":\"60\"},{\"name\":\"experience\",\"title\":\"experience\",\"value\":\"60\"}],\"id\":87,\"sort\":6,\"status\":true}', 6, 1, '2020-05-28 14:34:39', '2021-07-07 09:48:54'); -INSERT INTO `eb_system_group_data` VALUES (71, 52, '{\"fields\":[{\"name\":\"name\",\"title\":\"name\",\"value\":\"pro\"},{\"name\":\"url\",\"title\":\"url\",\"value\":\"/pages/users/user_vip/index\"},{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/88cea6884f5e4ae48b8e407266fc03dbnqk5y6cdcv.jpg\"}],\"id\":91,\"sort\":3,\"status\":true}', 3, 1, '2020-06-02 10:43:33', '2021-12-25 14:22:31'); -INSERT INTO `eb_system_group_data` VALUES (91, 71, '{\"fields\":[{\"name\":\"title\",\"title\":\"title\",\"value\":\"键盘\"}],\"id\":102,\"sort\":1,\"status\":true}', 1, 1, '2020-06-03 11:34:54', '2021-11-02 14:38:13'); -INSERT INTO `eb_system_group_data` VALUES (92, 71, '{\"fields\":[{\"name\":\"title\",\"title\":\"title\",\"value\":\"鞋子\"}],\"id\":102,\"sort\":2,\"status\":true}', 2, 1, '2020-06-03 11:35:00', '2020-06-03 11:35:00'); -INSERT INTO `eb_system_group_data` VALUES (93, 71, '{\"fields\":[{\"name\":\"title\",\"title\":\"title\",\"value\":\"男装\"}],\"id\":102,\"sort\":3,\"status\":true}', 3, 1, '2020-06-03 11:35:07', '2021-11-02 14:39:53'); -INSERT INTO `eb_system_group_data` VALUES (94, 71, '{\"fields\":[{\"name\":\"title\",\"title\":\"title\",\"value\":\"MacBook\"}],\"id\":102,\"sort\":4,\"status\":true}', 4, 1, '2020-06-03 11:35:29', '2021-11-02 14:40:03'); -INSERT INTO `eb_system_group_data` VALUES (95, 62, '{\"fields\":[{\"name\":\"price\",\"title\":\"price\",\"value\":\"1\"},{\"name\":\"give_money\",\"title\":\"give_money\",\"value\":\"1\"}],\"id\":103,\"sort\":1,\"status\":true}', 1, 1, '2020-06-10 15:13:01', '2021-08-24 14:16:18'); -INSERT INTO `eb_system_group_data` VALUES (96, 62, '{\"fields\":[{\"name\":\"price\",\"title\":\"price\",\"value\":\"30.00\"},{\"name\":\"give_money\",\"title\":\"give_money\",\"value\":\"3.00\"}],\"id\":103,\"sort\":2,\"status\":true}', 2, 1, '2020-06-10 15:13:15', '2020-06-10 15:13:15'); -INSERT INTO `eb_system_group_data` VALUES (97, 62, '{\"fields\":[{\"name\":\"price\",\"title\":\"price\",\"value\":\"50.00\"},{\"name\":\"give_money\",\"title\":\"give_money\",\"value\":\"5.00\"}],\"id\":103,\"sort\":3,\"status\":true}', 3, 1, '2020-06-10 15:13:39', '2020-06-10 15:13:39'); -INSERT INTO `eb_system_group_data` VALUES (98, 62, '{\"fields\":[{\"name\":\"price\",\"title\":\"price\",\"value\":\"500.00\"},{\"name\":\"give_money\",\"title\":\"give_money\",\"value\":\"50.00\"}],\"id\":103,\"sort\":12,\"status\":true}', 12, 1, '2020-06-10 15:13:49', '2021-05-13 10:26:27'); -INSERT INTO `eb_system_group_data` VALUES (99, 62, '{\"fields\":[{\"name\":\"price\",\"title\":\"price\",\"value\":\"800.00\"},{\"name\":\"give_money\",\"title\":\"give_money\",\"value\":\"100.00\"}],\"id\":103,\"sort\":15,\"status\":true}', 15, 1, '2020-06-10 15:13:58', '2021-05-13 10:26:20'); -INSERT INTO `eb_system_group_data` VALUES (100, 60, '{\"fields\":[{\"name\":\"title\",\"title\":\"title\",\"value\":\"海报1\"},{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/2631ca1695464da982b202d239bdf717eunywwsimu.jpg\"}],\"id\":113,\"sort\":1,\"status\":true}', 1, 1, '2020-07-29 15:08:28', '2021-12-25 14:18:11'); -INSERT INTO `eb_system_group_data` VALUES (101, 60, '{\"fields\":[{\"name\":\"title\",\"title\":\"title\",\"value\":\"海报2\"},{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/166caeeb0f234d5e93c4baebf533e3c6cpk8chqitx.jpg\"}],\"id\":113,\"sort\":2,\"status\":true}', 2, 1, '2020-07-29 15:08:41', '2021-12-25 14:18:24'); -INSERT INTO `eb_system_group_data` VALUES (102, 60, '{\"fields\":[{\"name\":\"title\",\"title\":\"title\",\"value\":\"海报3\"},{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/2a104b07589e45998fe604f81e56c216ozicop5k74.jpg\"}],\"id\":113,\"sort\":3,\"status\":true}', 3, 1, '2020-07-29 15:09:02', '2021-12-25 14:18:34'); -INSERT INTO `eb_system_group_data` VALUES (109, 72, '{\"fields\":[{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/7ccf9f4158794bf997d97b4e871dd34b4qy58l2fyg.png\"}],\"id\":114,\"sort\":1,\"status\":true}', 1, 1, '2020-07-29 18:16:33', '2021-12-25 16:37:54'); -INSERT INTO `eb_system_group_data` VALUES (111, 53, '{\"fields\":[{\"name\":\"orderStatus\",\"title\":\"orderStatus\",\"value\":\"0\"},{\"name\":\"image\",\"title\":\"image\",\"value\":\"crmebimage/public/maintain/2021/12/25/0eabacb2ab774f54bddd9b2b0ff212a49e7etvhouq.gif\"}],\"id\":115,\"sort\":1,\"status\":true}', 1, 1, '2020-07-29 19:59:14', '2021-12-25 14:20:00'); -INSERT INTO `eb_system_group_data` VALUES (112, 53, '{\"fields\":[{\"name\":\"orderStatus\",\"title\":\"orderStatus\",\"value\":\"1\"},{\"name\":\"image\",\"title\":\"image\",\"value\":\"crmebimage/public/maintain/2021/12/25/1d14f2d2fa8f451a9d46fccacc3aa661tdwihn07he.gif\"}],\"id\":115,\"sort\":1,\"status\":true}', 1, 1, '2020-07-29 19:59:29', '2021-12-25 14:21:43'); -INSERT INTO `eb_system_group_data` VALUES (113, 53, '{\"fields\":[{\"name\":\"orderStatus\",\"title\":\"orderStatus\",\"value\":\"2\"},{\"name\":\"image\",\"title\":\"image\",\"value\":\"crmebimage/public/maintain/2021/12/25/9deb872da95c42d2bf8c432075153b1egrrxlb666p.gif\"}],\"id\":115,\"sort\":1,\"status\":true}', 1, 1, '2020-07-29 19:59:47', '2021-12-25 14:23:21'); -INSERT INTO `eb_system_group_data` VALUES (114, 53, '{\"fields\":[{\"name\":\"orderStatus\",\"title\":\"orderStatus\",\"value\":\"3\"},{\"name\":\"image\",\"title\":\"image\",\"value\":\"crmebimage/public/maintain/2021/12/25/ca4e301ed76a44f8aa23e70b7df107b8v26l2p79u3.gif\"}],\"id\":115,\"sort\":1,\"status\":true}', 1, 1, '2020-07-29 20:00:02', '2021-12-25 14:25:09'); -INSERT INTO `eb_system_group_data` VALUES (115, 53, '{\"fields\":[{\"name\":\"orderStatus\",\"title\":\"orderStatus\",\"value\":\"4\"},{\"name\":\"image\",\"title\":\"image\",\"value\":\"crmebimage/public/maintain/2021/12/25/ca4e301ed76a44f8aa23e70b7df107b8v26l2p79u3.gif\"}],\"id\":115,\"sort\":1,\"status\":true}', 1, 1, '2020-07-29 20:00:14', '2021-12-25 14:25:50'); -INSERT INTO `eb_system_group_data` VALUES (116, 53, '{\"fields\":[{\"name\":\"orderStatus\",\"title\":\"orderStatus\",\"value\":\"9\"},{\"name\":\"image\",\"title\":\"image\",\"value\":\"crmebimage/public/maintain/2021/12/25/96cff8171dc8423ebd23559d0b14c8e8mv9d8a0iqw.gif\"}],\"id\":115,\"sort\":1,\"status\":true}', 1, 1, '2020-07-29 20:00:30', '2021-12-25 14:27:08'); -INSERT INTO `eb_system_group_data` VALUES (117, 37, '{\"fields\":[{\"name\":\"name\",\"title\":\"name\",\"value\":\"精品推荐\"},{\"name\":\"url\",\"title\":\"url\",\"value\":\"#\"},{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/d4c7282740fb4e71bd2d7e80fad985d8o1wfu26pyd.jpg\"}],\"id\":95,\"sort\":1,\"status\":true}', 1, 1, '2020-08-13 12:34:52', '2021-12-25 14:19:51'); -INSERT INTO `eb_system_group_data` VALUES (118, 37, '{\"fields\":[{\"name\":\"name\",\"title\":\"name\",\"value\":\"BANNER\"},{\"name\":\"url\",\"title\":\"url\",\"value\":\"#\"},{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/4bdd334e3b084908ae56b7ce1e576204a43i68txom.jpg\"}],\"id\":95,\"sort\":2,\"status\":true}', 2, 1, '2020-08-13 12:41:15', '2021-12-25 14:20:21'); -INSERT INTO `eb_system_group_data` VALUES (120, 59, '{\"fields\":[{\"name\":\"name\",\"title\":\"name\",\"value\":\"1\"},{\"name\":\"url\",\"title\":\"url\",\"value\":\"1\"},{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/88cea6884f5e4ae48b8e407266fc03dbnqk5y6cdcv.jpg\"}],\"id\":93,\"sort\":1,\"status\":true}', 1, 1, '2020-08-13 13:04:36', '2021-12-25 14:27:03'); -INSERT INTO `eb_system_group_data` VALUES (122, 55, '{\"fields\":[{\"name\":\"title\",\"title\":\"title\",\"value\":\"第七天\"},{\"name\":\"day\",\"title\":\"day\",\"value\":\"7\"},{\"name\":\"integral\",\"title\":\"integral\",\"value\":\"70\"},{\"name\":\"experience\",\"title\":\"experience\",\"value\":\"70\"}],\"id\":87,\"sort\":7,\"status\":true}', 7, 1, '2020-12-21 16:18:20', '2021-07-07 09:50:00'); -INSERT INTO `eb_system_group_data` VALUES (125, 71, '{\"fields\":[{\"name\":\"title\",\"title\":\"title\",\"value\":\"茶叶\"}],\"id\":102,\"sort\":0,\"status\":true}', 0, 1, '2021-02-07 12:18:07', '2021-11-02 14:39:03'); -INSERT INTO `eb_system_group_data` VALUES (126, 58, '{\"fields\":[{\"name\":\"name\",\"title\":\"name\",\"value\":\"1111\"},{\"name\":\"url\",\"title\":\"url\",\"value\":\"1111\"},{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/acbb97c8b30e4c63ae92a81f8679ab06uib5yau47a.png\"}],\"id\":92,\"sort\":1,\"status\":true}', 1, 1, '2021-02-22 10:58:27', '2021-12-25 14:27:29'); -INSERT INTO `eb_system_group_data` VALUES (127, 69, '{\"fields\":[{\"name\":\"image\",\"title\":\"image\",\"value\":\"crmebimage/maintain/2021/02/24/23ab5b9968aa4e29a245ea8b8a4804cbkscfppxkwq.png\"},{\"name\":\"title\",\"title\":\"title\",\"value\":\"stivepeim\"},{\"name\":\"info\",\"title\":\"info\",\"value\":\"stivepeim\"},{\"name\":\"link\",\"title\":\"link\",\"value\":\"/pages/activity/goods_seckill/index\"}],\"id\":98,\"sort\":1,\"status\":true}', 1, 1, '2021-02-24 10:07:52', '2021-02-24 10:07:52'); -INSERT INTO `eb_system_group_data` VALUES (128, 57, '{\"fields\":[{\"name\":\"name\",\"title\":\"name\",\"value\":\"21212\"},{\"name\":\"url\",\"title\":\"url\",\"value\":\"https://crmeb.com\"},{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/c17d24b632b544828bd4c70744bc2931tmnu4ffkoj.png\"}],\"id\":94,\"sort\":1,\"status\":true}', 1, 1, '2021-02-24 16:15:46', '2021-12-25 14:27:51'); -INSERT INTO `eb_system_group_data` VALUES (129, 73, '{\"fields\":[{\"name\":\"image\",\"title\":\"image\",\"value\":\"crmebimage/public/maintain/2021/12/25/e07dda98525d4226818de310cb3c21ae6hg5f2sv5m.png\"}],\"id\":136,\"sort\":1,\"status\":true}', 1, 1, '2021-05-08 10:13:47', '2021-12-25 12:36:56'); -INSERT INTO `eb_system_group_data` VALUES (131, 62, '{\"fields\":[{\"name\":\"price\",\"title\":\"price\",\"value\":\"100\"},{\"name\":\"give_money\",\"title\":\"give_money\",\"value\":\"10\"}],\"id\":103,\"sort\":8,\"status\":true}', 8, 1, '2021-05-13 10:24:56', '2021-05-13 10:26:10'); -INSERT INTO `eb_system_group_data` VALUES (132, 62, '{\"fields\":[{\"name\":\"price\",\"title\":\"price\",\"value\":\"200\"},{\"name\":\"give_money\",\"title\":\"give_money\",\"value\":\"20\"}],\"id\":103,\"sort\":9,\"status\":true}', 9, 1, '2021-05-13 10:25:07', '2021-05-13 10:26:05'); -INSERT INTO `eb_system_group_data` VALUES (133, 62, '{\"fields\":[{\"name\":\"price\",\"title\":\"price\",\"value\":\"300\"},{\"name\":\"give_money\",\"title\":\"give_money\",\"value\":\"30\"}],\"id\":103,\"sort\":10,\"status\":true}', 10, 1, '2021-05-13 10:25:15', '2021-05-13 10:26:00'); -INSERT INTO `eb_system_group_data` VALUES (134, 62, '{\"fields\":[{\"name\":\"price\",\"title\":\"price\",\"value\":\"10\"},{\"name\":\"give_money\",\"title\":\"give_money\",\"value\":\"1\"}],\"id\":103,\"sort\":2,\"status\":true}', 2, 1, '2021-05-13 10:26:48', '2021-05-13 10:27:01'); -INSERT INTO `eb_system_group_data` VALUES (136, 37, '{\"fields\":[{\"name\":\"name\",\"title\":\"name\",\"value\":\"广告\"},{\"name\":\"url\",\"title\":\"url\",\"value\":\"#\"},{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/60e1d297eb5a49bca13b92e2b0b411c2siripyrcu0.jpg\"}],\"id\":95,\"sort\":1,\"status\":true}', 1, 1, '2021-06-03 12:20:13', '2021-12-25 14:20:10'); -INSERT INTO `eb_system_group_data` VALUES (1221, 68, '{\"fields\":[{\"name\":\"info\",\"title\":\"info\",\"value\":\"这是美好的一天\"},{\"name\":\"url\",\"title\":\"url\",\"value\":\"/pages/news_list/index\"},{\"name\":\"show\",\"title\":\"show\",\"value\":\"1\"}],\"id\":97,\"sort\":1,\"status\":true}', 1, 1, '2021-12-17 15:47:11', '2021-12-31 10:52:27'); -INSERT INTO `eb_system_group_data` VALUES (1224, 67, '{\"id\":96,\"sort\":0,\"fields\":[{\"name\":\"name\",\"title\":\"name\",\"value\":\"商品分类\"},{\"name\":\"show\",\"title\":\"show\",\"value\":\"1\"},{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/418c7649b2b646f4a13dd6f335ae927426354rq62r.png\"},{\"name\":\"url\",\"title\":\"url\",\"value\":\"/pages/goods_cate/goods_cate\"}],\"status\":true}', 0, 1, '2021-12-25 12:28:48', '2021-12-25 12:28:48'); -INSERT INTO `eb_system_group_data` VALUES (1225, 67, '{\"id\":96,\"sort\":1,\"fields\":[{\"name\":\"name\",\"title\":\"name\",\"value\":\"行业资讯\"},{\"name\":\"show\",\"title\":\"show\",\"value\":\"2\"},{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/71b89c4f080948a981e06c6ba748c5e1x9mfhpzhfd.png\"},{\"name\":\"url\",\"title\":\"url\",\"value\":\"/pages/news_list/index\"}],\"status\":true}', 1, 1, '2021-12-25 12:28:48', '2021-12-25 12:28:48'); -INSERT INTO `eb_system_group_data` VALUES (1226, 67, '{\"id\":96,\"sort\":2,\"fields\":[{\"name\":\"name\",\"title\":\"name\",\"value\":\"我要签到\"},{\"name\":\"show\",\"title\":\"show\",\"value\":\"2\"},{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/6ba5bf3b13c446cca8b703bf155ccc9362b0gvz1rc.png\"},{\"name\":\"url\",\"title\":\"url\",\"value\":\"/pages/users/user_sgin/index\"}],\"status\":true}', 2, 1, '2021-12-25 12:28:48', '2021-12-25 12:28:48'); -INSERT INTO `eb_system_group_data` VALUES (1227, 67, '{\"id\":96,\"sort\":3,\"fields\":[{\"name\":\"name\",\"title\":\"name\",\"value\":\"我的收藏\"},{\"name\":\"show\",\"title\":\"show\",\"value\":\"2\"},{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/2e47a337dbdf445d81b20c1b5aeedf01ybm0jmic0h.png\"},{\"name\":\"url\",\"title\":\"url\",\"value\":\"/pages/users/user_goods_collection/index\"}],\"status\":true}', 3, 1, '2021-12-25 12:28:48', '2021-12-25 12:28:48'); -INSERT INTO `eb_system_group_data` VALUES (1228, 67, '{\"id\":96,\"sort\":4,\"fields\":[{\"name\":\"name\",\"title\":\"name\",\"value\":\"拼团活动\"},{\"name\":\"show\",\"title\":\"show\",\"value\":\"2\"},{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/9ac69cbe9da4459db264b1902ff6f693spomyy6lkw.png\"},{\"name\":\"url\",\"title\":\"url\",\"value\":\"/pages/activity/goods_combination/index\"}],\"status\":true}', 4, 1, '2021-12-25 12:28:48', '2021-12-25 12:28:48'); -INSERT INTO `eb_system_group_data` VALUES (1229, 67, '{\"id\":96,\"sort\":5,\"fields\":[{\"name\":\"name\",\"title\":\"name\",\"value\":\"秒杀活动\"},{\"name\":\"show\",\"title\":\"show\",\"value\":\"2\"},{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/ebf72b915ecc4deab71c353b62ce7de9d0uv4lgzwz.png\"},{\"name\":\"url\",\"title\":\"url\",\"value\":\"/pages/activity/goods_seckill/index\"}],\"status\":true}', 5, 1, '2021-12-25 12:28:48', '2021-12-25 12:28:48'); -INSERT INTO `eb_system_group_data` VALUES (1230, 67, '{\"id\":96,\"sort\":6,\"fields\":[{\"name\":\"name\",\"title\":\"name\",\"value\":\"砍价活动\"},{\"name\":\"show\",\"title\":\"show\",\"value\":\"2\"},{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/6f599b7d21bf49dc9f93d6d1a1ef56e8hvyv1b4q5s.png\"},{\"name\":\"url\",\"title\":\"url\",\"value\":\"/pages/activity/goods_bargain/index\"}],\"status\":true}', 6, 1, '2021-12-25 12:28:48', '2021-12-25 12:28:48'); -INSERT INTO `eb_system_group_data` VALUES (1231, 67, '{\"id\":96,\"sort\":7,\"fields\":[{\"name\":\"name\",\"title\":\"name\",\"value\":\"地址管理\"},{\"name\":\"show\",\"title\":\"show\",\"value\":\"2\"},{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/e7e54160e9db4a9e814675763a80e58ce0j522s6ds.png\"},{\"name\":\"url\",\"title\":\"url\",\"value\":\"/pages/users/user_address_list/index\"}],\"status\":true}', 7, 1, '2021-12-25 12:28:48', '2021-12-25 12:28:48'); -INSERT INTO `eb_system_group_data` VALUES (1232, 67, '{\"id\":96,\"sort\":8,\"fields\":[{\"name\":\"name\",\"title\":\"name\",\"value\":\"订单管理\"},{\"name\":\"show\",\"title\":\"show\",\"value\":\"2\"},{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/3ab2dae5527742319ae003c58cca264duewwp3esg8.png\"},{\"name\":\"url\",\"title\":\"url\",\"value\":\"/pages/users/order_list/index\"}],\"status\":true}', 8, 1, '2021-12-25 12:28:48', '2021-12-25 12:28:48'); -INSERT INTO `eb_system_group_data` VALUES (1233, 67, '{\"id\":96,\"sort\":9,\"fields\":[{\"name\":\"name\",\"title\":\"name\",\"value\":\"优惠券\"},{\"name\":\"show\",\"title\":\"show\",\"value\":\"1\"},{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/21c84909461c434a8ff39d467ba8d648prefpnpq15.png\"},{\"name\":\"url\",\"title\":\"url\",\"value\":\"/pages/users/user_get_coupon/index\"}],\"status\":true}', 9, 1, '2021-12-25 12:28:48', '2021-12-25 12:28:48'); -INSERT INTO `eb_system_group_data` VALUES (1234, 48, '{\"id\":95,\"sort\":0,\"fields\":[{\"name\":\"name\",\"title\":\"name\",\"value\":\"pro\"},{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/ae020f17148b4cc19bcab221c0836dd1iy0vrck2jm.png\"},{\"name\":\"url\",\"title\":\"url\",\"value\":\"/pages/news_details/index?id=11\"}],\"status\":true}', 0, 1, '2021-12-25 12:30:53', '2021-12-25 12:30:53'); -INSERT INTO `eb_system_group_data` VALUES (1235, 48, '{\"id\":95,\"sort\":1,\"fields\":[{\"name\":\"name\",\"title\":\"name\",\"value\":\"123\"},{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/e07dda98525d4226818de310cb3c21ae6hg5f2sv5m.png\"},{\"name\":\"url\",\"title\":\"url\",\"value\":\"/pages/users/user_spread_user/index\"}],\"status\":true}', 1, 1, '2021-12-25 12:30:53', '2021-12-25 12:30:53'); -INSERT INTO `eb_system_group_data` VALUES (1236, 65, '{\"id\":90,\"sort\":0,\"fields\":[{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/9d95f61a5db84591972fbc90f31c1fb21g5krqax8i.jpg\"},{\"name\":\"url\",\"title\":\"url\",\"value\":\"www.crmeb.com\"}],\"status\":true}', 0, 1, '2021-12-25 12:32:06', '2021-12-25 12:32:06'); -INSERT INTO `eb_system_group_data` VALUES (1237, 65, '{\"id\":90,\"sort\":1,\"fields\":[{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/d4c7282740fb4e71bd2d7e80fad985d8o1wfu26pyd.jpg\"},{\"name\":\"url\",\"title\":\"url\",\"value\":\"www.crmeb.com\"},{\"name\":\"name\",\"title\":\"name\",\"value\":\"\"},{\"name\":\"info\",\"title\":\"info\",\"value\":\"\"}],\"status\":true}', 1, 1, '2021-12-25 12:32:06', '2021-12-25 12:32:06'); -INSERT INTO `eb_system_group_data` VALUES (1238, 54, '{\"id\":89,\"sort\":0,\"fields\":[{\"name\":\"wap_url\",\"title\":\"wap_url\",\"value\":\"/pages/users/user_vip/index\"},{\"name\":\"name\",\"title\":\"name\",\"value\":\"会员中心\"},{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/dd497d333f4541d7ae41b2c579706370jhp2x39yrg.png\"},{\"name\":\"url\",\"title\":\"url\",\"value\":\"/pages/users/user_vip/index\"}],\"status\":true}', 0, 1, '2021-12-25 12:35:21', '2021-12-25 12:35:21'); -INSERT INTO `eb_system_group_data` VALUES (1239, 54, '{\"id\":89,\"sort\":1,\"fields\":[{\"name\":\"wap_url\",\"title\":\"wap_url\",\"value\":\"/pages/activity/bargain/index\"},{\"name\":\"name\",\"title\":\"name\",\"value\":\"砍价记录\"},{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/5d6617d3440c4d67802fdf064b77b471qzfen9343d.png\"},{\"name\":\"url\",\"title\":\"url\",\"value\":\"/pages/activity/bargain/index\"}],\"status\":true}', 1, 1, '2021-12-25 12:35:21', '2021-12-25 12:35:21'); -INSERT INTO `eb_system_group_data` VALUES (1240, 54, '{\"id\":89,\"sort\":2,\"fields\":[{\"name\":\"wap_url\",\"title\":\"wap_url\",\"value\":\"/pages/users/user_spread_user/index\"},{\"name\":\"name\",\"title\":\"name\",\"value\":\"我的推广\"},{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/197b96e3a4d24728b4069b0c288326352gcds3duga.png\"},{\"name\":\"url\",\"title\":\"url\",\"value\":\"/pages/users/user_spread_user/index\"}],\"status\":true}', 2, 1, '2021-12-25 12:35:21', '2021-12-25 12:35:21'); -INSERT INTO `eb_system_group_data` VALUES (1241, 54, '{\"id\":89,\"sort\":3,\"fields\":[{\"name\":\"wap_url\",\"title\":\"wap_url\",\"value\":\"/pages/users/user_money/index\"},{\"name\":\"name\",\"title\":\"name\",\"value\":\"我的余额\"},{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/0624fe22d770438891ad666ebef9e21e1rhiepyec1.png\"},{\"name\":\"url\",\"title\":\"url\",\"value\":\"/pages/users/user_money/index\"}],\"status\":true}', 3, 1, '2021-12-25 12:35:21', '2021-12-25 12:35:21'); -INSERT INTO `eb_system_group_data` VALUES (1242, 54, '{\"id\":89,\"sort\":4,\"fields\":[{\"name\":\"wap_url\",\"title\":\"wap_url\",\"value\":\"/pages/users/user_address_list/index\"},{\"name\":\"name\",\"title\":\"name\",\"value\":\"地址信息\"},{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/886e04146694474c966d346222fe2897ealwo6qycj.png\"},{\"name\":\"url\",\"title\":\"url\",\"value\":\"/pages/users/user_address_list/index\"}],\"status\":true}', 4, 1, '2021-12-25 12:35:21', '2021-12-25 12:35:21'); -INSERT INTO `eb_system_group_data` VALUES (1243, 54, '{\"id\":89,\"sort\":5,\"fields\":[{\"name\":\"wap_url\",\"title\":\"wap_url\",\"value\":\"/pages/users/user_goods_collection/index\"},{\"name\":\"name\",\"title\":\"name\",\"value\":\"我的收藏\"},{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/3308f2d779874079b0e02ae206cf141bwb23ii2z52.png\"},{\"name\":\"url\",\"title\":\"url\",\"value\":\"/pages/users/user_goods_collection/index\"}],\"status\":true}', 5, 1, '2021-12-25 12:35:21', '2021-12-25 12:35:21'); -INSERT INTO `eb_system_group_data` VALUES (1244, 54, '{\"id\":89,\"sort\":6,\"fields\":[{\"name\":\"wap_url\",\"title\":\"wap_url\",\"value\":\"/pages/users/user_coupon/index\"},{\"name\":\"name\",\"title\":\"name\",\"value\":\"优惠券\"},{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/11113e1876ac427bb3173086a3bd6c5bhyan1ea9pz.png\"},{\"name\":\"url\",\"title\":\"url\",\"value\":\"/pages/users/user_coupon/index\"}],\"status\":true}', 6, 1, '2021-12-25 12:35:21', '2021-12-25 12:35:21'); -INSERT INTO `eb_system_group_data` VALUES (1245, 54, '{\"id\":89,\"sort\":7,\"fields\":[{\"name\":\"wap_url\",\"title\":\"wap_url\",\"value\":\"https://yzf.qq.com/xv/web/static/chat/index.html?sign=37ef9b97db2656c32340cde61ce2b56a2176efe72ac7ed421c77607b5c816611ec4775a17c7605b33df1ffe1d22a4ce7464dd07b\"},{\"name\":\"name\",\"title\":\"name\",\"value\":\"联系客服\"},{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/77ac54ce5f514ebbb89854f927f2a891dzefr2qxmh.png\"},{\"name\":\"url\",\"title\":\"url\",\"value\":\"/pages/service/index\"}],\"status\":true}', 7, 1, '2021-12-25 12:35:21', '2021-12-25 12:35:21'); -INSERT INTO `eb_system_group_data` VALUES (1246, 70, '{\"sort\":0,\"fields\":[{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/ec49b431bee545e09abc3dc294d1e54669dtn9bvuy.png\"},{\"name\":\"name\",\"title\":\"name\",\"value\":\"促销单品\"},{\"name\":\"info\",\"title\":\"info\",\"value\":\"多买多省\"},{\"name\":\"type\",\"title\":\"type\",\"value\":\"4\"}],\"status\":true}', 0, 1, '2021-12-25 12:42:57', '2021-12-25 12:42:57'); -INSERT INTO `eb_system_group_data` VALUES (1247, 70, '{\"sort\":1,\"fields\":[{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/c17d24b632b544828bd4c70744bc2931tmnu4ffkoj.png\"},{\"name\":\"name\",\"title\":\"name\",\"value\":\"精品推荐\"},{\"name\":\"info\",\"title\":\"info\",\"value\":\"精品推荐\"},{\"name\":\"type\",\"title\":\"type\",\"value\":\"1\"}],\"status\":true}', 1, 1, '2021-12-25 12:42:57', '2021-12-25 12:42:57'); -INSERT INTO `eb_system_group_data` VALUES (1248, 70, '{\"sort\":2,\"fields\":[{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/ae020f17148b4cc19bcab221c0836dd1iy0vrck2jm.png\"},{\"name\":\"name\",\"title\":\"name\",\"value\":\"热门榜单\"},{\"name\":\"info\",\"title\":\"info\",\"value\":\"热门榜单\"},{\"name\":\"type\",\"title\":\"type\",\"value\":\"2\"}],\"status\":true}', 2, 1, '2021-12-25 12:42:57', '2021-12-25 12:42:57'); -INSERT INTO `eb_system_group_data` VALUES (1249, 70, '{\"sort\":3,\"fields\":[{\"name\":\"pic\",\"title\":\"pic\",\"value\":\"crmebimage/public/maintain/2021/12/25/e07dda98525d4226818de310cb3c21ae6hg5f2sv5m.png\"},{\"name\":\"name\",\"title\":\"name\",\"value\":\"首发新品\"},{\"name\":\"info\",\"title\":\"info\",\"value\":\"首发新品\"},{\"name\":\"type\",\"title\":\"type\",\"value\":\"3\"}],\"status\":true}', 3, 1, '2021-12-25 12:42:57', '2021-12-25 12:42:57'); - --- ---------------------------- --- Table structure for eb_system_menu --- ---------------------------- -DROP TABLE IF EXISTS `eb_system_menu`; -CREATE TABLE `eb_system_menu` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `pid` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '父级ID', - `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称', - `icon` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'icon', - `perms` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '权限标识', - `component` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '组件路径', - `menu_type` varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'M' COMMENT '类型，M-目录，C-菜单，A-按钮', - `sort` int(5) NOT NULL DEFAULT 99999 COMMENT '排序', - `is_show` tinyint(1) NOT NULL DEFAULT 1 COMMENT '显示状态', - `is_delte` tinyint(1) UNSIGNED NULL DEFAULT 0 COMMENT '是否删除', - `create_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 405 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统菜单表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of eb_system_menu --- ---------------------------- -INSERT INTO `eb_system_menu` VALUES (1, 0, '运营', 'menu', NULL, '/dashboard', 'M', 1, 1, 0, '2021-11-16 12:11:17', '2021-12-03 13:16:14'); -INSERT INTO `eb_system_menu` VALUES (2, 0, '商品', 's-goods', NULL, '/store', 'M', 1, 1, 0, '2021-11-16 12:11:17', '2021-11-23 15:54:49'); -INSERT INTO `eb_system_menu` VALUES (3, 0, '订单', 's-order', NULL, '/order', 'M', 1, 1, 0, '2021-11-16 12:11:17', '2021-11-23 10:44:03'); -INSERT INTO `eb_system_menu` VALUES (4, 0, '用户', 'user-solid', NULL, '/user', 'M', 1, 1, 0, '2021-11-16 12:11:17', '2021-11-23 10:44:13'); -INSERT INTO `eb_system_menu` VALUES (5, 0, '内容', 's-management', NULL, '/content', 'M', 1, 1, 0, '2021-11-16 12:11:18', '2021-11-23 10:44:23'); -INSERT INTO `eb_system_menu` VALUES (6, 0, '应用', 's-promotion', NULL, '/appSetting', 'M', 1, 1, 0, '2021-11-16 12:11:18', '2021-11-23 10:44:35'); -INSERT INTO `eb_system_menu` VALUES (7, 0, '营销', 's-marketing', NULL, '/marketing', 'M', 1, 1, 0, '2021-11-16 12:11:18', '2021-11-23 10:44:51'); -INSERT INTO `eb_system_menu` VALUES (8, 0, '分销', 's-check', NULL, '/distribution', 'M', 1, 1, 0, '2021-11-16 12:11:18', '2021-11-23 10:45:07'); -INSERT INTO `eb_system_menu` VALUES (9, 0, '财务', 's-finance', NULL, '/financial', 'M', 1, 1, 0, '2021-11-16 12:11:18', '2021-11-23 10:45:19'); -INSERT INTO `eb_system_menu` VALUES (10, 0, '移动端管理', 'phone', NULL, '/javaMobile', 'M', 1, 1, 0, '2021-11-16 12:11:18', '2021-11-23 10:45:30'); -INSERT INTO `eb_system_menu` VALUES (12, 0, '设置', 's-tools', NULL, '/operation', 'M', 1, 1, 0, '2021-11-16 12:11:18', '2021-11-23 10:45:57'); -INSERT INTO `eb_system_menu` VALUES (13, 0, '维护', 's-open', NULL, '/maintain', 'M', 1, 1, 0, '2021-11-16 12:11:18', '2021-11-23 10:46:04'); -INSERT INTO `eb_system_menu` VALUES (14, 2, '商品管理', NULL, 'admin:product:list', '/store/index', 'C', 1, 1, 0, '2021-11-16 12:19:02', '2021-11-22 18:11:26'); -INSERT INTO `eb_system_menu` VALUES (15, 2, '商品分类', NULL, '', '/store/sort', 'C', 1, 1, 0, '2021-11-16 12:19:02', '2021-12-03 15:55:15'); -INSERT INTO `eb_system_menu` VALUES (16, 2, '商品规格', NULL, 'admin:product:rule:list', '/store/attr', 'C', 1, 1, 0, '2021-11-16 12:19:02', '2021-11-22 18:09:19'); -INSERT INTO `eb_system_menu` VALUES (17, 2, '商品评论', NULL, 'admin:product:reply:list', '/store/comment', 'C', 1, 1, 0, '2021-11-16 12:19:02', '2021-11-22 18:09:47'); -INSERT INTO `eb_system_menu` VALUES (18, 14, '商品添加', NULL, 'admin:product:save', '', 'A', 1, 1, 0, '2021-11-16 15:55:00', '2021-11-22 18:06:26'); -INSERT INTO `eb_system_menu` VALUES (19, 14, '商品修改', NULL, 'admin:product:update', '', 'A', 1, 1, 0, '2021-11-16 15:55:00', '2021-11-22 17:40:30'); -INSERT INTO `eb_system_menu` VALUES (20, 14, '商品删除', NULL, 'admin:product:delete', '', 'A', 1, 1, 0, '2021-11-16 15:55:00', '2021-11-22 17:41:41'); -INSERT INTO `eb_system_menu` VALUES (21, 14, '商品上架', NULL, 'admin:product:up', '', 'A', 1, 1, 0, '2021-11-16 15:55:00', '2021-11-22 17:41:33'); -INSERT INTO `eb_system_menu` VALUES (22, 14, '商品下架', NULL, 'admin:product:down', '', 'A', 1, 1, 0, '2021-11-16 15:55:00', '2021-11-22 17:42:03'); -INSERT INTO `eb_system_menu` VALUES (23, 14, '库存变动', NULL, '', 'api/admin/store/product/stock', 'A', 99999, 1, 0, '2021-11-16 15:55:00', '2021-11-16 15:55:00'); -INSERT INTO `eb_system_menu` VALUES (24, 14, '虚拟销量', NULL, '', 'api/admin/store/product/ficti', 'A', 99999, 1, 0, '2021-11-16 15:55:00', '2021-11-16 15:55:00'); -INSERT INTO `eb_system_menu` VALUES (25, 16, '规格添加', NULL, 'admin:product:rule:save', '', 'A', 1, 1, 0, '2021-11-16 15:55:00', '2021-11-23 16:03:23'); -INSERT INTO `eb_system_menu` VALUES (26, 16, '规格修改', NULL, 'admin:product:rule:update', '', 'A', 1, 1, 0, '2021-11-16 15:55:00', '2021-11-23 16:04:16'); -INSERT INTO `eb_system_menu` VALUES (27, 16, '规格删除', NULL, 'admin:product:rule:delete', '', 'A', 1, 1, 0, '2021-11-16 15:55:00', '2021-11-23 16:04:41'); -INSERT INTO `eb_system_menu` VALUES (28, 17, '商品评论添加', NULL, 'admin:product:reply:save', '', 'A', 1, 1, 0, '2021-11-16 15:55:00', '2021-11-23 16:05:52'); -INSERT INTO `eb_system_menu` VALUES (29, 17, '商品评论详情', NULL, 'admin:product:reply:info', '', 'A', 1, 1, 0, '2021-11-16 15:55:00', '2021-11-23 16:07:47'); -INSERT INTO `eb_system_menu` VALUES (30, 17, '商品评论删除', NULL, 'admin:product:reply:delete', '', 'A', 1, 1, 0, '2021-11-16 15:55:00', '2021-11-23 16:08:09'); -INSERT INTO `eb_system_menu` VALUES (31, 17, '商品评论回复', NULL, 'admin:product:reply:comment', '', 'A', 1, 1, 0, '2021-11-16 15:55:00', '2021-11-23 16:08:46'); -INSERT INTO `eb_system_menu` VALUES (32, 3, '订单', NULL, 'admin:order:list', '/order/index', 'C', 1, 1, 0, '2021-11-16 15:55:15', '2021-11-23 16:10:09'); -INSERT INTO `eb_system_menu` VALUES (33, 32, '订单删除', NULL, 'admin:order:delete', '', 'A', 1, 1, 0, '2021-11-16 15:58:16', '2021-11-23 16:11:59'); -INSERT INTO `eb_system_menu` VALUES (34, 32, '订单备注', NULL, 'admin:order:mark', '', 'A', 1, 1, 0, '2021-11-16 15:58:16', '2021-11-23 16:24:00'); -INSERT INTO `eb_system_menu` VALUES (35, 32, '订单退款', NULL, 'admin:order:refund', '', 'A', 1, 1, 0, '2021-11-16 15:58:16', '2021-11-23 16:12:39'); -INSERT INTO `eb_system_menu` VALUES (36, 32, '订单拒绝退款', NULL, 'admin:order:refund:refuse', '', 'A', 1, 1, 0, '2021-11-16 15:58:16', '2021-11-23 16:13:08'); -INSERT INTO `eb_system_menu` VALUES (37, 32, '订单发货', NULL, 'admin:order:send', '', 'A', 1, 1, 0, '2021-11-16 15:58:16', '2021-11-23 16:14:04'); -INSERT INTO `eb_system_menu` VALUES (38, 32, '订单更新', NULL, '', 'api/admin/store/order/update', 'A', 99999, 1, 0, '2021-11-16 15:58:16', '2021-11-16 15:58:16'); -INSERT INTO `eb_system_menu` VALUES (39, 4, '用户管理 ', NULL, 'admin:user:list', '/user/index', 'C', 1, 1, 0, '2021-11-16 16:05:50', '2021-11-23 16:41:21'); -INSERT INTO `eb_system_menu` VALUES (40, 4, '用户标签', NULL, 'admin:user:tag:list', '/user/label', 'C', 1, 1, 0, '2021-11-16 16:05:50', '2021-11-23 17:19:48'); -INSERT INTO `eb_system_menu` VALUES (41, 4, '用户等级', NULL, 'admin:system:user:level:list', '/user/grade', 'C', 1, 1, 0, '2021-11-16 16:05:50', '2021-11-23 17:22:35'); -INSERT INTO `eb_system_menu` VALUES (42, 4, '用户分组', NULL, 'admin:user:group:list', '/user/group', 'C', 1, 1, 0, '2021-11-16 16:05:50', '2021-11-23 17:29:42'); -INSERT INTO `eb_system_menu` VALUES (43, 39, '用户修改', NULL, 'admin:user:update', '', 'A', 1, 1, 0, '2021-11-16 16:12:46', '2021-11-23 16:28:58'); -INSERT INTO `eb_system_menu` VALUES (44, 39, '用户详情', NULL, 'admin:user:info', '', 'A', 1, 1, 0, '2021-11-16 16:12:46', '2021-11-23 16:29:23'); -INSERT INTO `eb_system_menu` VALUES (47, 39, '用户打标签', NULL, 'admin:user:tag', '', 'A', 1, 1, 0, '2021-11-16 16:12:46', '2021-11-23 16:31:01'); -INSERT INTO `eb_system_menu` VALUES (48, 39, '修改积分余额', NULL, 'admin:user:operate:founds', '', 'A', 1, 1, 0, '2021-11-16 16:12:47', '2021-11-23 16:31:47'); -INSERT INTO `eb_system_menu` VALUES (49, 40, '用户标签添加', NULL, 'admin:user:tag:save', '', 'A', 2, 1, 0, '2021-11-16 16:12:47', '2021-11-23 17:20:16'); -INSERT INTO `eb_system_menu` VALUES (50, 40, '用户标签修改', NULL, 'admin:user:tag:update', '', 'A', 1, 1, 0, '2021-11-16 16:12:47', '2021-11-23 17:20:49'); -INSERT INTO `eb_system_menu` VALUES (51, 40, '用户标签删除', NULL, 'admin:user:tag:delete', '', 'A', 3, 1, 0, '2021-11-16 16:12:47', '2021-11-23 17:21:20'); -INSERT INTO `eb_system_menu` VALUES (52, 41, '用户等级添加', NULL, 'admin:system:user:level:save', '', 'A', 1, 1, 0, '2021-11-16 16:12:47', '2021-11-23 17:24:36'); -INSERT INTO `eb_system_menu` VALUES (53, 41, '用户等级修改', NULL, 'admin:system:user:level:update', '', 'A', 2, 1, 0, '2021-11-16 16:12:47', '2021-11-23 17:25:04'); -INSERT INTO `eb_system_menu` VALUES (54, 41, '用户等级删除', NULL, 'admin:system:user:level:delete', '', 'A', 1, 1, 0, '2021-11-16 16:12:47', '2021-11-23 17:25:23'); -INSERT INTO `eb_system_menu` VALUES (55, 41, '使用/禁用等级', NULL, 'admin:system:user:level:use', '', 'A', 1, 1, 0, '2021-11-16 16:12:47', '2021-11-23 17:25:58'); -INSERT INTO `eb_system_menu` VALUES (56, 42, '用户分组修改', NULL, 'admin:user:group:update', '', 'A', 1, 1, 0, '2021-11-16 16:12:47', '2021-11-23 16:35:26'); -INSERT INTO `eb_system_menu` VALUES (57, 42, '用户分组删除', NULL, 'admin:user:group:delete', '', 'A', 1, 1, 0, '2021-11-16 16:12:47', '2021-11-23 16:37:05'); -INSERT INTO `eb_system_menu` VALUES (59, 42, '用户分组新增', NULL, 'admin:user:group:save', '', 'A', 1, 1, 0, '2021-11-16 16:12:47', '2021-11-23 16:37:46'); -INSERT INTO `eb_system_menu` VALUES (60, 5, '文章管理', NULL, 'admin:article:list', '/content/articleManager', 'C', 1, 1, 0, '2021-11-16 16:22:32', '2021-11-23 17:31:11'); -INSERT INTO `eb_system_menu` VALUES (61, 5, '文章分类', NULL, '', '/content/classifManager', 'C', 99999, 1, 0, '2021-11-16 16:22:32', '2021-11-16 16:22:32'); -INSERT INTO `eb_system_menu` VALUES (62, 60, '文章添加', NULL, 'admin:article:save', '', 'A', 1, 1, 0, '2021-11-16 16:24:52', '2021-11-23 17:33:03'); -INSERT INTO `eb_system_menu` VALUES (63, 60, '文章删除', NULL, 'admin:article:delete', '', 'A', 1, 1, 0, '2021-11-16 16:24:52', '2021-11-23 17:33:08'); -INSERT INTO `eb_system_menu` VALUES (64, 60, '文章修改', NULL, 'admin:article:update', '', 'A', 1, 1, 0, '2021-11-16 16:24:52', '2021-11-23 17:33:31'); -INSERT INTO `eb_system_menu` VALUES (67, 6, '公众号', NULL, '', '/appSetting/publicAccount', 'M', 99999, 1, 0, '2021-11-16 16:27:56', '2021-11-16 16:27:56'); -INSERT INTO `eb_system_menu` VALUES (68, 6, '小程序', NULL, '', '/appSetting/publicRoutine', 'M', 99999, 0, 0, '2021-11-16 16:27:56', '2021-12-29 09:34:58'); -INSERT INTO `eb_system_menu` VALUES (69, 67, '微信菜单', NULL, 'admin:wechat:menu:public:get', '/appSetting//publicAccount/wxMenus', 'C', 0, 1, 0, '2021-11-16 16:31:04', '2021-12-06 15:14:52'); -INSERT INTO `eb_system_menu` VALUES (70, 67, '自动回复', NULL, '', '/appSetting/publicAccount/wxReply', 'M', 1, 1, 0, '2021-11-16 16:31:04', '2021-11-23 17:52:08'); -INSERT INTO `eb_system_menu` VALUES (73, 69, '微信菜单保存', NULL, 'admin:wechat:menu:public:create', '', 'A', 1, 1, 0, '2021-11-16 16:38:07', '2021-11-23 17:47:16'); -INSERT INTO `eb_system_menu` VALUES (74, 69, '微信菜单删除', NULL, 'admin:wechat:menu:public:delete', '', 'A', 1, 1, 0, '2021-11-16 16:38:07', '2021-11-23 17:47:42'); -INSERT INTO `eb_system_menu` VALUES (75, 70, '微信关注回复', NULL, 'admin:wechat:keywords:reply:info:keywords', '/appSetting/publicAccount/wxReply/follow', 'C', 99999, 1, 0, '2021-11-16 16:38:07', '2021-12-06 15:16:51'); -INSERT INTO `eb_system_menu` VALUES (76, 70, '关键字回复', NULL, 'admin:wechat:keywords:reply:list', '/appSetting/publicAccount/wxReply/keyword', 'C', 99999, 1, 0, '2021-11-16 16:38:07', '2021-12-06 15:18:06'); -INSERT INTO `eb_system_menu` VALUES (77, 70, '无效关键词回复', NULL, '', '/appSetting/publicAccount/wxReply/replyIndex', 'C', 99999, 1, 0, '2021-11-16 16:38:07', '2021-11-16 16:38:07'); -INSERT INTO `eb_system_menu` VALUES (83, 7, '优惠券', NULL, '', '/marketing/coupon', 'M', 1, 1, 0, '2021-11-16 16:43:33', '2021-11-24 09:58:12'); -INSERT INTO `eb_system_menu` VALUES (84, 7, '积分', NULL, '', '/marketing/integral', 'M', 99999, 1, 0, '2021-11-16 16:43:33', '2021-11-16 16:43:33'); -INSERT INTO `eb_system_menu` VALUES (85, 7, '秒杀管理', NULL, '', '/marketing/seckill', 'M', 99999, 1, 0, '2021-11-16 16:43:33', '2021-11-16 16:43:33'); -INSERT INTO `eb_system_menu` VALUES (86, 7, '砍价管理', NULL, '', '/marketing/bargain', 'M', 99999, 1, 0, '2021-11-16 16:43:33', '2021-11-16 16:43:33'); -INSERT INTO `eb_system_menu` VALUES (87, 7, '拼团管理', NULL, '', '/marketing/groupBuy', 'M', 99999, 1, 0, '2021-11-16 16:43:34', '2021-11-16 16:43:34'); -INSERT INTO `eb_system_menu` VALUES (88, 7, '视频号管理', NULL, '', '/marketing/videoChannel', 'M', 99999, 1, 1, '2021-11-16 16:43:34', '2021-11-16 16:43:34'); -INSERT INTO `eb_system_menu` VALUES (89, 83, '优惠券', NULL, 'admin:coupon:list', '/marketing/coupon/list', 'C', 1, 1, 0, '2021-11-16 16:48:47', '2021-11-24 09:58:47'); -INSERT INTO `eb_system_menu` VALUES (90, 83, '领取记录', NULL, 'admin:coupon:user:list', '/marketing/coupon/record', 'C', 1, 1, 0, '2021-11-16 16:48:47', '2021-11-24 10:07:24'); -INSERT INTO `eb_system_menu` VALUES (91, 84, '积分配置', NULL, '', '/marketing/integral/integralconfig', 'C', 99999, 1, 0, '2021-11-16 16:48:47', '2021-11-16 16:48:47'); -INSERT INTO `eb_system_menu` VALUES (92, 84, '积分日志', NULL, 'admin:user:integral:list', '/marketing/integral/integrallog', 'C', 1, 1, 0, '2021-11-16 16:48:47', '2021-11-24 10:12:27'); -INSERT INTO `eb_system_menu` VALUES (93, 85, '秒杀配置', NULL, 'admin:seckill:manger:list', '/marketing/seckill/config', 'C', 1, 1, 0, '2021-11-16 16:48:47', '2021-11-24 10:14:46'); -INSERT INTO `eb_system_menu` VALUES (94, 85, '秒杀商品', NULL, 'admin:seckill:list', '/marketing/seckill/list', 'C', 1, 1, 0, '2021-11-16 16:48:47', '2021-11-24 10:14:23'); -INSERT INTO `eb_system_menu` VALUES (95, 86, '砍价商品', NULL, 'admin:bargain:list', '/marketing/bargain/bargainGoods', 'C', 1, 1, 0, '2021-11-16 16:48:47', '2021-11-24 10:21:47'); -INSERT INTO `eb_system_menu` VALUES (96, 86, '砍价列表', NULL, 'admin:bargain:user:list', '/marketing/bargain/bargainList', 'C', 1, 1, 0, '2021-11-16 16:48:47', '2021-11-24 10:28:10'); -INSERT INTO `eb_system_menu` VALUES (97, 87, '拼团商品', NULL, 'admin:combination:list', '/marketing/groupBuy/groupGoods', 'C', 1, 1, 0, '2021-11-16 16:48:47', '2021-11-24 10:31:41'); -INSERT INTO `eb_system_menu` VALUES (98, 87, '拼团列表', NULL, 'admin:combination:combine:list', '/marketing/groupBuy/groupList', 'C', 1, 1, 0, '2021-11-16 16:48:47', '2021-11-24 10:36:24'); -INSERT INTO `eb_system_menu` VALUES (99, 88, '商品列表', NULL, 'admin:pay:component:product:list', '/marketing/videoChannel/list', 'C', 1, 1, 1, '2021-11-16 16:48:47', '2021-11-24 10:48:43'); -INSERT INTO `eb_system_menu` VALUES (100, 88, '草稿列表', NULL, 'admin:pay:component:product:draft:list', '/marketing/videoChannel/draftList', 'C', 99999, 1, 1, '2021-11-16 16:48:47', '2021-12-08 19:12:09'); -INSERT INTO `eb_system_menu` VALUES (101, 89, '优惠券添加', NULL, 'admin:coupon:save', '', 'A', 1, 1, 0, '2021-11-16 16:50:01', '2021-11-24 09:59:33'); -INSERT INTO `eb_system_menu` VALUES (102, 89, '优惠券状态更新', NULL, 'admin:coupon:update:status', '', 'A', 1, 1, 0, '2021-11-16 16:50:02', '2021-11-24 10:02:10'); -INSERT INTO `eb_system_menu` VALUES (103, 90, '领取优惠券', NULL, '', 'api/admin/marketing/coupon/user/receive', 'A', 99999, 1, 0, '2021-11-16 16:50:02', '2021-11-16 16:50:02'); -INSERT INTO `eb_system_menu` VALUES (104, 8, '分销员管理', NULL, 'admin:retail:list', '/distribution/index', 'C', 0, 1, 0, '2021-11-16 16:52:00', '2021-12-02 09:33:34'); -INSERT INTO `eb_system_menu` VALUES (105, 8, '分销配置', NULL, 'admin:retail:spread:manage:get', '/distribution/distributionconfig', 'C', 1, 1, 0, '2021-11-16 16:52:00', '2021-12-02 09:33:17'); -INSERT INTO `eb_system_menu` VALUES (106, 9, '财务操作', NULL, '', '/financial/commission', 'M', 99999, 1, 0, '2021-11-16 16:59:00', '2021-11-16 16:59:00'); -INSERT INTO `eb_system_menu` VALUES (107, 9, '财务记录', NULL, '', '/financial/record', 'M', 99999, 1, 0, '2021-11-16 16:59:00', '2021-11-16 16:59:00'); -INSERT INTO `eb_system_menu` VALUES (108, 9, '佣金记录', NULL, 'admin:finance:monitor:brokerage:record', '/financial/brokerage', 'C', 1, 1, 0, '2021-11-16 16:59:00', '2021-12-02 09:45:09'); -INSERT INTO `eb_system_menu` VALUES (109, 106, '申请提现', NULL, 'admin:finance:apply:list', '/financial/commission/template', 'C', 1, 1, 0, '2021-11-16 17:01:41', '2021-12-02 09:44:29'); -INSERT INTO `eb_system_menu` VALUES (110, 107, '充值记录', NULL, 'admin:recharge:list', '/financial/record/charge', 'C', 1, 1, 0, '2021-11-16 17:01:41', '2021-12-02 09:43:01'); -INSERT INTO `eb_system_menu` VALUES (111, 107, '资金监控', NULL, 'admin:finance:monitor:list', '/financial/record/monitor', 'C', 1, 1, 0, '2021-11-16 17:01:41', '2021-12-02 09:43:34'); -INSERT INTO `eb_system_menu` VALUES (114, 10, '订单核销', NULL, '', '/javaMobile/orderCancellation', 'C', 99999, 1, 0, '2021-11-16 17:06:20', '2021-11-16 17:06:20'); -INSERT INTO `eb_system_menu` VALUES (115, 10, '订单统计', NULL, '', '/javaMobile/orderStatistics', 'C', 99999, 1, 0, '2021-11-16 17:06:20', '2021-11-16 17:06:20'); -INSERT INTO `eb_system_menu` VALUES (121, 12, '系统设置', NULL, 'admin:system:config:info', '/operation/setting', 'C', 9, 1, 0, '2021-11-16 17:23:37', '2021-12-17 14:16:51'); -INSERT INTO `eb_system_menu` VALUES (122, 12, '一号通', NULL, 'admin:pass:is:login', '/operation/onePass', 'C', 8, 1, 0, '2021-11-16 17:23:37', '2021-12-17 14:17:11'); -INSERT INTO `eb_system_menu` VALUES (123, 12, '管理权限', NULL, '', '/operation/roleManager', 'M', 7, 1, 0, '2021-11-16 17:23:37', '2021-12-17 14:17:26'); -INSERT INTO `eb_system_menu` VALUES (124, 12, '发货设置', NULL, '', '/operation/deliverGoods', 'M', 6, 1, 0, '2021-11-16 17:23:37', '2021-12-17 14:17:37'); -INSERT INTO `eb_system_menu` VALUES (125, 12, '页面管理', NULL, '', '/operation/design', 'M', 5, 1, 1, '2021-11-16 17:23:37', '2021-12-17 14:17:51'); -INSERT INTO `eb_system_menu` VALUES (127, 122, '一号通登录', NULL, 'admin:pass:login', '', 'A', 1, 1, 0, '2021-11-16 17:30:22', '2021-12-02 09:53:30'); -INSERT INTO `eb_system_menu` VALUES (128, 122, '一号通注销', NULL, 'admin:pass:logout', '', 'A', 2, 1, 0, '2021-11-16 17:30:22', '2021-12-02 09:53:50'); -INSERT INTO `eb_system_menu` VALUES (129, 122, '修改密码', NULL, 'admin:pass:update:password', '', 'A', 3, 1, 0, '2021-11-16 17:30:22', '2021-12-02 09:56:07'); -INSERT INTO `eb_system_menu` VALUES (130, 122, '修改手机号码', NULL, 'admin:pass:update:phone', '', 'A', 4, 1, 0, '2021-11-16 17:30:22', '2021-12-02 09:55:59'); -INSERT INTO `eb_system_menu` VALUES (131, 122, '获取验证码', NULL, 'admin:pass:send:code', '', 'A', 5, 1, 0, '2021-11-16 17:30:22', '2021-12-02 09:55:49'); -INSERT INTO `eb_system_menu` VALUES (132, 122, '修改短信签名', NULL, 'admin:sms:modify:sign', '', 'A', 6, 1, 0, '2021-11-16 17:30:22', '2021-12-02 09:58:32'); -INSERT INTO `eb_system_menu` VALUES (133, 122, '短信模板', NULL, 'admin:sms:temps', '', 'A', 7, 1, 0, '2021-11-16 17:30:23', '2021-12-02 09:59:02'); -INSERT INTO `eb_system_menu` VALUES (134, 122, '申请短信模板', NULL, 'admin:sms:temp:apply', '', 'A', 8, 1, 0, '2021-11-16 17:30:23', '2021-12-02 09:59:28'); -INSERT INTO `eb_system_menu` VALUES (135, 122, '模板申请记录', NULL, 'admin:sms:applys', '', 'A', 9, 1, 0, '2021-11-16 17:30:23', '2021-12-02 09:59:48'); -INSERT INTO `eb_system_menu` VALUES (136, 123, '角色管理', NULL, 'admin:system:role:list', '/operation//roleManager/identityManager', 'C', 1, 1, 0, '2021-11-16 17:30:23', '2021-12-06 10:48:49'); -INSERT INTO `eb_system_menu` VALUES (137, 123, '管理员列表', NULL, 'admin:system:admin:list', '/operation//roleManager/adminList', 'C', 1, 1, 0, '2021-11-16 17:30:23', '2021-12-06 11:02:08'); -INSERT INTO `eb_system_menu` VALUES (138, 123, '权限规则', NULL, 'admin:system:menu:list', '/operation//roleManager/promiseRules', 'C', 1, 1, 0, '2021-11-16 17:30:23', '2021-12-06 11:06:12'); -INSERT INTO `eb_system_menu` VALUES (139, 124, '提货设置', NULL, '', '/operation/deliverGoods/takeGoods', 'M', 99999, 1, 0, '2021-11-16 17:30:23', '2021-11-16 17:30:23'); -INSERT INTO `eb_system_menu` VALUES (140, 124, '运费模板', NULL, 'admin:shipping:templates:list', '/operation/deliverGoods/freightSet', 'C', 2, 1, 0, '2021-11-16 17:30:23', '2021-12-02 11:44:01'); -INSERT INTO `eb_system_menu` VALUES (141, 125, '一键换色', NULL, '', '/operation/design/theme', 'C', 99999, 1, 1, '2021-11-16 17:30:23', '2021-11-16 17:30:23'); -INSERT INTO `eb_system_menu` VALUES (142, 125, '页面设计', NULL, 'admin:page:layout:index', '/operation/design/viewDesign', 'C', 99999, 1, 1, '2021-11-16 17:30:23', '2021-12-07 19:14:29'); -INSERT INTO `eb_system_menu` VALUES (143, 136, '身份添加', NULL, 'admin:system:role:save', 'api/admin/system/role/save', 'A', 1, 1, 0, '2021-11-16 17:35:42', '2021-12-06 10:49:22'); -INSERT INTO `eb_system_menu` VALUES (144, 136, '身份删除', NULL, 'admin:system:role:delete', '', 'A', 2, 1, 0, '2021-11-16 17:35:42', '2021-12-06 10:49:41'); -INSERT INTO `eb_system_menu` VALUES (145, 136, '身份修改', NULL, 'admin:system:role:update', '', 'A', 3, 1, 0, '2021-11-16 17:35:43', '2021-12-07 19:04:41'); -INSERT INTO `eb_system_menu` VALUES (146, 137, '管理员添加', NULL, 'admin:system:admin:save', '', 'A', 2, 1, 0, '2021-11-16 17:35:43', '2021-12-06 11:02:33'); -INSERT INTO `eb_system_menu` VALUES (147, 137, '管理员修改', NULL, 'admin:system:admin:update', '', 'A', 3, 1, 0, '2021-11-16 17:35:43', '2021-12-06 11:02:52'); -INSERT INTO `eb_system_menu` VALUES (148, 137, '管理员删除', NULL, 'admin:system:admin:delete', '', 'A', 4, 1, 0, '2021-11-16 17:35:43', '2021-12-06 11:03:14'); -INSERT INTO `eb_system_menu` VALUES (149, 137, '管理员状态更新', NULL, 'admin:system:admin:update:status', '', 'A', 5, 1, 0, '2021-11-16 17:35:43', '2021-12-06 11:03:51'); -INSERT INTO `eb_system_menu` VALUES (151, 138, '权限新增', NULL, 'admin:system:menu:add', NULL, 'A', 99999, 1, 0, '2021-11-16 17:35:43', '2021-12-03 16:39:59'); -INSERT INTO `eb_system_menu` VALUES (152, 138, '权限删除', NULL, 'admin:system:menu:delete', NULL, 'A', 99999, 1, 0, '2021-11-16 17:35:43', '2021-12-03 16:39:59'); -INSERT INTO `eb_system_menu` VALUES (153, 138, '权限更新', NULL, 'admin:system:menu:update', NULL, 'A', 99999, 1, 0, '2021-11-16 17:35:43', '2021-12-03 16:39:59'); -INSERT INTO `eb_system_menu` VALUES (154, 138, '更新权限状态', NULL, 'admin:system:menu:show:status', NULL, 'A', 99999, 1, 0, '2021-11-16 17:35:43', '2021-12-03 16:39:59'); -INSERT INTO `eb_system_menu` VALUES (155, 139, '提货点', NULL, 'admin:system:store:list', '/operation/deliverGoods/takeGoods/deliveryAddress', 'C', 1, 1, 0, '2021-11-16 17:35:43', '2021-12-02 10:25:56'); -INSERT INTO `eb_system_menu` VALUES (156, 139, '核销订单', NULL, 'admin:system:order:list', '/operation/deliverGoods/takeGoods/collateOrder', 'C', 2, 1, 0, '2021-11-16 17:35:43', '2021-12-02 11:11:01'); -INSERT INTO `eb_system_menu` VALUES (157, 139, '核销员', NULL, 'admin:system:staff:list', '/operation/deliverGoods/takeGoods/collateUser', 'C', 3, 1, 0, '2021-11-16 17:35:43', '2021-12-02 11:11:37'); -INSERT INTO `eb_system_menu` VALUES (158, 13, '素材管理', NULL, 'admin:system:attachment:list', '/maintain/picture', 'C', 1, 1, 0, '2021-11-16 17:38:38', '2021-12-02 11:24:34'); -INSERT INTO `eb_system_menu` VALUES (159, 13, '开发配置', NULL, '', '/maintain//devconfiguration', 'M', 99999, 1, 0, '2021-11-16 17:38:38', '2021-11-16 17:38:38'); -INSERT INTO `eb_system_menu` VALUES (160, 13, '申请授权', NULL, '', '/maintain/authCRMEB', 'C', 99999, 1, 0, '2021-11-16 17:38:38', '2021-11-16 17:38:38'); -INSERT INTO `eb_system_menu` VALUES (161, 13, '物流设置', NULL, '', '/maintain/logistics', 'M', 99999, 1, 0, '2021-11-16 17:38:38', '2021-11-16 17:38:38'); -INSERT INTO `eb_system_menu` VALUES (162, 158, '删除素材', NULL, 'admin:system:attachment:delete', 'api/admin/system/attachment/delete', 'A', 1, 1, 0, '2021-11-16 17:41:33', '2021-12-02 11:25:04'); -INSERT INTO `eb_system_menu` VALUES (163, 159, '配置分类', NULL, '', '/maintain/devconfiguration/configCategory', 'C', 99999, 1, 0, '2021-11-16 17:41:33', '2021-11-16 17:41:33'); -INSERT INTO `eb_system_menu` VALUES (164, 159, '组合数据', NULL, 'admin:system:group:list', '/maintain/devconfiguration/combineddata', 'C', 1, 1, 0, '2021-11-16 17:41:33', '2021-12-02 11:28:57'); -INSERT INTO `eb_system_menu` VALUES (165, 159, '表单配置', NULL, 'admin:system:form:list', '/maintain/devconfiguration/formConfig', 'C', 1, 1, 0, '2021-11-16 17:41:33', '2021-12-02 11:36:57'); -INSERT INTO `eb_system_menu` VALUES (166, 161, '城市数据', NULL, 'admin:system:city:list', '/maintain/logistics/cityList', 'C', 1, 1, 0, '2021-11-16 17:41:33', '2021-12-02 11:55:18'); -INSERT INTO `eb_system_menu` VALUES (167, 161, '物流公司', NULL, 'admin:express:list', '/maintain/logistics/companyList', 'C', 2, 1, 0, '2021-11-16 17:41:33', '2021-12-09 15:32:05'); -INSERT INTO `eb_system_menu` VALUES (168, 164, '数据组添加', NULL, 'admin:system:group:save', '', 'A', 2, 1, 0, '2021-11-16 17:44:35', '2021-12-02 11:29:18'); -INSERT INTO `eb_system_menu` VALUES (169, 164, '数据组修改', NULL, 'admin:system:group:update', '', 'A', 3, 1, 0, '2021-11-16 17:44:35', '2021-12-02 11:29:46'); -INSERT INTO `eb_system_menu` VALUES (170, 164, '数据组删除', NULL, 'admin:system:group:delete', '', 'A', 4, 1, 0, '2021-11-16 17:44:35', '2021-12-02 11:30:07'); -INSERT INTO `eb_system_menu` VALUES (171, 164, '组合数据添加', NULL, 'admin:system:group:data:save', '', 'A', 5, 1, 0, '2021-11-16 17:44:35', '2021-12-02 11:34:10'); -INSERT INTO `eb_system_menu` VALUES (172, 164, '组合数据修改', NULL, 'admin:system:group:data:update', '', 'A', 6, 1, 0, '2021-11-16 17:44:35', '2021-12-02 11:34:33'); -INSERT INTO `eb_system_menu` VALUES (173, 164, '组合数据删除', NULL, 'admin:system:group:data:delete', '', 'A', 7, 1, 0, '2021-11-16 17:44:35', '2021-12-02 11:35:08'); -INSERT INTO `eb_system_menu` VALUES (174, 165, '表单添加', NULL, 'admin:system:form:save', '', 'A', 2, 1, 0, '2021-11-16 17:44:35', '2021-12-02 11:38:28'); -INSERT INTO `eb_system_menu` VALUES (176, 165, '表单修改', NULL, 'admin:system:form:update', '', 'A', 4, 1, 0, '2021-11-16 17:44:35', '2021-12-02 11:39:09'); -INSERT INTO `eb_system_menu` VALUES (179, 32, '订单导出', '', 'admin:export:excel:order', '', 'A', 1, 1, 0, '2021-11-23 16:11:27', '2021-11-23 16:11:27'); -INSERT INTO `eb_system_menu` VALUES (180, 32, '订单改价', '', 'admin:order:update:price', '', 'A', 0, 1, 0, '2021-11-23 16:24:42', '2021-11-23 16:24:42'); -INSERT INTO `eb_system_menu` VALUES (181, 32, '物流查询', '', 'admin:order:logistics:info', '', 'A', 0, 1, 0, '2021-11-23 16:26:43', '2021-11-23 16:26:43'); -INSERT INTO `eb_system_menu` VALUES (182, 32, '订单各状态数量', '', 'admin:order:status:num', '', 'A', 0, 1, 0, '2021-11-23 16:27:40', '2021-11-23 16:27:40'); -INSERT INTO `eb_system_menu` VALUES (184, 76, '新增关键字回复', '', 'admin:wechat:keywords:reply:save', '', 'A', 0, 1, 0, '2021-11-23 17:53:54', '2021-12-06 15:29:55'); -INSERT INTO `eb_system_menu` VALUES (185, 76, '删除关键字回复', '', 'admin:wechat:keywords:reply:delete', '', 'A', 0, 1, 0, '2021-11-23 17:54:55', '2021-12-06 15:29:46'); -INSERT INTO `eb_system_menu` VALUES (186, 75, '修改关键字回复', '', 'admin:wechat:keywords:reply:update', '', 'A', 0, 1, 0, '2021-11-23 17:55:32', '2021-12-06 15:27:00'); -INSERT INTO `eb_system_menu` VALUES (187, 76, '修改关键字状态', '', 'admin:wechat:keywords:reply:status', '', 'A', 0, 1, 0, '2021-11-23 17:56:01', '2021-12-06 15:29:30'); -INSERT INTO `eb_system_menu` VALUES (188, 76, '微信关键字详情', '', 'admin:wechat:keywords:reply:info', '', 'A', 0, 1, 0, '2021-11-23 17:57:04', '2021-12-06 15:28:26'); -INSERT INTO `eb_system_menu` VALUES (189, 89, '复制', '', 'admin:coupon:info', '', 'A', 1, 1, 0, '2021-11-24 10:05:04', '2021-11-24 10:05:04'); -INSERT INTO `eb_system_menu` VALUES (191, 94, '添加秒杀商品', '', 'admin:seckill:save', '', 'A', 0, 1, 0, '2021-11-24 10:15:57', '2021-11-24 10:15:57'); -INSERT INTO `eb_system_menu` VALUES (192, 94, '删除秒杀商品', '', 'admin:seckill:delete', '', 'A', 0, 1, 0, '2021-11-24 10:16:20', '2021-11-24 10:16:20'); -INSERT INTO `eb_system_menu` VALUES (193, 94, '修改秒杀商品', '', 'admin:seckill:update', '', 'A', 0, 1, 0, '2021-11-24 10:16:49', '2021-11-24 10:16:49'); -INSERT INTO `eb_system_menu` VALUES (194, 94, '修改秒杀商品状态', '', 'admin:seckill:update:status', '', 'A', 0, 1, 0, '2021-11-24 10:17:24', '2021-11-24 10:17:24'); -INSERT INTO `eb_system_menu` VALUES (195, 94, '秒杀商品详情', '', 'admin:seckill:info', '', 'A', 0, 1, 0, '2021-11-24 10:17:52', '2021-11-24 10:17:52'); -INSERT INTO `eb_system_menu` VALUES (196, 93, '秒杀配置新增', '', 'admin:seckill:manger:save', '', 'A', 0, 1, 0, '2021-11-24 10:18:29', '2021-11-24 10:18:29'); -INSERT INTO `eb_system_menu` VALUES (197, 93, '秒杀配置删除', '', 'admin:seckill:manger:delete', '', 'A', 0, 1, 0, '2021-11-24 10:18:54', '2021-11-24 10:18:54'); -INSERT INTO `eb_system_menu` VALUES (198, 93, '秒杀配置修改', '', 'admin:seckill:manger:update', '', 'A', 0, 1, 0, '2021-11-24 10:19:28', '2021-11-24 10:19:28'); -INSERT INTO `eb_system_menu` VALUES (199, 93, '秒杀配置详情', '', 'admin:seckill:manger:info', '', 'A', 0, 1, 0, '2021-11-24 10:20:02', '2021-11-24 10:20:02'); -INSERT INTO `eb_system_menu` VALUES (200, 93, '秒杀配置状态修改', '', 'admin:seckill:manger:update:status', '', 'A', 0, 1, 0, '2021-11-24 10:20:37', '2021-11-24 10:20:37'); -INSERT INTO `eb_system_menu` VALUES (201, 95, '新增砍价商品', '', 'admin:bargain:save', '', 'A', 0, 1, 0, '2021-11-24 10:22:48', '2021-11-24 10:22:48'); -INSERT INTO `eb_system_menu` VALUES (202, 95, '删除砍价商品', '', 'admin:bargain:delete', '', 'A', 0, 1, 0, '2021-11-24 10:23:15', '2021-11-24 10:23:15'); -INSERT INTO `eb_system_menu` VALUES (203, 95, '修改砍价商品', '', 'admin:bargain:update', '', 'A', 0, 1, 0, '2021-11-24 10:23:42', '2021-11-24 10:23:42'); -INSERT INTO `eb_system_menu` VALUES (204, 95, '砍价商品详情', '', 'admin:bargain:info', '', 'A', 0, 1, 0, '2021-11-24 10:25:19', '2021-11-24 10:25:19'); -INSERT INTO `eb_system_menu` VALUES (205, 95, '修改砍价商品状态', '', 'admin:bargain:update:status', '', 'A', 0, 1, 0, '2021-11-24 10:26:05', '2021-11-24 10:26:05'); -INSERT INTO `eb_system_menu` VALUES (207, 95, '砍价商品导出', '', 'admin:export:excel:bargain', '', 'A', 0, 1, 0, '2021-11-24 10:29:11', '2021-11-24 10:29:11'); -INSERT INTO `eb_system_menu` VALUES (208, 14, '商品导出', '', 'admin:export:excel:product', '', 'A', 0, 1, 0, '2021-11-24 10:30:11', '2021-11-24 10:30:11'); -INSERT INTO `eb_system_menu` VALUES (209, 97, '新增拼团商品', '', 'admin:combination:save', '', 'A', 0, 1, 0, '2021-11-24 10:32:11', '2021-11-24 10:32:11'); -INSERT INTO `eb_system_menu` VALUES (210, 97, '拼团商品删除', '', 'admin:combination:delete', '', 'A', 0, 1, 0, '2021-11-24 10:32:46', '2021-11-24 10:32:46'); -INSERT INTO `eb_system_menu` VALUES (211, 97, '拼团商品修改', '', 'admin:combination:update', '', 'A', 0, 1, 0, '2021-11-24 10:33:12', '2021-11-24 10:33:12'); -INSERT INTO `eb_system_menu` VALUES (212, 97, '拼团商品详情', '', 'admin:combination:info', '', 'A', 0, 1, 0, '2021-11-24 10:33:38', '2021-11-24 10:33:38'); -INSERT INTO `eb_system_menu` VALUES (213, 97, '修改拼团商品状态', '', 'admin:combination:update:status', '', 'A', 0, 1, 0, '2021-11-24 10:34:13', '2021-12-09 16:31:00'); -INSERT INTO `eb_system_menu` VALUES (214, 97, '拼团商品导出', '', 'admin:export:excel:combiantion', '', 'A', 0, 1, 0, '2021-11-24 10:35:22', '2021-11-24 10:35:22'); -INSERT INTO `eb_system_menu` VALUES (215, 98, '拼团统计', '', 'admin:combination:statistics', '', 'A', 0, 1, 0, '2021-11-24 10:36:55', '2021-11-24 10:36:55'); -INSERT INTO `eb_system_menu` VALUES (216, 100, '视频号商品添加', '', 'admin:pay:component:product:add', '', 'A', 0, 1, 1, '2021-11-24 10:50:47', '2021-11-24 10:50:47'); -INSERT INTO `eb_system_menu` VALUES (217, 100, '编辑视频号商品', '', 'admin:pay:component:product:update', '', 'A', 0, 1, 1, '2021-11-24 10:53:35', '2021-11-24 10:53:35'); -INSERT INTO `eb_system_menu` VALUES (218, 100, '视频号商品详情', '', 'admin:pay:component:product:draft:info', '', 'A', 0, 1, 1, '2021-11-24 10:54:15', '2021-11-24 10:54:15'); -INSERT INTO `eb_system_menu` VALUES (219, 99, '视频号商品删除', '', 'admin:pay:component:product:delete', '', 'A', 0, 1, 1, '2021-11-24 10:55:40', '2021-11-24 10:55:40'); -INSERT INTO `eb_system_menu` VALUES (220, 99, '下架视频号商品', '', 'admin:pay:component:product:delisting', '', 'A', 0, 1, 1, '2021-11-24 10:56:07', '2021-11-24 10:56:07'); -INSERT INTO `eb_system_menu` VALUES (224, 32, '易联云小票打印', '', 'admin:yly:print', '', 'A', 0, 1, 0, '2021-11-27 17:50:26', '2021-11-27 17:53:04'); -INSERT INTO `eb_system_menu` VALUES (225, 12, '配置引导', '', '', '/operation/guide', 'C', 0, 1, 1, '2021-11-29 11:23:37', '2021-11-29 11:23:37'); -INSERT INTO `eb_system_menu` VALUES (226, 1, '控制台', '', '', '/dashboard', 'C', 9, 1, 0, '2021-11-30 14:13:37', '2021-12-15 18:12:40'); -INSERT INTO `eb_system_menu` VALUES (227, 1, '用户统计', '', '', '/statuser', 'C', 7, 1, 1, '2021-11-30 14:14:10', '2021-12-15 18:13:04'); -INSERT INTO `eb_system_menu` VALUES (228, 1, '交易统计', '', '', '/transaction', 'C', 3, 1, 1, '2021-11-30 14:14:34', '2021-12-03 15:14:02'); -INSERT INTO `eb_system_menu` VALUES (229, 1, '商品统计', '', '', '/product', 'C', 8, 1, 1, '2021-11-30 14:17:46', '2021-12-15 18:12:54'); -INSERT INTO `eb_system_menu` VALUES (231, 105, '分销配置信息保存', '', 'admin:retail:spread:manage:set', '', 'A', 0, 1, 0, '2021-12-02 09:35:28', '2021-12-02 09:35:28'); -INSERT INTO `eb_system_menu` VALUES (232, 122, '一号通套餐列表', '', 'admin:pass:meal:list', '', 'A', 10, 1, 0, '2021-12-02 10:01:18', '2021-12-02 10:01:18'); -INSERT INTO `eb_system_menu` VALUES (233, 122, '一号通套餐购买', '', 'admin:pass:meal:code', '', 'A', 11, 1, 0, '2021-12-02 10:01:55', '2021-12-02 10:01:55'); -INSERT INTO `eb_system_menu` VALUES (234, 122, '一号通账号注册', '', 'admin:pass:register', '', 'A', 0, 1, 0, '2021-12-02 10:03:14', '2021-12-02 10:03:14'); -INSERT INTO `eb_system_menu` VALUES (235, 122, '一号通服务开通', '', 'admin:pass:service:open', '', 'A', 12, 1, 0, '2021-12-02 10:04:38', '2021-12-02 10:04:38'); -INSERT INTO `eb_system_menu` VALUES (236, 122, '一号通用量记录', '', 'admin:pass:user:record', '', 'A', 13, 1, 0, '2021-12-02 10:05:12', '2021-12-02 10:05:12'); -INSERT INTO `eb_system_menu` VALUES (237, 155, '提货点数量', '', 'admin:system:store:count', '', 'A', 2, 1, 0, '2021-12-02 10:29:22', '2021-12-02 10:29:22'); -INSERT INTO `eb_system_menu` VALUES (238, 155, '新增提货点', '', 'admin:system:store:save', '', 'A', 3, 1, 0, '2021-12-02 10:29:53', '2021-12-02 10:29:53'); -INSERT INTO `eb_system_menu` VALUES (239, 155, '提货点详情', '', 'admin:system:store:info', '', 'A', 4, 1, 0, '2021-12-02 10:30:20', '2021-12-02 10:30:20'); -INSERT INTO `eb_system_menu` VALUES (240, 155, '提货点显示状态', '', 'admin:system:store:update:status', '', 'A', 5, 1, 0, '2021-12-02 10:30:45', '2021-12-02 10:30:45'); -INSERT INTO `eb_system_menu` VALUES (241, 155, '修改提货点', '', 'admin:system:store:update', '', 'A', 6, 1, 0, '2021-12-02 10:31:11', '2021-12-02 10:31:11'); -INSERT INTO `eb_system_menu` VALUES (242, 155, '删除提货点', '', 'admin:system:store:delete', '', 'A', 7, 1, 0, '2021-12-02 10:31:33', '2021-12-02 10:31:33'); -INSERT INTO `eb_system_menu` VALUES (243, 155, '恢复提货点', '', 'admin:system:store:recovery', '', 'A', 8, 1, 0, '2021-12-02 10:32:42', '2021-12-02 10:32:42'); -INSERT INTO `eb_system_menu` VALUES (244, 155, '彻底删除提货点', '', 'admin:system:store:completely:delete', '', 'A', 9, 1, 0, '2021-12-02 10:33:18', '2021-12-02 10:33:18'); -INSERT INTO `eb_system_menu` VALUES (245, 157, '新增核销员', '', 'admin:system:staff:save', '', 'A', 0, 1, 0, '2021-12-02 11:12:19', '2021-12-02 11:12:19'); -INSERT INTO `eb_system_menu` VALUES (246, 157, '删除核销员', '', 'admin:system:staff:delete', '', 'A', 0, 1, 0, '2021-12-02 11:12:40', '2021-12-02 11:12:40'); -INSERT INTO `eb_system_menu` VALUES (247, 157, '核销员详情', '', 'admin:system:staff:info', '', 'A', 0, 1, 0, '2021-12-02 11:13:09', '2021-12-02 11:13:09'); -INSERT INTO `eb_system_menu` VALUES (248, 157, '核销员修改', '', 'admin:system:staff:update', '', 'A', 0, 1, 0, '2021-12-02 11:13:37', '2021-12-02 11:13:37'); -INSERT INTO `eb_system_menu` VALUES (250, 164, '组合数据详情', '', 'admin:system:group:data:info', '', 'A', 8, 1, 0, '2021-12-02 11:35:48', '2021-12-02 11:35:48'); -INSERT INTO `eb_system_menu` VALUES (251, 167, '同步物流公司', '', 'admin:express:sync', '', 'A', 3, 1, 0, '2021-12-02 11:43:01', '2021-12-02 11:43:01'); -INSERT INTO `eb_system_menu` VALUES (252, 140, '物流模板新增', '', 'admin:shipping:templates:save', '', 'A', 3, 1, 0, '2021-12-02 11:44:27', '2021-12-02 11:44:27'); -INSERT INTO `eb_system_menu` VALUES (253, 140, '物流模板删除', '', 'admin:shipping:templates:delete', '', 'A', 4, 1, 0, '2021-12-02 11:44:54', '2021-12-02 11:44:54'); -INSERT INTO `eb_system_menu` VALUES (254, 140, '物流模板详情', '', 'admin:shipping:templates:info', '', 'A', 5, 1, 0, '2021-12-02 11:45:23', '2021-12-02 11:45:23'); -INSERT INTO `eb_system_menu` VALUES (255, 140, '物流模板修改', '', 'admin:shipping:templates:update', '', 'A', 6, 1, 0, '2021-12-02 11:45:47', '2021-12-02 11:45:47'); -INSERT INTO `eb_system_menu` VALUES (256, 140, '物流免费模板', '', 'admin:shipping:templates:free:list', '', 'A', 7, 1, 0, '2021-12-02 11:46:54', '2021-12-02 11:46:54'); -INSERT INTO `eb_system_menu` VALUES (257, 140, '物流付费模板', '', 'admin:shipping:templates:region:list', '', 'A', 8, 1, 0, '2021-12-02 11:47:21', '2021-12-02 11:47:21'); -INSERT INTO `eb_system_menu` VALUES (258, 166, '城市详情', '', 'admin:system:city:info', '', 'A', 0, 1, 0, '2021-12-02 11:55:47', '2021-12-02 11:55:47'); -INSERT INTO `eb_system_menu` VALUES (259, 166, '修改城市', '', 'admin:system:city:update', '', 'A', 0, 1, 0, '2021-12-02 11:57:04', '2021-12-02 11:57:04'); -INSERT INTO `eb_system_menu` VALUES (260, 227, '用户总统计数据', '', 'admin:statistics:user:total:data', '', 'A', 0, 0, 1, '2021-12-03 14:55:26', '2021-12-03 14:55:26'); -INSERT INTO `eb_system_menu` VALUES (261, 227, '用户概览', '', 'admin:statistics:user:overview', '', 'A', 0, 1, 1, '2021-12-03 14:57:21', '2021-12-03 14:57:34'); -INSERT INTO `eb_system_menu` VALUES (262, 227, '用户性别数据', '', 'admin:statistics:user:sex', '', 'A', 0, 1, 1, '2021-12-03 14:58:03', '2021-12-03 14:58:03'); -INSERT INTO `eb_system_menu` VALUES (263, 227, '用户渠道数据', '', 'admin:statistics:user:channel', '', 'A', 0, 1, 1, '2021-12-03 14:58:25', '2021-12-03 14:58:36'); -INSERT INTO `eb_system_menu` VALUES (264, 227, '用户区域数据', '', 'admin:statistics:user:area', '', 'A', 0, 1, 1, '2021-12-03 14:58:55', '2021-12-03 14:58:55'); -INSERT INTO `eb_system_menu` VALUES (265, 227, '用户概览列表', '', 'admin:statistics:user:overview:list', '', 'A', 0, 1, 1, '2021-12-03 14:59:17', '2021-12-03 14:59:17'); -INSERT INTO `eb_system_menu` VALUES (266, 228, '交易统计数据', '', 'admin:statistics:trade:data', '', 'A', 0, 1, 1, '2021-12-03 15:02:05', '2021-12-03 15:02:05'); -INSERT INTO `eb_system_menu` VALUES (267, 228, '交易概览', '', 'admin:statistics:trade:overview', '', 'A', 0, 1, 1, '2021-12-03 15:02:38', '2021-12-03 15:02:38'); -INSERT INTO `eb_system_menu` VALUES (268, 228, '交易趋势数据', '', 'admin:statistics:trade:trend', '', 'A', 0, 1, 1, '2021-12-03 15:02:56', '2021-12-03 15:02:56'); -INSERT INTO `eb_system_menu` VALUES (269, 12, '消息通知', '', 'admin:system:notification:list', '/operation/notification', 'C', 4, 1, 0, '2021-12-03 15:13:08', '2021-12-17 14:18:16'); -INSERT INTO `eb_system_menu` VALUES (270, 229, '商品统计数据', '', 'admin:statistics:product:data', '', 'A', 0, 1, 1, '2021-12-03 15:27:28', '2021-12-03 15:27:28'); -INSERT INTO `eb_system_menu` VALUES (271, 229, '商品排行榜', '', 'admin:statistics:product:ranking', '', 'A', 0, 1, 1, '2021-12-03 15:27:55', '2021-12-03 15:27:55'); -INSERT INTO `eb_system_menu` VALUES (272, 229, '商品趋势数据', '', 'admin:statistics:product:trend', '', 'A', 0, 1, 1, '2021-12-03 15:28:15', '2021-12-03 15:28:15'); -INSERT INTO `eb_system_menu` VALUES (273, 14, '商品表头数量', '', 'admin:product:tabs:headers', '', 'A', 0, 1, 0, '2021-12-03 15:48:18', '2021-12-03 15:48:18'); -INSERT INTO `eb_system_menu` VALUES (274, 14, '导入99Api商品', '', 'admin:product:import:product', '', 'A', 0, 1, 0, '2021-12-03 15:50:18', '2021-12-03 15:50:18'); -INSERT INTO `eb_system_menu` VALUES (275, 14, '获取复制商品配置', '', 'admin:product:copy:config', '', 'A', 0, 1, 0, '2021-12-03 15:51:00', '2021-12-03 15:51:00'); -INSERT INTO `eb_system_menu` VALUES (276, 14, '复制平台商品', '', 'admin:product:copy:product', '', 'A', 0, 1, 0, '2021-12-03 15:51:16', '2021-12-03 15:51:16'); -INSERT INTO `eb_system_menu` VALUES (277, 14, '商品详情', '', 'admin:product:info', '', 'A', 0, 1, 0, '2021-12-03 15:52:22', '2021-12-03 15:52:22'); -INSERT INTO `eb_system_menu` VALUES (278, 14, '恢复商品', '', 'admin:product:restore', '', 'A', 0, 1, 0, '2021-12-03 15:53:24', '2021-12-03 15:53:24'); -INSERT INTO `eb_system_menu` VALUES (280, 0, '登录管理', NULL, NULL, NULL, 'M', 1, 0, 0, '2021-12-03 16:31:43', '2021-12-16 16:17:29'); -INSERT INTO `eb_system_menu` VALUES (281, 280, '登陆用户详情', NULL, 'admin:info', NULL, 'A', 99999, 1, 0, '2021-12-03 16:32:39', '2021-12-03 16:32:39'); -INSERT INTO `eb_system_menu` VALUES (282, 280, '退出登录', NULL, 'admin:logout', NULL, 'A', 99999, 1, 0, '2021-12-03 16:33:29', '2021-12-03 16:33:42'); -INSERT INTO `eb_system_menu` VALUES (283, 280, '管理员可访问目录', NULL, 'admin:login:menus', NULL, 'A', 99999, 1, 0, '2021-12-03 16:33:40', '2021-12-03 16:33:45'); -INSERT INTO `eb_system_menu` VALUES (284, 138, '菜单详情', NULL, 'admin:system:menu:info', NULL, 'A', 99999, 1, 0, '2021-12-03 16:39:41', '2021-12-03 16:39:55'); -INSERT INTO `eb_system_menu` VALUES (285, 226, '首页数据', '', 'admin:statistics:home:index', '', 'A', 0, 1, 0, '2021-12-03 16:51:09', '2021-12-03 16:51:09'); -INSERT INTO `eb_system_menu` VALUES (286, 226, '用户曲线图', '', 'admin:statistics:home:chart:user', '', 'A', 0, 1, 0, '2021-12-03 16:51:29', '2021-12-03 16:51:40'); -INSERT INTO `eb_system_menu` VALUES (287, 226, '用户购买统计', '', 'admin:statistics:home:chart:user:buy', '', 'A', 0, 1, 0, '2021-12-03 16:51:59', '2021-12-03 16:51:59'); -INSERT INTO `eb_system_menu` VALUES (288, 226, '30天订单量趋势', '', 'admin:statistics:home:chart:order', '', 'A', 0, 1, 0, '2021-12-03 16:52:47', '2021-12-03 16:52:47'); -INSERT INTO `eb_system_menu` VALUES (289, 226, '周订单量趋势', '', 'admin:statistics:home:chart:order:week', '', 'A', 0, 1, 0, '2021-12-03 16:53:00', '2021-12-03 16:53:00'); -INSERT INTO `eb_system_menu` VALUES (290, 226, '月订单量趋势', '', 'admin:statistics:home:chart:order:month', '', 'A', 0, 1, 0, '2021-12-03 16:53:16', '2021-12-03 16:53:16'); -INSERT INTO `eb_system_menu` VALUES (291, 226, '年订单量趋势', '', 'admin:statistics:home:chart:order:year', '', 'A', 0, 1, 0, '2021-12-03 16:53:36', '2021-12-03 16:53:36'); -INSERT INTO `eb_system_menu` VALUES (293, 110, '提现总金额', '', 'admin:recharge:balance', '', 'A', 0, 1, 0, '2021-12-03 17:05:23', '2021-12-03 17:05:23'); -INSERT INTO `eb_system_menu` VALUES (294, 0, '分类服务', '', '', '', 'M', 0, 0, 0, '2021-12-03 17:15:29', '2021-12-03 17:15:29'); -INSERT INTO `eb_system_menu` VALUES (295, 294, '分类列表', '', 'admin:category:list', '', 'A', 0, 1, 0, '2021-12-03 17:16:12', '2021-12-03 17:16:12'); -INSERT INTO `eb_system_menu` VALUES (296, 294, '新增分类', '', 'admin:category:save', '', 'A', 0, 1, 0, '2021-12-03 17:16:35', '2021-12-03 17:16:35'); -INSERT INTO `eb_system_menu` VALUES (297, 294, '删除分类', '', 'admin:category:delete', '', 'A', 0, 1, 0, '2021-12-03 17:16:52', '2021-12-03 17:16:52'); -INSERT INTO `eb_system_menu` VALUES (298, 294, '修改分类', '', 'admin:category:update', '', 'A', 0, 1, 0, '2021-12-03 17:17:11', '2021-12-03 17:17:11'); -INSERT INTO `eb_system_menu` VALUES (299, 294, '分类详情', '', 'admin:category:info', '', 'A', 0, 1, 0, '2021-12-03 17:17:35', '2021-12-03 17:17:35'); -INSERT INTO `eb_system_menu` VALUES (300, 294, '分类tree列表', '', 'admin:category:list:tree', '', 'A', 0, 1, 0, '2021-12-03 17:18:06', '2021-12-03 17:18:06'); -INSERT INTO `eb_system_menu` VALUES (301, 294, '根据id集合获取分类列表', '', 'admin:category:list:ids', '', 'A', 0, 1, 0, '2021-12-03 17:18:23', '2021-12-03 17:18:23'); -INSERT INTO `eb_system_menu` VALUES (302, 294, '更改分类状态', '', 'admin:category:update:status', '', 'A', 0, 1, 0, '2021-12-03 17:18:38', '2021-12-03 17:18:38'); -INSERT INTO `eb_system_menu` VALUES (303, 164, '分页组合数据详情', '', 'admin:system:group:data:list', '', 'A', 0, 1, 0, '2021-12-03 17:39:37', '2021-12-03 17:39:37'); -INSERT INTO `eb_system_menu` VALUES (304, 39, '发送优惠券列表', '', 'admin:coupon:send:list', '', 'A', 0, 1, 0, '2021-12-03 17:41:34', '2021-12-10 19:12:23'); -INSERT INTO `eb_system_menu` VALUES (305, 68, '下载小程序', '', 'admin:wechat:code:download', '/appSetting/publicRoutine/download', 'C', 0, 1, 1, '2021-12-03 18:31:54', '2021-12-10 14:47:17'); -INSERT INTO `eb_system_menu` VALUES (306, 32, '订单列表统计数据', '', 'admin:order:list:data', '', 'A', 0, 1, 0, '2021-12-06 09:40:56', '2021-12-06 09:40:56'); -INSERT INTO `eb_system_menu` VALUES (307, 32, '面单默认配置信息', '', 'admin:order:sheet:info', '', 'A', 0, 1, 0, '2021-12-06 09:42:51', '2021-12-06 09:42:51'); -INSERT INTO `eb_system_menu` VALUES (308, 32, '订单详情', '', 'admin:order:info', '', 'A', 0, 1, 0, '2021-12-06 09:44:00', '2021-12-06 09:44:00'); -INSERT INTO `eb_system_menu` VALUES (309, 32, '订单操作记录列表', '', 'admin:order:status:list', '', 'A', 0, 1, 0, '2021-12-06 09:45:04', '2021-12-06 09:45:04'); -INSERT INTO `eb_system_menu` VALUES (310, 166, '城市树列表', '', 'admin:system:city:list:tree', '', 'A', 0, 1, 0, '2021-12-06 10:30:39', '2021-12-06 10:30:39'); -INSERT INTO `eb_system_menu` VALUES (311, 136, '角色详情', '', 'admin:system:role:info', '', 'A', 4, 1, 0, '2021-12-06 10:50:32', '2021-12-06 10:50:32'); -INSERT INTO `eb_system_menu` VALUES (312, 136, '修改角色状态', '', 'admin:system:role:update:status', '', 'A', 5, 1, 0, '2021-12-06 10:51:09', '2021-12-06 10:51:09'); -INSERT INTO `eb_system_menu` VALUES (313, 137, '管理员详情', '', 'admin:system:admin:info', '', 'A', 6, 1, 0, '2021-12-06 11:04:41', '2021-12-06 11:04:41'); -INSERT INTO `eb_system_menu` VALUES (314, 137, '是否接收状态', '', 'admin:system:admin:update:sms', '', 'A', 7, 1, 0, '2021-12-06 11:05:17', '2021-12-06 11:05:17'); -INSERT INTO `eb_system_menu` VALUES (315, 39, '用户详情页Top数据', '', 'admin:user:topdetail', '', 'A', 0, 1, 0, '2021-12-06 14:55:27', '2021-12-06 14:55:27'); -INSERT INTO `eb_system_menu` VALUES (316, 39, '用户信息详情', '', 'admin:user:infobycondition', '', 'A', 0, 1, 0, '2021-12-06 14:56:40', '2021-12-06 14:56:40'); -INSERT INTO `eb_system_menu` VALUES (317, 39, '用户分组', '', 'admin:user:group', '', 'A', 0, 1, 0, '2021-12-06 14:58:02', '2021-12-06 14:58:02'); -INSERT INTO `eb_system_menu` VALUES (318, 39, '修改用户手机号', '', 'admin:user:update:phone', '', 'A', 0, 1, 0, '2021-12-06 14:58:49', '2021-12-06 14:58:49'); -INSERT INTO `eb_system_menu` VALUES (319, 39, '更新用户会员等级', '', 'admin:user:update:level', '', 'A', 0, 1, 0, '2021-12-06 14:59:23', '2021-12-06 14:59:23'); -INSERT INTO `eb_system_menu` VALUES (320, 39, '修改上级推广人', '', 'admin:user:update:spread', '', 'A', 0, 1, 0, '2021-12-06 14:59:45', '2021-12-06 15:01:24'); -INSERT INTO `eb_system_menu` VALUES (321, 60, '文章详情', '', 'admin:article:info', '', 'A', 0, 1, 0, '2021-12-06 15:11:54', '2021-12-06 15:11:54'); -INSERT INTO `eb_system_menu` VALUES (322, 89, '删除优惠券', '', 'admin:coupon:delete', '', 'A', 0, 1, 0, '2021-12-06 16:23:26', '2021-12-06 16:23:26'); -INSERT INTO `eb_system_menu` VALUES (323, 344, '表单模板详情', '', 'admin:system:form:info', '', 'A', 0, 1, 0, '2021-12-07 09:33:10', '2021-12-09 15:38:12'); -INSERT INTO `eb_system_menu` VALUES (324, 121, '整体保存表单数据', '', 'admin:system:config:save:form', '', 'A', 0, 1, 0, '2021-12-07 09:35:50', '2021-12-07 09:35:50'); -INSERT INTO `eb_system_menu` VALUES (325, 96, '砍价参与详情列表', '', 'admin:bargain:user:help:list', '', 'A', 0, 1, 0, '2021-12-07 09:39:32', '2021-12-07 09:39:32'); -INSERT INTO `eb_system_menu` VALUES (326, 109, '提现统计', '', 'admin:finance:apply:balance', '', 'A', 0, 1, 0, '2021-12-07 11:26:32', '2021-12-07 11:26:32'); -INSERT INTO `eb_system_menu` VALUES (327, 226, '经营数据', '', 'admin:statistics:home:operating:data', '', 'A', 0, 1, 1, '2021-12-07 11:41:07', '2021-12-07 11:41:07'); -INSERT INTO `eb_system_menu` VALUES (328, 142, '页面布局首页保存', '', 'admin:page:layout:save', '', 'A', 0, 1, 1, '2021-12-07 15:36:08', '2021-12-07 15:36:08'); -INSERT INTO `eb_system_menu` VALUES (329, 142, '页面布局首页banner保存', '', 'admin:page:layout:index:banner:save', '', 'A', 0, 1, 1, '2021-12-07 15:36:45', '2021-12-07 15:36:45'); -INSERT INTO `eb_system_menu` VALUES (330, 142, '页面布局首页menu保存', '', 'admin:page:layout:index:menu:save', '', 'A', 0, 1, 1, '2021-12-07 15:37:13', '2021-12-07 15:37:13'); -INSERT INTO `eb_system_menu` VALUES (331, 142, '页面首页新闻保存', '', 'admin:page:layout:index:news:save', '', 'A', 0, 1, 1, '2021-12-07 15:37:38', '2021-12-07 15:37:38'); -INSERT INTO `eb_system_menu` VALUES (333, 142, '页面用户中心导航保存', '', 'admin:page:layout:user:menu:save', '', 'A', 0, 1, 1, '2021-12-07 15:38:32', '2021-12-07 15:38:32'); -INSERT INTO `eb_system_menu` VALUES (334, 142, '页面用户中心商品table保存', '', 'admin:page:layout:index:table:save', '', 'A', 0, 1, 1, '2021-12-07 15:38:57', '2021-12-07 15:38:57'); -INSERT INTO `eb_system_menu` VALUES (335, 142, '分类页配置保存', '', 'admin:page:layout:category:config:save', '', 'A', 0, 1, 1, '2021-12-07 15:39:29', '2021-12-07 15:39:29'); -INSERT INTO `eb_system_menu` VALUES (337, 269, '公众号模板消息同步', '', 'admin:wechat:whcbqhn:sync', '', 'A', 0, 1, 0, '2021-12-07 18:42:30', '2021-12-11 15:24:21'); -INSERT INTO `eb_system_menu` VALUES (340, 138, '菜单缓存树', '', 'admin:system:menu:cache:tree', '', 'A', 0, 1, 0, '2021-12-07 19:15:32', '2021-12-07 19:15:32'); -INSERT INTO `eb_system_menu` VALUES (341, 142, '获取分类页配置', '', 'admin:page:layout:category:config', '', 'A', 0, 1, 1, '2021-12-08 10:25:27', '2021-12-08 10:25:27'); -INSERT INTO `eb_system_menu` VALUES (342, 122, '一号通用户信息', '', 'admin:pass:info', '', 'A', 0, 1, 0, '2021-12-08 11:44:52', '2021-12-08 11:44:52'); -INSERT INTO `eb_system_menu` VALUES (343, 39, '发送优惠券', '', 'admin:coupon:user:receive', '', 'A', 0, 1, 0, '2021-12-08 18:16:23', '2021-12-08 18:16:23'); -INSERT INTO `eb_system_menu` VALUES (344, 0, '公共服务', '', '', '', 'M', 0, 0, 0, '2021-12-08 18:56:36', '2021-12-08 18:56:36'); -INSERT INTO `eb_system_menu` VALUES (345, 344, '根据key存储', '', 'admin:system:config:saveuniq', '', 'A', 0, 1, 0, '2021-12-08 18:57:26', '2021-12-08 18:57:26'); -INSERT INTO `eb_system_menu` VALUES (347, 344, '根据key获取', '', 'admin:system:config:getuniq', '', 'A', 0, 1, 0, '2021-12-08 18:58:55', '2021-12-08 18:59:18'); -INSERT INTO `eb_system_menu` VALUES (348, 98, '拼团订单列表', '', 'admin:combination:order:pink', '', 'A', 0, 1, 0, '2021-12-08 19:08:59', '2021-12-08 19:08:59'); -INSERT INTO `eb_system_menu` VALUES (349, 99, '上架视频号商品', '', 'admin:pay:component:product:listing', '', 'A', 0, 1, 1, '2021-12-08 19:10:50', '2021-12-08 19:11:02'); -INSERT INTO `eb_system_menu` VALUES (350, 100, '组件类目列表', '', 'admin:pay:component:cat:list', '', 'A', 0, 1, 1, '2021-12-08 19:14:06', '2021-12-08 19:14:06'); -INSERT INTO `eb_system_menu` VALUES (352, 104, '推广人', '', 'admin:retail:spread:list', '', 'A', 0, 1, 0, '2021-12-09 14:43:19', '2021-12-09 14:43:19'); -INSERT INTO `eb_system_menu` VALUES (353, 104, '推广订单', '', 'admin:retail:spread:order:list', '', 'A', 0, 1, 0, '2021-12-09 14:44:10', '2021-12-09 14:44:10'); -INSERT INTO `eb_system_menu` VALUES (354, 104, '清除上级推广人', '', 'admin:retail:spread:clean', '', 'A', 0, 1, 0, '2021-12-09 14:45:33', '2021-12-09 14:45:33'); -INSERT INTO `eb_system_menu` VALUES (355, 109, '提现编辑', '', 'admin:finance:apply:update', '', 'A', 0, 1, 0, '2021-12-09 15:06:43', '2021-12-09 15:06:43'); -INSERT INTO `eb_system_menu` VALUES (356, 109, '提现审核', '', 'admin:finance:apply:apply', '', 'A', 0, 1, 0, '2021-12-09 15:09:01', '2021-12-09 15:09:01'); -INSERT INTO `eb_system_menu` VALUES (357, 167, '物流公司', '', 'admin:express:all', '', 'A', 0, 1, 0, '2021-12-09 16:14:43', '2021-12-09 16:14:43'); -INSERT INTO `eb_system_menu` VALUES (359, 269, '公众号模板开关', '', 'admin:system:notification:wechat:switch', '', 'A', 0, 1, 0, '2021-12-09 17:15:25', '2021-12-09 17:15:25'); -INSERT INTO `eb_system_menu` VALUES (360, 269, '小程序订阅模板开关', '', 'admin:system:notification:routine:switch', '', 'A', 0, 1, 0, '2021-12-09 17:15:48', '2021-12-09 17:15:48'); -INSERT INTO `eb_system_menu` VALUES (361, 269, '发送短信开关', '', 'admin:system:notification:sms:switch', '', 'A', 0, 1, 0, '2021-12-09 17:16:01', '2021-12-09 17:16:01'); -INSERT INTO `eb_system_menu` VALUES (362, 269, '通知详情', '', 'admin:system:notification:detail', '', 'A', 0, 1, 0, '2021-12-09 17:16:19', '2021-12-09 17:16:19'); -INSERT INTO `eb_system_menu` VALUES (366, 269, '小程序订阅消息同步', '', 'admin:wechat:routine:sync', '', 'A', 0, 1, 0, '2021-12-10 12:15:58', '2021-12-11 15:24:32'); -INSERT INTO `eb_system_menu` VALUES (367, 158, '修改图片分组', '', 'admin:system:attachment:move', '', 'A', 0, 1, 0, '2021-12-10 15:38:24', '2021-12-10 15:38:24'); -INSERT INTO `eb_system_menu` VALUES (368, 32, '订单核销', '', 'admin:order:write:update', '', 'A', 0, 1, 0, '2021-12-10 15:39:06', '2021-12-10 15:39:06'); -INSERT INTO `eb_system_menu` VALUES (369, 269, '修改通知', '', 'admin:system:notification:update', '', 'A', 0, 1, 0, '2021-12-10 15:53:29', '2021-12-10 15:53:29'); -INSERT INTO `eb_system_menu` VALUES (370, 167, '编辑快递公司', '', 'admin:express:update', '', 'A', 0, 1, 0, '2021-12-13 10:04:36', '2021-12-13 10:04:36'); -INSERT INTO `eb_system_menu` VALUES (371, 167, '修改快递公司状态', '', 'admin:express:update:show', '', 'A', 0, 1, 0, '2021-12-13 10:04:56', '2021-12-13 10:04:56'); -INSERT INTO `eb_system_menu` VALUES (372, 167, '快递公司详情', '', 'admin:express:info', '', 'A', 0, 1, 0, '2021-12-13 10:05:10', '2021-12-13 10:05:10'); -INSERT INTO `eb_system_menu` VALUES (373, 32, '物流公司面单模板', '', 'admin:express:template', '', 'A', 0, 1, 0, '2021-12-13 10:06:30', '2021-12-13 10:06:30'); -INSERT INTO `eb_system_menu` VALUES (374, 122, '一号通修改手机号—验证', '', 'admin:pass:update:phone:validator', '', 'A', 0, 1, 0, '2021-12-13 10:07:15', '2021-12-13 10:07:15'); -INSERT INTO `eb_system_menu` VALUES (375, 99, '交易组件正式商品详情', '', 'admin:pay:component:product:info', '', 'A', 0, 1, 1, '2021-12-13 10:08:38', '2021-12-13 10:08:38'); -INSERT INTO `eb_system_menu` VALUES (376, 88, '交易组件获取快递公司', '', 'admin:pay:component:delivery:company:get:list', '', 'A', 0, 1, 1, '2021-12-13 10:11:12', '2021-12-13 10:11:12'); -INSERT INTO `eb_system_menu` VALUES (377, 88, '交易组件小程序接入申请', '', 'admin:pay:component:shop:register', '', 'A', 0, 1, 1, '2021-12-13 10:11:27', '2021-12-13 10:11:27'); -INSERT INTO `eb_system_menu` VALUES (378, 88, '交易组件获取小程序接入状态', '', 'admin:pay:component:shop:register:check', '', 'A', 0, 1, 1, '2021-12-13 10:11:43', '2021-12-13 10:11:43'); -INSERT INTO `eb_system_menu` VALUES (379, 88, '交易组件上传图片', '', 'admin:pay:component:shop:img:upload', '', 'A', 0, 1, 1, '2021-12-13 10:11:57', '2021-12-13 10:11:57'); -INSERT INTO `eb_system_menu` VALUES (380, 88, '交易组件上传品牌信息', '', 'admin:pay:component:shop:brand:audit', '', 'A', 0, 1, 1, '2021-12-13 10:12:18', '2021-12-13 10:12:18'); -INSERT INTO `eb_system_menu` VALUES (381, 88, '交易组件品牌列表', '', 'admin:pay:component:shop:brand:list', '', 'A', 0, 1, 1, '2021-12-13 10:12:35', '2021-12-13 10:12:35'); -INSERT INTO `eb_system_menu` VALUES (382, 88, '交易组件可用品牌列表', '', 'admin:pay:component:shop:brand:usable:list', '', 'A', 0, 1, 1, '2021-12-13 10:12:51', '2021-12-13 10:12:51'); -INSERT INTO `eb_system_menu` VALUES (383, 104, '添加推广关系', '', 'admin:retail:spread:save', '', 'A', 0, 1, 1, '2021-12-13 10:16:47', '2021-12-13 10:16:47'); -INSERT INTO `eb_system_menu` VALUES (384, 156, '核销订单头部数据', '', 'admin:order:statistics', '', 'A', 0, 1, 0, '2021-12-13 10:20:16', '2021-12-13 10:20:16'); -INSERT INTO `eb_system_menu` VALUES (385, 156, '核销订单月列表数据', '', 'admin:order:statistics:data', '', 'A', 0, 1, 0, '2021-12-13 10:20:30', '2021-12-13 10:20:30'); -INSERT INTO `eb_system_menu` VALUES (386, 156, '核销码查询待核销订单', '', 'admin:order:write:confirm', '', 'A', 0, 1, 0, '2021-12-13 10:20:42', '2021-12-13 10:20:42'); -INSERT INTO `eb_system_menu` VALUES (387, 344, '订单统计详情', '', 'admin:order:time', '', 'A', 0, 1, 0, '2021-12-13 10:22:47', '2021-12-13 10:22:47'); -INSERT INTO `eb_system_menu` VALUES (388, 32, '视频号订单发送货', '', 'admin:order:video:send', '', 'A', 0, 1, 1, '2021-12-13 10:23:11', '2021-12-13 10:23:11'); -INSERT INTO `eb_system_menu` VALUES (389, 16, '商品规则值详情', '', 'admin:product:rule:info', '', 'A', 0, 1, 0, '2021-12-13 10:24:50', '2021-12-13 10:24:50'); -INSERT INTO `eb_system_menu` VALUES (390, 344, '新增附件', '', 'admin:system:attachment:save', '', 'A', 0, 1, 0, '2021-12-13 10:26:45', '2021-12-13 10:26:45'); -INSERT INTO `eb_system_menu` VALUES (391, 344, '修改附件', '', 'admin:system:attachment:update', '', 'A', 0, 1, 0, '2021-12-13 10:28:19', '2021-12-13 10:28:19'); -INSERT INTO `eb_system_menu` VALUES (392, 344, '附件详情', '', 'admin:system:attachment:info', '', 'A', 0, 1, 0, '2021-12-13 10:29:08', '2021-12-13 10:29:08'); -INSERT INTO `eb_system_menu` VALUES (393, 166, '修改城市状态', '', 'admin:system:city:update:status', '', 'A', 0, 1, 0, '2021-12-13 10:29:55', '2021-12-13 10:29:55'); -INSERT INTO `eb_system_menu` VALUES (394, 344, '检测表单name是否存在', '', 'admin:system:config:check', '', 'A', 0, 1, 0, '2021-12-13 10:30:58', '2021-12-13 10:30:58'); -INSERT INTO `eb_system_menu` VALUES (395, 344, '根据key获取配置', '', 'admin:system:config:get', '', 'A', 0, 1, 0, '2021-12-13 10:31:24', '2021-12-13 10:31:24'); -INSERT INTO `eb_system_menu` VALUES (396, 344, '更新配置信息', '', 'admin:system:config:update', '', 'A', 0, 1, 0, '2021-12-13 10:31:44', '2021-12-13 10:31:44'); -INSERT INTO `eb_system_menu` VALUES (397, 344, '组合数据详情', '', 'admin:system:group:info', '', 'A', 0, 1, 0, '2021-12-13 10:32:28', '2021-12-13 10:32:28'); -INSERT INTO `eb_system_menu` VALUES (398, 157, '修改核销员状态', '', 'admin:system:staff:update:status', '', 'A', 0, 1, 0, '2021-12-13 10:33:46', '2021-12-13 10:33:46'); -INSERT INTO `eb_system_menu` VALUES (399, 42, '用户分组详情', '', 'admin:user:group:info', '', 'A', 0, 1, 0, '2021-12-13 10:34:41', '2021-12-13 10:34:41'); -INSERT INTO `eb_system_menu` VALUES (400, 39, '会员等级列表', '', 'admin:user:level:list', '', 'A', 0, 1, 0, '2021-12-13 10:36:37', '2021-12-13 10:36:37'); -INSERT INTO `eb_system_menu` VALUES (401, 40, '会员标签详情', '', 'admin:user:tag:info', '', 'A', 0, 1, 0, '2021-12-13 10:37:04', '2021-12-13 10:37:04'); -INSERT INTO `eb_system_menu` VALUES (402, 344, '获取微信公众号js配置', '', 'admin:wechat:config', '', 'A', 0, 1, 0, '2021-12-13 10:38:24', '2021-12-13 10:38:24'); -INSERT INTO `eb_system_menu` VALUES (403, 344, '微信素材上传', '', 'admin:wechat:media:upload', '', 'A', 0, 1, 0, '2021-12-13 10:38:50', '2021-12-13 10:38:50'); -INSERT INTO `eb_system_menu` VALUES (404, 13, '代码生成', '', '', '/codegen/codegenList', 'C', 0, 1, 0, '2022-08-23 18:07:37', '2022-08-23 18:07:37'); - --- ---------------------------- --- Table structure for eb_system_notification --- ---------------------------- -DROP TABLE IF EXISTS `eb_system_notification`; -CREATE TABLE `eb_system_notification` ( - `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT 'id', - `mark` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '标识', - `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '通知类型', - `description` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '通知场景说明', - `is_wechat` tinyint(2) NOT NULL DEFAULT 0 COMMENT '公众号模板消息（0：不存在，1：开启，2：关闭）', - `wechat_id` int(11) NOT NULL DEFAULT 0 COMMENT '模板消息id', - `is_routine` tinyint(2) NOT NULL DEFAULT 0 COMMENT '小程序订阅消息（0：不存在，1：开启，2：关闭）', - `routine_id` int(11) NOT NULL DEFAULT 0 COMMENT '订阅消息id', - `is_sms` tinyint(2) NOT NULL DEFAULT 0 COMMENT '发送短信（0：不存在，1：开启，2：关闭）', - `sms_id` int(11) NOT NULL DEFAULT 0 COMMENT '短信id', - `send_type` tinyint(2) NOT NULL DEFAULT 1 COMMENT '发送类型（1：用户，2：管理员）', - `create_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - PRIMARY KEY (`id`) USING BTREE, - INDEX `mark`(`mark`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 13 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '通知设置表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of eb_system_notification --- ---------------------------- -INSERT INTO `eb_system_notification` VALUES (1, 'paySuccess', '订单支付成功通知', '订单支付成功通知', 2, 35, 1, 55, 1, 559, 1, '2021-12-09 17:19:17'); -INSERT INTO `eb_system_notification` VALUES (2, 'deliverGoods', '订单发货通知', '订单发货通知', 2, 20, 1, 58, 1, 572, 1, '2021-12-09 17:20:32'); -INSERT INTO `eb_system_notification` VALUES (3, 'bargainingSuccess', '砍价成功通知', '砍价成功通知', 2, 27, 1, 56, 0, 0, 1, '2021-12-09 17:20:35'); -INSERT INTO `eb_system_notification` VALUES (4, 'groupSuccess', '拼团成功通知', '拼团成功通知', 2, 23, 1, 57, 0, 0, 1, '2021-12-09 17:20:46'); -INSERT INTO `eb_system_notification` VALUES (5, 'fulfillmentOrder', '订单配送通知', '订单配送通知', 2, 34, 1, 52, 0, 0, 1, '2021-12-09 17:20:54'); -INSERT INTO `eb_system_notification` VALUES (6, 'rechargeSuccess', '充值成功通知', '充值成功通知', 2, 11, 1, 53, 0, 0, 1, '2021-12-09 17:21:07'); -INSERT INTO `eb_system_notification` VALUES (7, 'receiptGoods', '确认收货通知', '确认收货通知', 2, 36, 1, 54, 0, 0, 1, '2021-12-09 17:24:22'); -INSERT INTO `eb_system_notification` VALUES (8, 'adminPaySuccess', '支付成功(管理员短信)通知', '支付成功(管理员短信)通知', 0, 0, 0, 0, 1, 562, 2, '2021-12-09 19:06:03'); -INSERT INTO `eb_system_notification` VALUES (9, 'adminReceiptGoods', '用户收货(管理员)通知', '用户收货(管理员)通知', 0, 0, 0, 0, 1, 564, 2, '2021-12-09 20:28:41'); -INSERT INTO `eb_system_notification` VALUES (10, 'adminPlaceAnOrder', '用户下单(管理员)通知', '用户下单(管理员)通知', 0, 0, 0, 0, 1, 561, 2, '2021-12-09 20:47:35'); -INSERT INTO `eb_system_notification` VALUES (11, 'adminApplyOrderRefund', '用户发起退款(管理员)通知', '用户发起退款(管理员)通知', 0, 0, 0, 0, 1, 563, 2, '2021-12-09 21:04:24'); -INSERT INTO `eb_system_notification` VALUES (12, 'modifyOrderPrice', '改价通知', '改价通知', 0, 0, 0, 0, 1, 566, 1, '2021-12-09 21:10:50'); - --- ---------------------------- --- Table structure for eb_system_role --- ---------------------------- -DROP TABLE IF EXISTS `eb_system_role`; -CREATE TABLE `eb_system_role` ( - `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '身份管理id', - `role_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '身份管理名称', - `rules` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '身份管理权限(menus_id)', - `level` tinyint(3) UNSIGNED NOT NULL DEFAULT 0, - `status` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '状态', - `create_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE, - INDEX `status`(`status`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '身份管理表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of eb_system_role --- ---------------------------- -INSERT INTO `eb_system_role` VALUES (1, '超级管理员', '', 0, 1, '2020-04-18 11:19:25', '2021-12-03 09:33:21'); -INSERT INTO `eb_system_role` VALUES (5, '演示站', '', 1, 1, '2021-02-25 15:34:57', '2021-12-08 17:49:48'); - --- ---------------------------- --- Table structure for eb_system_role_menu --- ---------------------------- -DROP TABLE IF EXISTS `eb_system_role_menu`; -CREATE TABLE `eb_system_role_menu` ( - `rid` int(11) NOT NULL COMMENT '角色id', - `menu_id` int(11) NOT NULL COMMENT '权限id', - PRIMARY KEY (`rid`, `menu_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色菜单关联表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of eb_system_role_menu --- ---------------------------- -INSERT INTO `eb_system_role_menu` VALUES (1, 1); -INSERT INTO `eb_system_role_menu` VALUES (1, 2); -INSERT INTO `eb_system_role_menu` VALUES (1, 3); -INSERT INTO `eb_system_role_menu` VALUES (1, 4); -INSERT INTO `eb_system_role_menu` VALUES (1, 5); -INSERT INTO `eb_system_role_menu` VALUES (1, 6); -INSERT INTO `eb_system_role_menu` VALUES (1, 7); -INSERT INTO `eb_system_role_menu` VALUES (1, 8); -INSERT INTO `eb_system_role_menu` VALUES (1, 9); -INSERT INTO `eb_system_role_menu` VALUES (1, 10); -INSERT INTO `eb_system_role_menu` VALUES (1, 12); -INSERT INTO `eb_system_role_menu` VALUES (1, 13); -INSERT INTO `eb_system_role_menu` VALUES (1, 14); -INSERT INTO `eb_system_role_menu` VALUES (1, 15); -INSERT INTO `eb_system_role_menu` VALUES (1, 16); -INSERT INTO `eb_system_role_menu` VALUES (1, 17); -INSERT INTO `eb_system_role_menu` VALUES (1, 18); -INSERT INTO `eb_system_role_menu` VALUES (1, 19); -INSERT INTO `eb_system_role_menu` VALUES (1, 20); -INSERT INTO `eb_system_role_menu` VALUES (1, 21); -INSERT INTO `eb_system_role_menu` VALUES (1, 22); -INSERT INTO `eb_system_role_menu` VALUES (1, 23); -INSERT INTO `eb_system_role_menu` VALUES (1, 24); -INSERT INTO `eb_system_role_menu` VALUES (1, 25); -INSERT INTO `eb_system_role_menu` VALUES (1, 26); -INSERT INTO `eb_system_role_menu` VALUES (1, 27); -INSERT INTO `eb_system_role_menu` VALUES (1, 28); -INSERT INTO `eb_system_role_menu` VALUES (1, 29); -INSERT INTO `eb_system_role_menu` VALUES (1, 30); -INSERT INTO `eb_system_role_menu` VALUES (1, 31); -INSERT INTO `eb_system_role_menu` VALUES (1, 32); -INSERT INTO `eb_system_role_menu` VALUES (1, 33); -INSERT INTO `eb_system_role_menu` VALUES (1, 34); -INSERT INTO `eb_system_role_menu` VALUES (1, 35); -INSERT INTO `eb_system_role_menu` VALUES (1, 36); -INSERT INTO `eb_system_role_menu` VALUES (1, 37); -INSERT INTO `eb_system_role_menu` VALUES (1, 38); -INSERT INTO `eb_system_role_menu` VALUES (1, 39); -INSERT INTO `eb_system_role_menu` VALUES (1, 40); -INSERT INTO `eb_system_role_menu` VALUES (1, 41); -INSERT INTO `eb_system_role_menu` VALUES (1, 42); -INSERT INTO `eb_system_role_menu` VALUES (1, 43); -INSERT INTO `eb_system_role_menu` VALUES (1, 44); -INSERT INTO `eb_system_role_menu` VALUES (1, 47); -INSERT INTO `eb_system_role_menu` VALUES (1, 48); -INSERT INTO `eb_system_role_menu` VALUES (1, 49); -INSERT INTO `eb_system_role_menu` VALUES (1, 50); -INSERT INTO `eb_system_role_menu` VALUES (1, 51); -INSERT INTO `eb_system_role_menu` VALUES (1, 52); -INSERT INTO `eb_system_role_menu` VALUES (1, 53); -INSERT INTO `eb_system_role_menu` VALUES (1, 54); -INSERT INTO `eb_system_role_menu` VALUES (1, 55); -INSERT INTO `eb_system_role_menu` VALUES (1, 56); -INSERT INTO `eb_system_role_menu` VALUES (1, 57); -INSERT INTO `eb_system_role_menu` VALUES (1, 59); -INSERT INTO `eb_system_role_menu` VALUES (1, 60); -INSERT INTO `eb_system_role_menu` VALUES (1, 61); -INSERT INTO `eb_system_role_menu` VALUES (1, 62); -INSERT INTO `eb_system_role_menu` VALUES (1, 63); -INSERT INTO `eb_system_role_menu` VALUES (1, 64); -INSERT INTO `eb_system_role_menu` VALUES (1, 67); -INSERT INTO `eb_system_role_menu` VALUES (1, 68); -INSERT INTO `eb_system_role_menu` VALUES (1, 69); -INSERT INTO `eb_system_role_menu` VALUES (1, 70); -INSERT INTO `eb_system_role_menu` VALUES (1, 73); -INSERT INTO `eb_system_role_menu` VALUES (1, 74); -INSERT INTO `eb_system_role_menu` VALUES (1, 75); -INSERT INTO `eb_system_role_menu` VALUES (1, 76); -INSERT INTO `eb_system_role_menu` VALUES (1, 77); -INSERT INTO `eb_system_role_menu` VALUES (1, 83); -INSERT INTO `eb_system_role_menu` VALUES (1, 84); -INSERT INTO `eb_system_role_menu` VALUES (1, 85); -INSERT INTO `eb_system_role_menu` VALUES (1, 86); -INSERT INTO `eb_system_role_menu` VALUES (1, 87); -INSERT INTO `eb_system_role_menu` VALUES (1, 88); -INSERT INTO `eb_system_role_menu` VALUES (1, 89); -INSERT INTO `eb_system_role_menu` VALUES (1, 90); -INSERT INTO `eb_system_role_menu` VALUES (1, 91); -INSERT INTO `eb_system_role_menu` VALUES (1, 92); -INSERT INTO `eb_system_role_menu` VALUES (1, 93); -INSERT INTO `eb_system_role_menu` VALUES (1, 94); -INSERT INTO `eb_system_role_menu` VALUES (1, 95); -INSERT INTO `eb_system_role_menu` VALUES (1, 96); -INSERT INTO `eb_system_role_menu` VALUES (1, 97); -INSERT INTO `eb_system_role_menu` VALUES (1, 98); -INSERT INTO `eb_system_role_menu` VALUES (1, 99); -INSERT INTO `eb_system_role_menu` VALUES (1, 100); -INSERT INTO `eb_system_role_menu` VALUES (1, 101); -INSERT INTO `eb_system_role_menu` VALUES (1, 102); -INSERT INTO `eb_system_role_menu` VALUES (1, 103); -INSERT INTO `eb_system_role_menu` VALUES (1, 104); -INSERT INTO `eb_system_role_menu` VALUES (1, 105); -INSERT INTO `eb_system_role_menu` VALUES (1, 106); -INSERT INTO `eb_system_role_menu` VALUES (1, 107); -INSERT INTO `eb_system_role_menu` VALUES (1, 108); -INSERT INTO `eb_system_role_menu` VALUES (1, 109); -INSERT INTO `eb_system_role_menu` VALUES (1, 110); -INSERT INTO `eb_system_role_menu` VALUES (1, 111); -INSERT INTO `eb_system_role_menu` VALUES (1, 114); -INSERT INTO `eb_system_role_menu` VALUES (1, 115); -INSERT INTO `eb_system_role_menu` VALUES (1, 121); -INSERT INTO `eb_system_role_menu` VALUES (1, 122); -INSERT INTO `eb_system_role_menu` VALUES (1, 123); -INSERT INTO `eb_system_role_menu` VALUES (1, 124); -INSERT INTO `eb_system_role_menu` VALUES (1, 125); -INSERT INTO `eb_system_role_menu` VALUES (1, 127); -INSERT INTO `eb_system_role_menu` VALUES (1, 128); -INSERT INTO `eb_system_role_menu` VALUES (1, 129); -INSERT INTO `eb_system_role_menu` VALUES (1, 130); -INSERT INTO `eb_system_role_menu` VALUES (1, 131); -INSERT INTO `eb_system_role_menu` VALUES (1, 132); -INSERT INTO `eb_system_role_menu` VALUES (1, 133); -INSERT INTO `eb_system_role_menu` VALUES (1, 134); -INSERT INTO `eb_system_role_menu` VALUES (1, 135); -INSERT INTO `eb_system_role_menu` VALUES (1, 136); -INSERT INTO `eb_system_role_menu` VALUES (1, 137); -INSERT INTO `eb_system_role_menu` VALUES (1, 138); -INSERT INTO `eb_system_role_menu` VALUES (1, 139); -INSERT INTO `eb_system_role_menu` VALUES (1, 140); -INSERT INTO `eb_system_role_menu` VALUES (1, 141); -INSERT INTO `eb_system_role_menu` VALUES (1, 142); -INSERT INTO `eb_system_role_menu` VALUES (1, 143); -INSERT INTO `eb_system_role_menu` VALUES (1, 144); -INSERT INTO `eb_system_role_menu` VALUES (1, 145); -INSERT INTO `eb_system_role_menu` VALUES (1, 146); -INSERT INTO `eb_system_role_menu` VALUES (1, 147); -INSERT INTO `eb_system_role_menu` VALUES (1, 148); -INSERT INTO `eb_system_role_menu` VALUES (1, 149); -INSERT INTO `eb_system_role_menu` VALUES (1, 151); -INSERT INTO `eb_system_role_menu` VALUES (1, 152); -INSERT INTO `eb_system_role_menu` VALUES (1, 153); -INSERT INTO `eb_system_role_menu` VALUES (1, 154); -INSERT INTO `eb_system_role_menu` VALUES (1, 155); -INSERT INTO `eb_system_role_menu` VALUES (1, 156); -INSERT INTO `eb_system_role_menu` VALUES (1, 157); -INSERT INTO `eb_system_role_menu` VALUES (1, 158); -INSERT INTO `eb_system_role_menu` VALUES (1, 159); -INSERT INTO `eb_system_role_menu` VALUES (1, 160); -INSERT INTO `eb_system_role_menu` VALUES (1, 161); -INSERT INTO `eb_system_role_menu` VALUES (1, 162); -INSERT INTO `eb_system_role_menu` VALUES (1, 163); -INSERT INTO `eb_system_role_menu` VALUES (1, 164); -INSERT INTO `eb_system_role_menu` VALUES (1, 165); -INSERT INTO `eb_system_role_menu` VALUES (1, 166); -INSERT INTO `eb_system_role_menu` VALUES (1, 167); -INSERT INTO `eb_system_role_menu` VALUES (1, 168); -INSERT INTO `eb_system_role_menu` VALUES (1, 169); -INSERT INTO `eb_system_role_menu` VALUES (1, 170); -INSERT INTO `eb_system_role_menu` VALUES (1, 171); -INSERT INTO `eb_system_role_menu` VALUES (1, 172); -INSERT INTO `eb_system_role_menu` VALUES (1, 173); -INSERT INTO `eb_system_role_menu` VALUES (1, 174); -INSERT INTO `eb_system_role_menu` VALUES (1, 176); -INSERT INTO `eb_system_role_menu` VALUES (1, 179); -INSERT INTO `eb_system_role_menu` VALUES (1, 180); -INSERT INTO `eb_system_role_menu` VALUES (1, 181); -INSERT INTO `eb_system_role_menu` VALUES (1, 182); -INSERT INTO `eb_system_role_menu` VALUES (1, 184); -INSERT INTO `eb_system_role_menu` VALUES (1, 185); -INSERT INTO `eb_system_role_menu` VALUES (1, 186); -INSERT INTO `eb_system_role_menu` VALUES (1, 187); -INSERT INTO `eb_system_role_menu` VALUES (1, 188); -INSERT INTO `eb_system_role_menu` VALUES (1, 189); -INSERT INTO `eb_system_role_menu` VALUES (1, 191); -INSERT INTO `eb_system_role_menu` VALUES (1, 192); -INSERT INTO `eb_system_role_menu` VALUES (1, 193); -INSERT INTO `eb_system_role_menu` VALUES (1, 194); -INSERT INTO `eb_system_role_menu` VALUES (1, 195); -INSERT INTO `eb_system_role_menu` VALUES (1, 196); -INSERT INTO `eb_system_role_menu` VALUES (1, 197); -INSERT INTO `eb_system_role_menu` VALUES (1, 198); -INSERT INTO `eb_system_role_menu` VALUES (1, 199); -INSERT INTO `eb_system_role_menu` VALUES (1, 200); -INSERT INTO `eb_system_role_menu` VALUES (1, 201); -INSERT INTO `eb_system_role_menu` VALUES (1, 202); -INSERT INTO `eb_system_role_menu` VALUES (1, 203); -INSERT INTO `eb_system_role_menu` VALUES (1, 204); -INSERT INTO `eb_system_role_menu` VALUES (1, 205); -INSERT INTO `eb_system_role_menu` VALUES (1, 207); -INSERT INTO `eb_system_role_menu` VALUES (1, 208); -INSERT INTO `eb_system_role_menu` VALUES (1, 209); -INSERT INTO `eb_system_role_menu` VALUES (1, 210); -INSERT INTO `eb_system_role_menu` VALUES (1, 211); -INSERT INTO `eb_system_role_menu` VALUES (1, 212); -INSERT INTO `eb_system_role_menu` VALUES (1, 213); -INSERT INTO `eb_system_role_menu` VALUES (1, 214); -INSERT INTO `eb_system_role_menu` VALUES (1, 215); -INSERT INTO `eb_system_role_menu` VALUES (1, 216); -INSERT INTO `eb_system_role_menu` VALUES (1, 217); -INSERT INTO `eb_system_role_menu` VALUES (1, 218); -INSERT INTO `eb_system_role_menu` VALUES (1, 219); -INSERT INTO `eb_system_role_menu` VALUES (1, 220); -INSERT INTO `eb_system_role_menu` VALUES (1, 224); -INSERT INTO `eb_system_role_menu` VALUES (1, 225); -INSERT INTO `eb_system_role_menu` VALUES (1, 226); -INSERT INTO `eb_system_role_menu` VALUES (1, 227); -INSERT INTO `eb_system_role_menu` VALUES (1, 228); -INSERT INTO `eb_system_role_menu` VALUES (1, 229); -INSERT INTO `eb_system_role_menu` VALUES (1, 231); -INSERT INTO `eb_system_role_menu` VALUES (1, 232); -INSERT INTO `eb_system_role_menu` VALUES (1, 233); -INSERT INTO `eb_system_role_menu` VALUES (1, 234); -INSERT INTO `eb_system_role_menu` VALUES (1, 235); -INSERT INTO `eb_system_role_menu` VALUES (1, 236); -INSERT INTO `eb_system_role_menu` VALUES (1, 237); -INSERT INTO `eb_system_role_menu` VALUES (1, 238); -INSERT INTO `eb_system_role_menu` VALUES (1, 239); -INSERT INTO `eb_system_role_menu` VALUES (1, 240); -INSERT INTO `eb_system_role_menu` VALUES (1, 241); -INSERT INTO `eb_system_role_menu` VALUES (1, 242); -INSERT INTO `eb_system_role_menu` VALUES (1, 243); -INSERT INTO `eb_system_role_menu` VALUES (1, 244); -INSERT INTO `eb_system_role_menu` VALUES (1, 245); -INSERT INTO `eb_system_role_menu` VALUES (1, 246); -INSERT INTO `eb_system_role_menu` VALUES (1, 247); -INSERT INTO `eb_system_role_menu` VALUES (1, 248); -INSERT INTO `eb_system_role_menu` VALUES (1, 250); -INSERT INTO `eb_system_role_menu` VALUES (1, 251); -INSERT INTO `eb_system_role_menu` VALUES (1, 252); -INSERT INTO `eb_system_role_menu` VALUES (1, 253); -INSERT INTO `eb_system_role_menu` VALUES (1, 254); -INSERT INTO `eb_system_role_menu` VALUES (1, 255); -INSERT INTO `eb_system_role_menu` VALUES (1, 256); -INSERT INTO `eb_system_role_menu` VALUES (1, 257); -INSERT INTO `eb_system_role_menu` VALUES (1, 258); -INSERT INTO `eb_system_role_menu` VALUES (1, 259); -INSERT INTO `eb_system_role_menu` VALUES (1, 260); -INSERT INTO `eb_system_role_menu` VALUES (1, 261); -INSERT INTO `eb_system_role_menu` VALUES (1, 262); -INSERT INTO `eb_system_role_menu` VALUES (1, 263); -INSERT INTO `eb_system_role_menu` VALUES (1, 264); -INSERT INTO `eb_system_role_menu` VALUES (1, 265); -INSERT INTO `eb_system_role_menu` VALUES (1, 266); -INSERT INTO `eb_system_role_menu` VALUES (1, 267); -INSERT INTO `eb_system_role_menu` VALUES (1, 268); -INSERT INTO `eb_system_role_menu` VALUES (1, 269); -INSERT INTO `eb_system_role_menu` VALUES (1, 270); -INSERT INTO `eb_system_role_menu` VALUES (1, 271); -INSERT INTO `eb_system_role_menu` VALUES (1, 272); -INSERT INTO `eb_system_role_menu` VALUES (1, 273); -INSERT INTO `eb_system_role_menu` VALUES (1, 274); -INSERT INTO `eb_system_role_menu` VALUES (1, 275); -INSERT INTO `eb_system_role_menu` VALUES (1, 276); -INSERT INTO `eb_system_role_menu` VALUES (1, 277); -INSERT INTO `eb_system_role_menu` VALUES (1, 278); -INSERT INTO `eb_system_role_menu` VALUES (1, 280); -INSERT INTO `eb_system_role_menu` VALUES (1, 281); -INSERT INTO `eb_system_role_menu` VALUES (1, 282); -INSERT INTO `eb_system_role_menu` VALUES (1, 283); -INSERT INTO `eb_system_role_menu` VALUES (1, 284); -INSERT INTO `eb_system_role_menu` VALUES (1, 285); -INSERT INTO `eb_system_role_menu` VALUES (1, 286); -INSERT INTO `eb_system_role_menu` VALUES (1, 287); -INSERT INTO `eb_system_role_menu` VALUES (1, 288); -INSERT INTO `eb_system_role_menu` VALUES (1, 289); -INSERT INTO `eb_system_role_menu` VALUES (1, 290); -INSERT INTO `eb_system_role_menu` VALUES (1, 291); -INSERT INTO `eb_system_role_menu` VALUES (1, 293); -INSERT INTO `eb_system_role_menu` VALUES (1, 294); -INSERT INTO `eb_system_role_menu` VALUES (1, 295); -INSERT INTO `eb_system_role_menu` VALUES (1, 296); -INSERT INTO `eb_system_role_menu` VALUES (1, 297); -INSERT INTO `eb_system_role_menu` VALUES (1, 298); -INSERT INTO `eb_system_role_menu` VALUES (1, 299); -INSERT INTO `eb_system_role_menu` VALUES (1, 300); -INSERT INTO `eb_system_role_menu` VALUES (1, 301); -INSERT INTO `eb_system_role_menu` VALUES (1, 302); -INSERT INTO `eb_system_role_menu` VALUES (1, 303); -INSERT INTO `eb_system_role_menu` VALUES (1, 304); -INSERT INTO `eb_system_role_menu` VALUES (1, 305); -INSERT INTO `eb_system_role_menu` VALUES (1, 306); -INSERT INTO `eb_system_role_menu` VALUES (1, 307); -INSERT INTO `eb_system_role_menu` VALUES (1, 308); -INSERT INTO `eb_system_role_menu` VALUES (1, 309); -INSERT INTO `eb_system_role_menu` VALUES (1, 310); -INSERT INTO `eb_system_role_menu` VALUES (1, 311); -INSERT INTO `eb_system_role_menu` VALUES (1, 312); -INSERT INTO `eb_system_role_menu` VALUES (1, 313); -INSERT INTO `eb_system_role_menu` VALUES (1, 314); -INSERT INTO `eb_system_role_menu` VALUES (1, 315); -INSERT INTO `eb_system_role_menu` VALUES (1, 316); -INSERT INTO `eb_system_role_menu` VALUES (1, 317); -INSERT INTO `eb_system_role_menu` VALUES (1, 318); -INSERT INTO `eb_system_role_menu` VALUES (1, 319); -INSERT INTO `eb_system_role_menu` VALUES (1, 320); -INSERT INTO `eb_system_role_menu` VALUES (1, 321); -INSERT INTO `eb_system_role_menu` VALUES (1, 322); -INSERT INTO `eb_system_role_menu` VALUES (1, 323); -INSERT INTO `eb_system_role_menu` VALUES (1, 324); -INSERT INTO `eb_system_role_menu` VALUES (1, 325); -INSERT INTO `eb_system_role_menu` VALUES (1, 326); -INSERT INTO `eb_system_role_menu` VALUES (1, 327); -INSERT INTO `eb_system_role_menu` VALUES (1, 328); -INSERT INTO `eb_system_role_menu` VALUES (1, 329); -INSERT INTO `eb_system_role_menu` VALUES (1, 330); -INSERT INTO `eb_system_role_menu` VALUES (1, 331); -INSERT INTO `eb_system_role_menu` VALUES (1, 333); -INSERT INTO `eb_system_role_menu` VALUES (1, 334); -INSERT INTO `eb_system_role_menu` VALUES (1, 335); -INSERT INTO `eb_system_role_menu` VALUES (1, 337); -INSERT INTO `eb_system_role_menu` VALUES (1, 340); -INSERT INTO `eb_system_role_menu` VALUES (1, 341); -INSERT INTO `eb_system_role_menu` VALUES (1, 342); -INSERT INTO `eb_system_role_menu` VALUES (1, 343); -INSERT INTO `eb_system_role_menu` VALUES (1, 344); -INSERT INTO `eb_system_role_menu` VALUES (1, 345); -INSERT INTO `eb_system_role_menu` VALUES (1, 347); -INSERT INTO `eb_system_role_menu` VALUES (1, 348); -INSERT INTO `eb_system_role_menu` VALUES (1, 349); -INSERT INTO `eb_system_role_menu` VALUES (1, 350); -INSERT INTO `eb_system_role_menu` VALUES (1, 352); -INSERT INTO `eb_system_role_menu` VALUES (1, 353); -INSERT INTO `eb_system_role_menu` VALUES (1, 354); -INSERT INTO `eb_system_role_menu` VALUES (1, 355); -INSERT INTO `eb_system_role_menu` VALUES (1, 356); -INSERT INTO `eb_system_role_menu` VALUES (1, 357); -INSERT INTO `eb_system_role_menu` VALUES (1, 359); -INSERT INTO `eb_system_role_menu` VALUES (1, 360); -INSERT INTO `eb_system_role_menu` VALUES (1, 361); -INSERT INTO `eb_system_role_menu` VALUES (1, 362); -INSERT INTO `eb_system_role_menu` VALUES (1, 366); -INSERT INTO `eb_system_role_menu` VALUES (1, 367); -INSERT INTO `eb_system_role_menu` VALUES (1, 368); -INSERT INTO `eb_system_role_menu` VALUES (1, 369); -INSERT INTO `eb_system_role_menu` VALUES (1, 370); -INSERT INTO `eb_system_role_menu` VALUES (1, 371); -INSERT INTO `eb_system_role_menu` VALUES (1, 372); -INSERT INTO `eb_system_role_menu` VALUES (1, 373); -INSERT INTO `eb_system_role_menu` VALUES (1, 374); -INSERT INTO `eb_system_role_menu` VALUES (1, 375); -INSERT INTO `eb_system_role_menu` VALUES (1, 376); -INSERT INTO `eb_system_role_menu` VALUES (1, 377); -INSERT INTO `eb_system_role_menu` VALUES (1, 378); -INSERT INTO `eb_system_role_menu` VALUES (1, 379); -INSERT INTO `eb_system_role_menu` VALUES (1, 380); -INSERT INTO `eb_system_role_menu` VALUES (1, 381); -INSERT INTO `eb_system_role_menu` VALUES (1, 382); -INSERT INTO `eb_system_role_menu` VALUES (1, 383); -INSERT INTO `eb_system_role_menu` VALUES (1, 384); -INSERT INTO `eb_system_role_menu` VALUES (1, 385); -INSERT INTO `eb_system_role_menu` VALUES (1, 386); -INSERT INTO `eb_system_role_menu` VALUES (1, 387); -INSERT INTO `eb_system_role_menu` VALUES (1, 388); -INSERT INTO `eb_system_role_menu` VALUES (1, 389); -INSERT INTO `eb_system_role_menu` VALUES (1, 390); -INSERT INTO `eb_system_role_menu` VALUES (1, 391); -INSERT INTO `eb_system_role_menu` VALUES (1, 392); -INSERT INTO `eb_system_role_menu` VALUES (1, 393); -INSERT INTO `eb_system_role_menu` VALUES (1, 394); -INSERT INTO `eb_system_role_menu` VALUES (1, 395); -INSERT INTO `eb_system_role_menu` VALUES (1, 396); -INSERT INTO `eb_system_role_menu` VALUES (1, 397); -INSERT INTO `eb_system_role_menu` VALUES (1, 398); -INSERT INTO `eb_system_role_menu` VALUES (1, 399); -INSERT INTO `eb_system_role_menu` VALUES (1, 400); -INSERT INTO `eb_system_role_menu` VALUES (1, 401); -INSERT INTO `eb_system_role_menu` VALUES (1, 402); -INSERT INTO `eb_system_role_menu` VALUES (1, 403); -INSERT INTO `eb_system_role_menu` VALUES (5, 1); -INSERT INTO `eb_system_role_menu` VALUES (5, 2); -INSERT INTO `eb_system_role_menu` VALUES (5, 3); -INSERT INTO `eb_system_role_menu` VALUES (5, 4); -INSERT INTO `eb_system_role_menu` VALUES (5, 5); -INSERT INTO `eb_system_role_menu` VALUES (5, 6); -INSERT INTO `eb_system_role_menu` VALUES (5, 7); -INSERT INTO `eb_system_role_menu` VALUES (5, 8); -INSERT INTO `eb_system_role_menu` VALUES (5, 9); -INSERT INTO `eb_system_role_menu` VALUES (5, 10); -INSERT INTO `eb_system_role_menu` VALUES (5, 14); -INSERT INTO `eb_system_role_menu` VALUES (5, 15); -INSERT INTO `eb_system_role_menu` VALUES (5, 16); -INSERT INTO `eb_system_role_menu` VALUES (5, 17); -INSERT INTO `eb_system_role_menu` VALUES (5, 18); -INSERT INTO `eb_system_role_menu` VALUES (5, 19); -INSERT INTO `eb_system_role_menu` VALUES (5, 20); -INSERT INTO `eb_system_role_menu` VALUES (5, 21); -INSERT INTO `eb_system_role_menu` VALUES (5, 22); -INSERT INTO `eb_system_role_menu` VALUES (5, 23); -INSERT INTO `eb_system_role_menu` VALUES (5, 24); -INSERT INTO `eb_system_role_menu` VALUES (5, 25); -INSERT INTO `eb_system_role_menu` VALUES (5, 26); -INSERT INTO `eb_system_role_menu` VALUES (5, 27); -INSERT INTO `eb_system_role_menu` VALUES (5, 28); -INSERT INTO `eb_system_role_menu` VALUES (5, 29); -INSERT INTO `eb_system_role_menu` VALUES (5, 30); -INSERT INTO `eb_system_role_menu` VALUES (5, 31); -INSERT INTO `eb_system_role_menu` VALUES (5, 32); -INSERT INTO `eb_system_role_menu` VALUES (5, 33); -INSERT INTO `eb_system_role_menu` VALUES (5, 34); -INSERT INTO `eb_system_role_menu` VALUES (5, 35); -INSERT INTO `eb_system_role_menu` VALUES (5, 36); -INSERT INTO `eb_system_role_menu` VALUES (5, 37); -INSERT INTO `eb_system_role_menu` VALUES (5, 38); -INSERT INTO `eb_system_role_menu` VALUES (5, 39); -INSERT INTO `eb_system_role_menu` VALUES (5, 40); -INSERT INTO `eb_system_role_menu` VALUES (5, 41); -INSERT INTO `eb_system_role_menu` VALUES (5, 42); -INSERT INTO `eb_system_role_menu` VALUES (5, 43); -INSERT INTO `eb_system_role_menu` VALUES (5, 44); -INSERT INTO `eb_system_role_menu` VALUES (5, 47); -INSERT INTO `eb_system_role_menu` VALUES (5, 48); -INSERT INTO `eb_system_role_menu` VALUES (5, 49); -INSERT INTO `eb_system_role_menu` VALUES (5, 50); -INSERT INTO `eb_system_role_menu` VALUES (5, 51); -INSERT INTO `eb_system_role_menu` VALUES (5, 52); -INSERT INTO `eb_system_role_menu` VALUES (5, 53); -INSERT INTO `eb_system_role_menu` VALUES (5, 54); -INSERT INTO `eb_system_role_menu` VALUES (5, 55); -INSERT INTO `eb_system_role_menu` VALUES (5, 56); -INSERT INTO `eb_system_role_menu` VALUES (5, 57); -INSERT INTO `eb_system_role_menu` VALUES (5, 59); -INSERT INTO `eb_system_role_menu` VALUES (5, 60); -INSERT INTO `eb_system_role_menu` VALUES (5, 61); -INSERT INTO `eb_system_role_menu` VALUES (5, 62); -INSERT INTO `eb_system_role_menu` VALUES (5, 63); -INSERT INTO `eb_system_role_menu` VALUES (5, 64); -INSERT INTO `eb_system_role_menu` VALUES (5, 67); -INSERT INTO `eb_system_role_menu` VALUES (5, 68); -INSERT INTO `eb_system_role_menu` VALUES (5, 69); -INSERT INTO `eb_system_role_menu` VALUES (5, 70); -INSERT INTO `eb_system_role_menu` VALUES (5, 73); -INSERT INTO `eb_system_role_menu` VALUES (5, 74); -INSERT INTO `eb_system_role_menu` VALUES (5, 75); -INSERT INTO `eb_system_role_menu` VALUES (5, 76); -INSERT INTO `eb_system_role_menu` VALUES (5, 77); -INSERT INTO `eb_system_role_menu` VALUES (5, 83); -INSERT INTO `eb_system_role_menu` VALUES (5, 84); -INSERT INTO `eb_system_role_menu` VALUES (5, 85); -INSERT INTO `eb_system_role_menu` VALUES (5, 86); -INSERT INTO `eb_system_role_menu` VALUES (5, 87); -INSERT INTO `eb_system_role_menu` VALUES (5, 88); -INSERT INTO `eb_system_role_menu` VALUES (5, 89); -INSERT INTO `eb_system_role_menu` VALUES (5, 90); -INSERT INTO `eb_system_role_menu` VALUES (5, 91); -INSERT INTO `eb_system_role_menu` VALUES (5, 92); -INSERT INTO `eb_system_role_menu` VALUES (5, 93); -INSERT INTO `eb_system_role_menu` VALUES (5, 94); -INSERT INTO `eb_system_role_menu` VALUES (5, 95); -INSERT INTO `eb_system_role_menu` VALUES (5, 96); -INSERT INTO `eb_system_role_menu` VALUES (5, 97); -INSERT INTO `eb_system_role_menu` VALUES (5, 98); -INSERT INTO `eb_system_role_menu` VALUES (5, 99); -INSERT INTO `eb_system_role_menu` VALUES (5, 100); -INSERT INTO `eb_system_role_menu` VALUES (5, 101); -INSERT INTO `eb_system_role_menu` VALUES (5, 102); -INSERT INTO `eb_system_role_menu` VALUES (5, 103); -INSERT INTO `eb_system_role_menu` VALUES (5, 104); -INSERT INTO `eb_system_role_menu` VALUES (5, 105); -INSERT INTO `eb_system_role_menu` VALUES (5, 106); -INSERT INTO `eb_system_role_menu` VALUES (5, 107); -INSERT INTO `eb_system_role_menu` VALUES (5, 108); -INSERT INTO `eb_system_role_menu` VALUES (5, 109); -INSERT INTO `eb_system_role_menu` VALUES (5, 110); -INSERT INTO `eb_system_role_menu` VALUES (5, 111); -INSERT INTO `eb_system_role_menu` VALUES (5, 114); -INSERT INTO `eb_system_role_menu` VALUES (5, 115); -INSERT INTO `eb_system_role_menu` VALUES (5, 179); -INSERT INTO `eb_system_role_menu` VALUES (5, 180); -INSERT INTO `eb_system_role_menu` VALUES (5, 181); -INSERT INTO `eb_system_role_menu` VALUES (5, 182); -INSERT INTO `eb_system_role_menu` VALUES (5, 184); -INSERT INTO `eb_system_role_menu` VALUES (5, 185); -INSERT INTO `eb_system_role_menu` VALUES (5, 186); -INSERT INTO `eb_system_role_menu` VALUES (5, 187); -INSERT INTO `eb_system_role_menu` VALUES (5, 188); -INSERT INTO `eb_system_role_menu` VALUES (5, 189); -INSERT INTO `eb_system_role_menu` VALUES (5, 191); -INSERT INTO `eb_system_role_menu` VALUES (5, 192); -INSERT INTO `eb_system_role_menu` VALUES (5, 193); -INSERT INTO `eb_system_role_menu` VALUES (5, 194); -INSERT INTO `eb_system_role_menu` VALUES (5, 195); -INSERT INTO `eb_system_role_menu` VALUES (5, 196); -INSERT INTO `eb_system_role_menu` VALUES (5, 197); -INSERT INTO `eb_system_role_menu` VALUES (5, 198); -INSERT INTO `eb_system_role_menu` VALUES (5, 199); -INSERT INTO `eb_system_role_menu` VALUES (5, 200); -INSERT INTO `eb_system_role_menu` VALUES (5, 201); -INSERT INTO `eb_system_role_menu` VALUES (5, 202); -INSERT INTO `eb_system_role_menu` VALUES (5, 203); -INSERT INTO `eb_system_role_menu` VALUES (5, 204); -INSERT INTO `eb_system_role_menu` VALUES (5, 205); -INSERT INTO `eb_system_role_menu` VALUES (5, 207); -INSERT INTO `eb_system_role_menu` VALUES (5, 208); -INSERT INTO `eb_system_role_menu` VALUES (5, 209); -INSERT INTO `eb_system_role_menu` VALUES (5, 210); -INSERT INTO `eb_system_role_menu` VALUES (5, 211); -INSERT INTO `eb_system_role_menu` VALUES (5, 212); -INSERT INTO `eb_system_role_menu` VALUES (5, 213); -INSERT INTO `eb_system_role_menu` VALUES (5, 214); -INSERT INTO `eb_system_role_menu` VALUES (5, 215); -INSERT INTO `eb_system_role_menu` VALUES (5, 216); -INSERT INTO `eb_system_role_menu` VALUES (5, 217); -INSERT INTO `eb_system_role_menu` VALUES (5, 218); -INSERT INTO `eb_system_role_menu` VALUES (5, 219); -INSERT INTO `eb_system_role_menu` VALUES (5, 220); -INSERT INTO `eb_system_role_menu` VALUES (5, 224); -INSERT INTO `eb_system_role_menu` VALUES (5, 226); -INSERT INTO `eb_system_role_menu` VALUES (5, 227); -INSERT INTO `eb_system_role_menu` VALUES (5, 228); -INSERT INTO `eb_system_role_menu` VALUES (5, 229); -INSERT INTO `eb_system_role_menu` VALUES (5, 231); -INSERT INTO `eb_system_role_menu` VALUES (5, 260); -INSERT INTO `eb_system_role_menu` VALUES (5, 261); -INSERT INTO `eb_system_role_menu` VALUES (5, 262); -INSERT INTO `eb_system_role_menu` VALUES (5, 263); -INSERT INTO `eb_system_role_menu` VALUES (5, 264); -INSERT INTO `eb_system_role_menu` VALUES (5, 265); -INSERT INTO `eb_system_role_menu` VALUES (5, 266); -INSERT INTO `eb_system_role_menu` VALUES (5, 267); -INSERT INTO `eb_system_role_menu` VALUES (5, 268); -INSERT INTO `eb_system_role_menu` VALUES (5, 270); -INSERT INTO `eb_system_role_menu` VALUES (5, 271); -INSERT INTO `eb_system_role_menu` VALUES (5, 272); -INSERT INTO `eb_system_role_menu` VALUES (5, 273); -INSERT INTO `eb_system_role_menu` VALUES (5, 274); -INSERT INTO `eb_system_role_menu` VALUES (5, 275); -INSERT INTO `eb_system_role_menu` VALUES (5, 276); -INSERT INTO `eb_system_role_menu` VALUES (5, 277); -INSERT INTO `eb_system_role_menu` VALUES (5, 278); -INSERT INTO `eb_system_role_menu` VALUES (5, 280); -INSERT INTO `eb_system_role_menu` VALUES (5, 281); -INSERT INTO `eb_system_role_menu` VALUES (5, 282); -INSERT INTO `eb_system_role_menu` VALUES (5, 283); -INSERT INTO `eb_system_role_menu` VALUES (5, 285); -INSERT INTO `eb_system_role_menu` VALUES (5, 286); -INSERT INTO `eb_system_role_menu` VALUES (5, 287); -INSERT INTO `eb_system_role_menu` VALUES (5, 288); -INSERT INTO `eb_system_role_menu` VALUES (5, 289); -INSERT INTO `eb_system_role_menu` VALUES (5, 290); -INSERT INTO `eb_system_role_menu` VALUES (5, 291); -INSERT INTO `eb_system_role_menu` VALUES (5, 293); -INSERT INTO `eb_system_role_menu` VALUES (5, 294); -INSERT INTO `eb_system_role_menu` VALUES (5, 295); -INSERT INTO `eb_system_role_menu` VALUES (5, 296); -INSERT INTO `eb_system_role_menu` VALUES (5, 297); -INSERT INTO `eb_system_role_menu` VALUES (5, 298); -INSERT INTO `eb_system_role_menu` VALUES (5, 299); -INSERT INTO `eb_system_role_menu` VALUES (5, 300); -INSERT INTO `eb_system_role_menu` VALUES (5, 301); -INSERT INTO `eb_system_role_menu` VALUES (5, 302); -INSERT INTO `eb_system_role_menu` VALUES (5, 304); -INSERT INTO `eb_system_role_menu` VALUES (5, 305); -INSERT INTO `eb_system_role_menu` VALUES (5, 306); -INSERT INTO `eb_system_role_menu` VALUES (5, 307); -INSERT INTO `eb_system_role_menu` VALUES (5, 308); -INSERT INTO `eb_system_role_menu` VALUES (5, 309); -INSERT INTO `eb_system_role_menu` VALUES (5, 315); -INSERT INTO `eb_system_role_menu` VALUES (5, 316); -INSERT INTO `eb_system_role_menu` VALUES (5, 317); -INSERT INTO `eb_system_role_menu` VALUES (5, 318); -INSERT INTO `eb_system_role_menu` VALUES (5, 319); -INSERT INTO `eb_system_role_menu` VALUES (5, 320); -INSERT INTO `eb_system_role_menu` VALUES (5, 321); -INSERT INTO `eb_system_role_menu` VALUES (5, 322); -INSERT INTO `eb_system_role_menu` VALUES (5, 323); -INSERT INTO `eb_system_role_menu` VALUES (5, 325); -INSERT INTO `eb_system_role_menu` VALUES (5, 326); -INSERT INTO `eb_system_role_menu` VALUES (5, 327); -INSERT INTO `eb_system_role_menu` VALUES (5, 343); -INSERT INTO `eb_system_role_menu` VALUES (5, 344); -INSERT INTO `eb_system_role_menu` VALUES (5, 345); -INSERT INTO `eb_system_role_menu` VALUES (5, 347); -INSERT INTO `eb_system_role_menu` VALUES (5, 348); -INSERT INTO `eb_system_role_menu` VALUES (5, 349); -INSERT INTO `eb_system_role_menu` VALUES (5, 350); -INSERT INTO `eb_system_role_menu` VALUES (5, 352); -INSERT INTO `eb_system_role_menu` VALUES (5, 353); -INSERT INTO `eb_system_role_menu` VALUES (5, 354); -INSERT INTO `eb_system_role_menu` VALUES (5, 355); -INSERT INTO `eb_system_role_menu` VALUES (5, 356); -INSERT INTO `eb_system_role_menu` VALUES (5, 368); -INSERT INTO `eb_system_role_menu` VALUES (5, 373); -INSERT INTO `eb_system_role_menu` VALUES (5, 375); -INSERT INTO `eb_system_role_menu` VALUES (5, 376); -INSERT INTO `eb_system_role_menu` VALUES (5, 377); -INSERT INTO `eb_system_role_menu` VALUES (5, 378); -INSERT INTO `eb_system_role_menu` VALUES (5, 379); -INSERT INTO `eb_system_role_menu` VALUES (5, 380); -INSERT INTO `eb_system_role_menu` VALUES (5, 381); -INSERT INTO `eb_system_role_menu` VALUES (5, 382); -INSERT INTO `eb_system_role_menu` VALUES (5, 387); -INSERT INTO `eb_system_role_menu` VALUES (5, 388); -INSERT INTO `eb_system_role_menu` VALUES (5, 389); -INSERT INTO `eb_system_role_menu` VALUES (5, 390); -INSERT INTO `eb_system_role_menu` VALUES (5, 391); -INSERT INTO `eb_system_role_menu` VALUES (5, 392); -INSERT INTO `eb_system_role_menu` VALUES (5, 394); -INSERT INTO `eb_system_role_menu` VALUES (5, 395); -INSERT INTO `eb_system_role_menu` VALUES (5, 396); -INSERT INTO `eb_system_role_menu` VALUES (5, 397); -INSERT INTO `eb_system_role_menu` VALUES (5, 399); -INSERT INTO `eb_system_role_menu` VALUES (5, 400); -INSERT INTO `eb_system_role_menu` VALUES (5, 401); -INSERT INTO `eb_system_role_menu` VALUES (5, 402); -INSERT INTO `eb_system_role_menu` VALUES (5, 403); - --- ---------------------------- --- Table structure for eb_system_store --- ---------------------------- -DROP TABLE IF EXISTS `eb_system_store`; -CREATE TABLE `eb_system_store` ( - `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT, - `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '门店名称', - `introduction` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '简介', - `phone` char(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '手机号码', - `address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '省市区', - `detailed_address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '详细地址', - `image` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '门店logo', - `latitude` char(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '纬度', - `longitude` char(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '经度', - `valid_time` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '核销有效日期', - `day_time` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '每日营业开关时间', - `is_show` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否显示', - `is_del` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除', - `create_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间', - `update_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE, - INDEX `phone`(`phone`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '门店自提' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for eb_system_store_staff --- ---------------------------- -DROP TABLE IF EXISTS `eb_system_store_staff`; -CREATE TABLE `eb_system_store_staff` ( - `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, - `uid` int(10) UNSIGNED NOT NULL COMMENT '管理员id', - `avatar` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '店员头像', - `store_id` int(11) NOT NULL COMMENT '门店id', - `staff_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '店员名称', - `phone` char(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '手机号码', - `verify_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '核销开关', - `status` tinyint(2) NULL DEFAULT 1 COMMENT '状态', - `create_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间', - `update_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '门店店员表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for eb_system_user_level --- ---------------------------- -DROP TABLE IF EXISTS `eb_system_user_level`; -CREATE TABLE `eb_system_user_level` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '会员名称', - `experience` int(11) NOT NULL DEFAULT 0 COMMENT '达到多少升级经验', - `is_show` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否显示 1=显示,0=隐藏', - `grade` int(11) NOT NULL DEFAULT 0 COMMENT '会员等级', - `discount` int(4) NOT NULL DEFAULT 100 COMMENT '享受折扣', - `icon` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '会员图标', - `is_del` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除.1=删除,0=未删除', - `create_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '普通会员等级' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of eb_system_user_level --- ---------------------------- -INSERT INTO `eb_system_user_level` VALUES (1, '普通会员', 1, 1, 1, 100, 'crmebimage/public/maintain/2021/12/25/a1470da9ce7f44e3a0248f519b0b02844efygohg3b.png', 0, '2021-12-25 12:36:23', '2021-12-25 12:36:23'); -INSERT INTO `eb_system_user_level` VALUES (2, '黄铜会员', 500, 1, 2, 90, 'crmebimage/public/maintain/2021/12/25/c71d6b74594e4f47a986abda5d5bf983o4drst1ojf.png', 0, '2021-12-25 12:36:56', '2021-12-25 12:36:56'); -INSERT INTO `eb_system_user_level` VALUES (3, '白银会员', 999, 1, 3, 85, 'crmebimage/public/maintain/2021/12/25/0353c775de384b939cd994ac33b6c3f4m328kwji83.png', 0, '2021-12-25 12:38:19', '2021-12-25 12:38:19'); -INSERT INTO `eb_system_user_level` VALUES (4, '黄金会员', 5000, 1, 4, 80, 'crmebimage/public/maintain/2021/12/25/6f98afe5e63d4626a20ed710dc380d5bmc5a0w5phh.png', 0, '2021-12-25 12:38:49', '2021-12-25 12:38:49'); -INSERT INTO `eb_system_user_level` VALUES (5, '钻石会员', 12000, 1, 5, 70, 'crmebimage/public/maintain/2021/12/25/33a35c7b85de4fec8ed148fc6f3e8e670itip8qtor.png', 0, '2021-12-25 12:39:22', '2021-12-25 12:39:22'); - --- ---------------------------- --- Table structure for eb_template_message --- ---------------------------- -DROP TABLE IF EXISTS `eb_template_message`; -CREATE TABLE `eb_template_message` ( - `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '模板id', - `type` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0=订阅消息,1=微信模板消息', - `temp_key` char(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '模板编号', - `name` char(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '模板名', - `content` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '回复内容', - `temp_id` char(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '模板ID', - `status` tinyint(4) NOT NULL DEFAULT 1 COMMENT '状态', - `create_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间', - `update_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 59 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '微信模板' ROW_FORMAT = Compact; - --- ---------------------------- --- Records of eb_template_message --- ---------------------------- -INSERT INTO `eb_template_message` VALUES (11, 1, 'OPENTM410119156', '充值成功通知', '{{first.DATA}}\r\n充值时间：{{keyword1.DATA}}\r\n充值金额：{{keyword2.DATA}}\r\n{{remark.DATA}}', 'aCeSv64b4eiZB6qrrtPdj5djNcS9f0nYQGR7UJFdUXo', 0, '2020-06-16 10:44:44', '2021-12-16 10:56:39'); -INSERT INTO `eb_template_message` VALUES (20, 1, 'OPENTM418033200', '订单发货通知', '{{first.DATA}}\r\n订单编号：{{keyword1.DATA}}\r\n发货时间：{{keyword2.DATA}}\r\n物流公司：{{keyword3.DATA}}\r\n快递单号：{{keyword4.DATA}}\r\n{{remark.DATA}}', 'ZEHnkuInxuElw4es24E7YZy4ePNDXriUxp1v9JD4Rdc', 1, '2020-06-16 10:44:44', '2021-12-16 10:43:35'); -INSERT INTO `eb_template_message` VALUES (23, 1, 'OPENTM407456411', '拼团成功通知', '{{first.DATA}}\n订单编号：{{keyword1.DATA}}\n团购商品：{{keyword2.DATA}}\n{{remark.DATA}}', 'ydStX4R9ds9A89XJhBQpF31OjZKzB-KscfjerySKzfs', 1, '2020-06-16 10:44:44', '2020-12-03 16:26:04'); -INSERT INTO `eb_template_message` VALUES (27, 1, 'OPENTM410292733', '砍价成功提醒', '{{first.DATA}}\n商品名称：{{keyword1.DATA}}\n底价：{{keyword2.DATA}}\n{{remark.DATA}}', 'GptgO4vGorI2GqKCO21vFozCZAFmrO8Dihan1x6Avxs', 1, '2020-06-16 10:44:44', '2020-12-03 16:27:27'); -INSERT INTO `eb_template_message` VALUES (34, 1, 'OPENTM418209505', '订单配送通知', '{{first.DATA}}\r\n商品明细：{{keyword1.DATA}}\r\n下单时间：{{keyword2.DATA}}\r\n配送地址：{{keyword3.DATA}}\r\n配送人：{{keyword4.DATA}}\r\n联系电话：{{keyword5.DATA}}\r\n{{remark.DATA}}', 'QluDjnRnr_Jwrp1M1oAcoqegdOrkWJXE0F_Ka-N6HSc', 1, '2020-12-03 16:03:24', '2021-12-16 10:49:25'); -INSERT INTO `eb_template_message` VALUES (35, 1, 'OPENTM400231951', '支付成功通知', '{{first.DATA}}\r\n付款金额：{{keyword1.DATA}}\r\n交易单号：{{keyword2.DATA}}\r\n{{remark.DATA}}', 'U8ZXihDXfbaxCfIns9yOIDeVl0pWSgEGg8coveDZ3eQ', 1, '2021-01-28 11:43:51', '2021-12-16 10:43:45'); -INSERT INTO `eb_template_message` VALUES (36, 1, 'OPENTM413386489', '订单收货通知', '{{first.DATA}}\r\n订单编号：{{keyword1.DATA}}\r\n订单状态：{{keyword2.DATA}}\r\n收货时间：{{keyword3.DATA}}\r\n商品详情：{{keyword4.DATA}}\r\n{{remark.DATA}}', 'RBa57JMpG3bJC6YEtOcG20uEyN3oqzSYAJnwlyOuFvI', 1, '2021-01-28 15:12:15', '2021-01-28 15:12:15'); -INSERT INTO `eb_template_message` VALUES (37, 1, 'OPENTM410119152', '退款进度通知', '{{first.DATA}}\r\n订单编号：{{keyword1.DATA}}\r\n订单金额：{{keyword2.DATA}}\r\n下单时间：{{keyword3.DATA}}\r\n{{remark.DATA}}', NULL, 0, '2021-01-29 11:43:06', '2021-01-29 11:43:06'); -INSERT INTO `eb_template_message` VALUES (52, 0, '1128', '订单配送通知', '商品信息\r\n{{thing8.DATA}}\r\n\r\n订单编号\r\n{{character_string1.DATA}}\r\n\r\n配送人\r\n{{name4.DATA}}\r\n\r\n配送员电话\r\n{{phone_number10.DATA}}', 'BC8ivYrxeZBU-Qj0vXEmV7solEAoRlknPN43x76RvUU', 1, '2021-03-05 16:19:50', '2021-12-16 11:03:27'); -INSERT INTO `eb_template_message` VALUES (53, 0, '755', '充值成功通知', '交易单号\r\n{{character_string1.DATA}}\r\n\r\n充值金额\r\n{{amount3.DATA}}\r\n\r\n充值时间\r\n{{date5.DATA}}\r\n\r\n赠送金额\r\n{{amount6.DATA}}\r\n\r\n备注\r\n{{thing7.DATA}}', 'SFXf-VAiNDFZODYdYWbZLXqu66Qw_S1oFX24PvAi9hA', 1, '2021-03-05 16:21:19', '2021-12-16 11:03:31'); -INSERT INTO `eb_template_message` VALUES (54, 0, '1481', '确认收货通知', '订单编号\r\n{{character_string6.DATA}}\r\n\r\n收货时间\r\n{{date5.DATA}}\r\n\r\n订单商品\r\n{{thing2.DATA}}', 'zYMNEBzv4xGzLVc3sTB0xaD-Ox8hyRT-19bC70-x6Q0', 1, '2021-03-05 16:22:03', '2021-12-16 11:03:35'); -INSERT INTO `eb_template_message` VALUES (55, 0, '3578', '订单支付成功通知', '订单编号\r\n{{character_string3.DATA}}\r\n\r\n订单金额\r\n{{amount9.DATA}}\r\n\r\n备注\r\n{{thing6.DATA}}', 'RW6Xq2r1c8N43TP_-KEUB-H7v91YfKB0aPixrqDVdU0', 1, '2021-03-05 16:22:48', '2021-12-16 11:03:40'); -INSERT INTO `eb_template_message` VALUES (56, 0, '2727', '砍价结果通知', '商品名称\r\n{{thing1.DATA}}\r\n\r\n底价\r\n{{amount2.DATA}}\r\n\r\n备注\r\n{{thing3.DATA}}', 'v4D89u14FZiRDt-6L-RnVb2ib_G7my12OoDy2vaGXP8', 1, '2021-03-05 16:23:26', '2021-12-16 11:03:44'); -INSERT INTO `eb_template_message` VALUES (57, 0, '3098', '拼团成功提醒', '订单号\r\n{{character_string10.DATA}}\r\n\r\n商品名称\r\n{{thing7.DATA}}\r\n\r\n备注\r\n{{thing9.DATA}}', 'Z8HTsteGXctLt7oNLL7rGE4b0ZsgxghGQmnJwtgv7Ow', 1, '2021-03-05 16:24:13', '2021-12-16 11:03:47'); -INSERT INTO `eb_template_message` VALUES (58, 0, '1128', '订单发货提醒', '订单编号\r\n{{character_string1.DATA}}\r\n\r\n快递公司\r\n{{name6.DATA}}\r\n\r\n快递单号\r\n{{character_string7.DATA}}\r\n\r\n温馨提示\r\n{{thing11.DATA}}', 'BC8ivYrxeZBU-Qj0vXEmV2dZEuzBU1K-34RXoKaOXZc', 1, '2021-03-05 16:25:05', '2021-12-16 11:03:52'); - --- ---------------------------- --- Table structure for eb_user --- ---------------------------- -DROP TABLE IF EXISTS `eb_user`; -CREATE TABLE `eb_user` ( - `uid` int(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '用户id', - `account` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户账号', - `pwd` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '用户密码', - `real_name` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '真实姓名', - `birthday` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '生日', - `card_id` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '身份证号码', - `mark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '用户备注', - `partner_id` int(11) NULL DEFAULT NULL COMMENT '合伙人id', - `group_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '用户分组id', - `tag_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '标签id', - `nickname` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '用户昵称', - `avatar` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '用户头像', - `phone` char(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '手机号码', - `add_ip` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '添加ip', - `last_ip` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '最后一次登录ip', - `now_money` decimal(16, 2) UNSIGNED NULL DEFAULT 0.00 COMMENT '用户余额', - `brokerage_price` decimal(8, 2) NULL DEFAULT 0.00 COMMENT '佣金金额', - `integral` int(11) NULL DEFAULT 0 COMMENT '用户剩余积分', - `experience` int(11) UNSIGNED NULL DEFAULT 0 COMMENT '用户剩余经验', - `sign_num` int(11) NULL DEFAULT 0 COMMENT '连续签到天数', - `status` tinyint(1) NULL DEFAULT 1 COMMENT '1为正常，0为禁止', - `level` tinyint(2) UNSIGNED NULL DEFAULT 0 COMMENT '等级', - `spread_uid` int(10) UNSIGNED NULL DEFAULT 0 COMMENT '推广员id', - `spread_time` timestamp(0) NULL DEFAULT NULL COMMENT '推广员关联时间', - `user_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户类型', - `is_promoter` tinyint(1) UNSIGNED NULL DEFAULT 0 COMMENT '是否为推广员', - `pay_count` int(11) UNSIGNED NULL DEFAULT 0 COMMENT '用户购买次数', - `spread_count` int(11) NULL DEFAULT 0 COMMENT '下级人数', - `addres` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '详细地址', - `adminid` int(11) UNSIGNED NULL DEFAULT 0 COMMENT '管理员编号 ', - `login_type` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户登陆类型，h5,wechat,routine', - `create_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - `last_login_time` timestamp(0) NULL DEFAULT NULL COMMENT '最后一次登录时间', - `clean_time` timestamp(0) NULL DEFAULT NULL COMMENT '清除时间', - `path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '/0/' COMMENT '推广等级记录', - `subscribe` tinyint(3) NULL DEFAULT 0 COMMENT '是否关注公众号', - `subscribe_time` timestamp(0) NULL DEFAULT NULL COMMENT '关注公众号时间', - `sex` tinyint(1) NULL DEFAULT 1 COMMENT '性别，0未知，1男，2女，3保密', - `country` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'CN' COMMENT '国家，中国CN，其他OTHER', - `promoter_time` timestamp(0) NULL DEFAULT NULL COMMENT '成为分销员时间', - PRIMARY KEY (`uid`) USING BTREE, - UNIQUE INDEX `account`(`account`) USING BTREE, - INDEX `spreaduid`(`spread_uid`) USING BTREE, - INDEX `level`(`level`) USING BTREE, - INDEX `status`(`status`) USING BTREE, - INDEX `is_promoter`(`is_promoter`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户表' ROW_FORMAT = Dynamic; - -INSERT INTO `eb_user` VALUES (1, '18292417675', 'f6mcpGQ8NEmwbab2TlkpUg==', '', '', '', '', NULL, '', '', '大粽子', 'crmebimage/public/maintain/2023/02/23/1c0fa967eb764d918f064744cc51dc70a6f2bj3sha.jpg', '18292417675', '', '', 0.00, 0.00, 0, 0, 0, 1, 0, 0, NULL, '', 0, 0, 0, '', 0, '', '2023-03-15 17:41:12', '2023-03-15 17:48:11', '2023-03-15 17:42:44', NULL, '/0/', 0, NULL, 1, 'CN', NULL); --- ---------------------------- --- Table structure for eb_user_address --- ---------------------------- -DROP TABLE IF EXISTS `eb_user_address`; -CREATE TABLE `eb_user_address` ( - `id` mediumint(8) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '用户地址id', - `uid` int(10) UNSIGNED NOT NULL COMMENT '用户id', - `real_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '收货人姓名', - `phone` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '收货人电话', - `province` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '收货人所在省', - `city` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '收货人所在市', - `city_id` int(11) NOT NULL DEFAULT 0 COMMENT '城市id', - `district` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '收货人所在区', - `detail` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '收货人详细地址', - `post_code` int(10) NOT NULL DEFAULT 0 COMMENT '邮编', - `longitude` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '经度', - `latitude` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '纬度', - `is_default` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否默认', - `is_del` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否删除', - `create_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE, - INDEX `uid`(`uid`) USING BTREE, - INDEX `is_default`(`is_default`) USING BTREE, - INDEX `is_del`(`is_del`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户地址表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for eb_user_bill --- ---------------------------- -DROP TABLE IF EXISTS `eb_user_bill`; -CREATE TABLE `eb_user_bill` ( - `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '用户账单id', - `uid` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '用户uid', - `link_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '关联id', - `pm` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '0 = 支出 1 = 获得', - `title` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '账单标题', - `category` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '明细种类', - `type` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '明细类型', - `number` decimal(8, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '明细数字', - `balance` decimal(16, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '剩余', - `mark` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注', - `status` tinyint(1) NOT NULL DEFAULT 1 COMMENT '0 = 带确定 1 = 有效 -1 = 无效', - `create_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间', - `update_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE, - INDEX `openid`(`uid`) USING BTREE, - INDEX `status`(`status`) USING BTREE, - INDEX `add_time`(`create_time`) USING BTREE, - INDEX `pm`(`pm`) USING BTREE, - INDEX `type`(`category`, `type`, `link_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户账单表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for eb_user_brokerage_record --- ---------------------------- -DROP TABLE IF EXISTS `eb_user_brokerage_record`; -CREATE TABLE `eb_user_brokerage_record` ( - `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '记录id', - `uid` int(10) NOT NULL DEFAULT 0 COMMENT '用户uid', - `link_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '关联id（orderNo,提现id）', - `link_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '关联类型（order,extract，yue）', - `type` int(1) NOT NULL DEFAULT 1 COMMENT '类型：1-增加，2-扣减（提现）', - `title` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '标题', - `price` decimal(8, 2) NOT NULL DEFAULT 0.00 COMMENT '金额', - `balance` decimal(16, 2) NOT NULL DEFAULT 0.00 COMMENT '剩余', - `mark` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注', - `status` tinyint(1) NOT NULL DEFAULT 1 COMMENT '状态：1-订单创建，2-冻结期，3-完成，4-失效（订单退款），5-提现申请', - `frozen_time` int(3) NOT NULL DEFAULT 0 COMMENT '冻结期时间（天）', - `thaw_time` bigint(14) NOT NULL DEFAULT 0 COMMENT '解冻时间', - `create_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间', - `update_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - `brokerage_level` int(2) NULL DEFAULT NULL COMMENT '分销等级', - PRIMARY KEY (`id`) USING BTREE, - INDEX `openid`(`uid`) USING BTREE, - INDEX `status`(`status`) USING BTREE, - INDEX `add_time`(`create_time`) USING BTREE, - INDEX `type`(`type`) USING BTREE, - INDEX `type_link`(`type`, `link_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户佣金记录表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for eb_user_experience_record --- ---------------------------- -DROP TABLE IF EXISTS `eb_user_experience_record`; -CREATE TABLE `eb_user_experience_record` ( - `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '记录id', - `uid` int(10) NOT NULL DEFAULT 0 COMMENT '用户uid', - `link_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '关联id-orderNo,(sign,system默认为0）', - `link_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'order' COMMENT '关联类型（order,sign,system）', - `type` int(1) NOT NULL DEFAULT 1 COMMENT '类型：1-增加，2-扣减', - `title` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '标题', - `experience` int(11) NOT NULL DEFAULT 0 COMMENT '经验', - `balance` int(11) NOT NULL DEFAULT 0 COMMENT '剩余', - `mark` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注', - `status` tinyint(1) NOT NULL DEFAULT 1 COMMENT '状态：1-成功（保留字段）', - `create_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间', - `update_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE, - INDEX `openid`(`uid`) USING BTREE, - INDEX `status`(`status`) USING BTREE, - INDEX `add_time`(`create_time`) USING BTREE, - INDEX `type`(`type`) USING BTREE, - INDEX `type_link`(`type`, `link_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户经验记录表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for eb_user_extract --- ---------------------------- -DROP TABLE IF EXISTS `eb_user_extract`; -CREATE TABLE `eb_user_extract` ( - `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT, - `uid` int(10) UNSIGNED NULL DEFAULT NULL, - `real_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称', - `extract_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'bank' COMMENT 'bank = 银行卡 alipay = 支付宝 weixin=微信', - `bank_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '银行卡', - `bank_address` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '开户地址', - `alipay_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '支付宝账号', - `extract_price` decimal(8, 2) UNSIGNED NULL DEFAULT 0.00 COMMENT '提现金额', - `mark` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `balance` decimal(8, 2) UNSIGNED NULL DEFAULT 0.00, - `fail_msg` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '无效原因', - `status` tinyint(2) NULL DEFAULT 0 COMMENT '-1 未通过 0 审核中 1 已提现', - `wechat` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '微信号', - `create_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - `fail_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '失败时间', - `bank_name` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '银行名称', - `qrcode_url` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '微信收款二维码', - PRIMARY KEY (`id`) USING BTREE, - INDEX `extract_type`(`extract_type`) USING BTREE, - INDEX `status`(`status`) USING BTREE, - INDEX `openid`(`uid`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户提现表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for eb_user_group --- ---------------------------- -DROP TABLE IF EXISTS `eb_user_group`; -CREATE TABLE `eb_user_group` ( - `id` smallint(5) UNSIGNED NOT NULL AUTO_INCREMENT, - `group_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户分组名称', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户分组表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of eb_user_group --- ---------------------------- -INSERT INTO `eb_user_group` VALUES (1, '初级会员'); -INSERT INTO `eb_user_group` VALUES (2, '中级会员'); -INSERT INTO `eb_user_group` VALUES (3, '高级会员'); - --- ---------------------------- --- Table structure for eb_user_integral_record --- ---------------------------- -DROP TABLE IF EXISTS `eb_user_integral_record`; -CREATE TABLE `eb_user_integral_record` ( - `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '记录id', - `uid` int(10) NOT NULL DEFAULT 0 COMMENT '用户uid', - `link_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '关联id-orderNo,(sign,system默认为0）', - `link_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'order' COMMENT '关联类型（order,sign,system）', - `type` int(1) NOT NULL DEFAULT 1 COMMENT '类型：1-增加，2-扣减', - `title` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '标题', - `integral` int(11) NOT NULL DEFAULT 0 COMMENT '积分', - `balance` int(11) NOT NULL DEFAULT 0 COMMENT '剩余', - `mark` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注', - `status` tinyint(1) NOT NULL DEFAULT 1 COMMENT '状态：1-订单创建，2-冻结期，3-完成，4-失效（订单退款）', - `frozen_time` int(3) NOT NULL DEFAULT 0 COMMENT '冻结期时间（天）', - `thaw_time` bigint(14) NOT NULL DEFAULT 0 COMMENT '解冻时间', - `create_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间', - `update_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE, - INDEX `openid`(`uid`) USING BTREE, - INDEX `status`(`status`) USING BTREE, - INDEX `add_time`(`create_time`) USING BTREE, - INDEX `type`(`type`) USING BTREE, - INDEX `type_link`(`type`, `link_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户积分记录表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for eb_user_level --- ---------------------------- -DROP TABLE IF EXISTS `eb_user_level`; -CREATE TABLE `eb_user_level` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `uid` int(11) NOT NULL DEFAULT 0 COMMENT '用户uid', - `level_id` int(11) NOT NULL DEFAULT 0 COMMENT '等级vip', - `grade` int(11) NOT NULL DEFAULT 0 COMMENT '会员等级', - `status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:禁止,1:正常', - `mark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注', - `remind` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否已通知', - `is_del` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除,0=未删除,1=删除', - `discount` int(4) NOT NULL DEFAULT 100 COMMENT '享受折扣', - `create_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - `expired_time` timestamp(0) NULL DEFAULT NULL COMMENT '过期时间', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `id`(`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户等级记录表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for eb_user_recharge --- ---------------------------- -DROP TABLE IF EXISTS `eb_user_recharge`; -CREATE TABLE `eb_user_recharge` ( - `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT, - `uid` int(10) NULL DEFAULT NULL COMMENT '充值用户UID', - `order_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '订单号', - `price` decimal(8, 2) NULL DEFAULT NULL COMMENT '充值金额', - `give_price` decimal(8, 2) NOT NULL DEFAULT 0.00 COMMENT '购买赠送金额', - `recharge_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '充值类型', - `paid` tinyint(1) NULL DEFAULT 0 COMMENT '是否充值', - `pay_time` timestamp(0) NULL DEFAULT NULL COMMENT '充值支付时间', - `create_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '充值时间', - `refund_price` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '退款金额', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `order_id`(`order_id`) USING BTREE, - INDEX `uid`(`uid`) USING BTREE, - INDEX `recharge_type`(`recharge_type`) USING BTREE, - INDEX `paid`(`paid`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户充值表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for eb_user_sign --- ---------------------------- -DROP TABLE IF EXISTS `eb_user_sign`; -CREATE TABLE `eb_user_sign` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `uid` int(11) NOT NULL DEFAULT 0 COMMENT '用户uid', - `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '签到说明', - `number` int(11) NOT NULL DEFAULT 0 COMMENT '获得', - `balance` int(11) NOT NULL DEFAULT 0 COMMENT '剩余', - `type` tinyint(1) NOT NULL DEFAULT 1 COMMENT '类型，1积分，2经验', - `create_day` date NOT NULL COMMENT '签到日期', - `create_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间', - PRIMARY KEY (`id`) USING BTREE, - INDEX `uid`(`uid`, `type`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '签到记录表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for eb_user_tag --- ---------------------------- -DROP TABLE IF EXISTS `eb_user_tag`; -CREATE TABLE `eb_user_tag` ( - `id` smallint(5) UNSIGNED NOT NULL AUTO_INCREMENT, - `name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '标签管理' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of eb_user_tag --- ---------------------------- -INSERT INTO `eb_user_tag` VALUES (1, '中级c'); -INSERT INTO `eb_user_tag` VALUES (2, '高级'); -INSERT INTO `eb_user_tag` VALUES (3, '黄金'); -INSERT INTO `eb_user_tag` VALUES (4, '超级'); -INSERT INTO `eb_user_tag` VALUES (5, '钻石'); - --- ---------------------------- --- Table structure for eb_user_token --- ---------------------------- -DROP TABLE IF EXISTS `eb_user_token`; -CREATE TABLE `eb_user_token` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `uid` int(10) UNSIGNED NOT NULL COMMENT '用户 id', - `token` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'token', - `type` tinyint(1) NULL DEFAULT 1 COMMENT '类型，1 公众号， 2 小程序, 3 unionid, 5AppIos,6AppAndroid,7ios', - `create_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `expires_time` datetime(0) NULL DEFAULT NULL COMMENT '到期时间', - `login_ip` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '登录ip', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `type+token`(`type`, `token`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for eb_user_visit_record --- ---------------------------- -DROP TABLE IF EXISTS `eb_user_visit_record`; -CREATE TABLE `eb_user_visit_record` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `date` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '日期', - `uid` int(11) NULL DEFAULT NULL COMMENT '用户uid', - `visit_type` int(2) NULL DEFAULT NULL COMMENT '访问类型', - PRIMARY KEY (`id`) USING BTREE, - INDEX `date`(`date`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户访问记录表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for eb_wechat_callback --- ---------------------------- -DROP TABLE IF EXISTS `eb_wechat_callback`; -CREATE TABLE `eb_wechat_callback` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键ID', - `to_user_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商家小程序名称', - `from_user_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '微信团队的 OpenID(固定值)', - `create_time` bigint(50) UNSIGNED NULL DEFAULT NULL COMMENT '事件时间,Unix时间戳', - `msg_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '消息类型', - `event` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '事件类型', - `content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '内容', - `add_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '微信回调表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for eb_wechat_exceptions --- ---------------------------- -DROP TABLE IF EXISTS `eb_wechat_exceptions`; -CREATE TABLE `eb_wechat_exceptions` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'id', - `errcode` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '错误码', - `errmsg` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '错误信息', - `data` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '回复数据', - `remark` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '备注', - `create_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '微信异常表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for eb_wechat_pay_info --- ---------------------------- -DROP TABLE IF EXISTS `eb_wechat_pay_info`; -CREATE TABLE `eb_wechat_pay_info` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `app_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '公众号唯一标识', - `mch_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商户号', - `device_info` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '设备号,PC网页或公众号内支付可以传-WEB', - `open_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户的唯一标识', - `nonce_str` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '随机字符串', - `sign` varchar(70) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '签名', - `sign_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'MD5' COMMENT '签名类型，默认为MD5，支持HMAC-SHA256和MD5', - `body` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品描述', - `detail` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '商品详细描述，对于使用单品优惠的商户，该字段必须按照规范上传', - `attach` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附加数据，在查询API和支付通知中原样返回，可作为自定义参数使用', - `out_trade_no` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商户订单号,要求32个字符内', - `fee_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标价币种：CNY：人民币 GBP：英镑 HKD：港币 USD：美元 JPY：日元 CAD：加拿大元 AUD：澳大利亚元 EUR：欧元 NZD：新西兰元 KRW：韩元 THB：泰铢', - `total_fee` int(11) NULL DEFAULT NULL COMMENT '标价金额', - `spbill_create_ip` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '终端IP', - `time_start` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '交易起始时间', - `time_expire` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '交易结束时间', - `notify_url` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '通知地址', - `trade_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '交易类型,取值为：JSAPI，NATIVE，APP等', - `product_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品ID', - `scene_info` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '场景信息', - `err_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '错误代码', - `prepay_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '预支付交易会话标识', - `code_url` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '二维码链接', - `is_subscribe` varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '是否关注公众账号', - `trade_state` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '交易状态', - `bank_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '付款银行', - `cash_fee` int(11) NULL DEFAULT NULL COMMENT '现金支付金额', - `coupon_fee` int(11) NULL DEFAULT NULL COMMENT '代金券金额', - `transaction_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '微信支付订单号', - `time_end` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '支付完成时间', - `trade_state_desc` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '交易状态描述', - PRIMARY KEY (`id`) USING BTREE, - INDEX `out_trade_no`(`out_trade_no`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '微信订单表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for eb_wechat_reply --- ---------------------------- -DROP TABLE IF EXISTS `eb_wechat_reply`; -CREATE TABLE `eb_wechat_reply` ( - `id` mediumint(8) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '微信关键字回复id', - `keywords` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '关键字', - `type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '回复类型', - `data` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '回复数据', - `status` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '回复状态 0=不可用 1 =可用', - `create_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `key`(`keywords`) USING BTREE, - INDEX `type`(`type`) USING BTREE, - INDEX `status`(`status`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '微信关键字回复表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of eb_wechat_reply --- ---------------------------- -INSERT INTO `eb_wechat_reply` VALUES (1, 'default', 'text', '{\"content\":\" \",\"mediaId\":\"\",\"srcUrl\":\"\",\"articleData\":{}}', 1, '2020-12-09 12:32:26', '2021-02-24 18:22:19'); - -SET FOREIGN_KEY_CHECKS = 1;