需求

mall-server-sync-api/.gitignore

@@ -0,0 +1,38 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+*.log
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
+/src/main/java/com/gree/mall/manager/plus/
+/src/test/
+.DS_Store
+logs/

mall-server-sync-api/mvnw.cmd

@@ -0,0 +1,182 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    https://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Found %WRAPPER_JAR%
+    )
+) else (
+    if not "%MVNW_REPOURL%" == "" (
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    )
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
+        echo Downloading from: %DOWNLOAD_URL%
+    )
+
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Finished downloading %WRAPPER_JAR%
+    )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%

mall-server-sync-api/pom.xml

@@ -0,0 +1,514 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.3.3.RELEASE</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+    <groupId>com.gree.manager</groupId>
+    <artifactId>zfire_jsm_mall_sync_manager</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>zfire_jsm_mall_sync_manager</name>
+    <description>Demo project for Spring Boot</description>
+
+    <properties>
+        <java.version>1.8</java.version>
+    </properties>
+
+    <dependencies>
+        <!--<dependency>-->
+        <!--<groupId>org.springframework.boot</groupId>-->
+        <!--<artifactId>spring-boot-starter-security</artifactId>-->
+        <!--</dependency>-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.integration</groupId>
+            <artifactId>spring-integration-redis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+            <version>1.21</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <scope>runtime</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!--<dependency>-->
+        <!--<groupId>org.mongodb</groupId>-->
+        <!--<artifactId>mongo-java-driver</artifactId>-->
+        <!--<version>3.2.2</version>-->
+        <!--</dependency>-->
+
+        <!--mybatis-->
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>2.1.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>mybatis</artifactId>
+                    <groupId>org.mybatis</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.4.2</version>
+            <!--<exclusions>-->
+                <!--<exclusion>-->
+                    <!--<artifactId>mybatis</artifactId>-->
+                    <!--<groupId>org.mybatis</groupId>-->
+                <!--</exclusion>-->
+            <!--</exclusions>-->
+        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>com.baomidou</groupId>-->
+            <!--<artifactId>mybatis-plus-generator</artifactId>-->
+            <!--<version>3.2.0</version>-->
+        <!--</dependency>-->
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity-engine-core</artifactId>
+            <version>2.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.8</version>
+            <scope>provided</scope>
+        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.mybatis.spring.boot</groupId>-->
+            <!--<artifactId>mybatis-spring-boot-autoconfigure</artifactId>-->
+            <!--<version>2.1.0</version>-->
+        <!--</dependency>-->
+
+
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>core</artifactId>
+            <version>3.3.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>javase</artifactId>
+            <version>3.3.2</version>
+        </dependency>
+
+        <!--mysql驱动-->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.17</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+            <version>1.1.21</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+            <version>2.8.0</version>
+        </dependency>
+        <!--fastjson-->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.59</version>
+        </dependency>
+        <!--okhttp3-->
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.0.1</version>
+        </dependency>
+        <!--swagger接口文档框架-->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>swagger-bootstrap-ui</artifactId>
+            <version>1.9.4</version>
+        </dependency>
+        <!-- 支持 @ConfigurationProperties 注解 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <!-- fix swagger input报错-->
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.5.22</version>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>1.5.22</version>
+        </dependency>
+        <!--更换undertow容器-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-undertow</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15on</artifactId>
+            <version>1.60</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.coobird</groupId>
+            <artifactId>thumbnailator</artifactId>
+            <version>0.4.8</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <!--es -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>HdrHistogram</artifactId>
+                    <groupId>org.hdrhistogram</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>httpclient</artifactId>
+                    <groupId>org.apache.httpcomponents</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel</artifactId>
+            <version>3.3.1</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>asm</artifactId>
+                    <groupId>org.ow2.asm</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>eu.bitwalker</groupId>
+            <artifactId>UserAgentUtils</artifactId>
+            <version>1.21</version>
+        </dependency>
+
+        <!-- 图片验证码 -->
+        <dependency>
+            <groupId>com.github.penggle</groupId>
+            <artifactId>kaptcha</artifactId>
+            <version>2.3.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>4.1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml-schemas</artifactId>
+            <version>4.1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>4.1.2</version>
+        </dependency>
+        <!---excel导入-->
+        <dependency>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-base</artifactId>
+            <version>3.0.3</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-web</artifactId>
+            <version>3.0.3</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-annotation</artifactId>
+            <version>3.0.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+            <version>0.6.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>3.8.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-mock</artifactId>
+            <version>2.0.8</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpmime</artifactId>
+            <version>4.5</version>
+        </dependency>
+
+        <!--模板组件-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+            <version>2.2.6.RELEASE</version>
+        </dependency>
+        <!--模板组件END-->
+
+        <!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.9</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-core</artifactId>
+            <version>4.0.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <version>2.1.0.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+            <version>2.1.0.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+            <version>2.1.3.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>net.logstash.logback</groupId>
+            <artifactId>logstash-logback-encoder</artifactId>
+            <version>6.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.wxpay</groupId>
+            <artifactId>wxpay-sdk</artifactId>
+            <version>0.0.3</version>
+        </dependency>
+
+        <!--企业微信api-->
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-cp</artifactId>
+            <version>4.5.0</version>
+        </dependency>
+        <!-- 微信支付 -->
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-pay</artifactId>
+            <version>4.5.0</version>
+        </dependency>
+        <!-- 微信小程序 -->
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-miniapp</artifactId>
+            <version>4.5.0</version>
+        </dependency>
+        <!--公众号-->
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-mp</artifactId>
+            <version>4.5.0</version>
+        </dependency>
+        <!-- hutool工具 -->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.0.M4</version>
+        </dependency>
+        <!--forset-->
+        <dependency>
+            <groupId>com.dtflys.forest</groupId>
+            <artifactId>forest-spring-boot-starter</artifactId>
+            <version>1.5.19</version>
+        </dependency>
+
+        <!--企业微信会话存档-->
+        <!--<dependency>-->
+            <!--<groupId>org.bouncycastle</groupId>-->
+            <!--<artifactId>bcpg-jdk16</artifactId>-->
+            <!--<version>1.46</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.bouncycastle</groupId>-->
+            <!--<artifactId>bcpkix-jdk15on</artifactId>-->
+            <!--<version>1.64</version>-->
+        <!--</dependency>-->
+
+        <!-- 校验 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+
+        <!-- 法大大 需要开启nexus-->
+<!--        <dependency>-->
+<!--            <groupId>com.fadada.api</groupId>-->
+<!--            <artifactId>fasc-openapi-java-sdk</artifactId>-->
+<!--            <version>5.5.4.1011</version>-->
+<!--        </dependency>-->
+        <dependency>
+            <groupId>com.fadada.api</groupId>
+            <artifactId>open-api</artifactId>
+            <version>1.8.11.RELEASE</version>
+            <scope>system</scope>
+            <systemPath>${pom.basedir}/src/main/resources/libs/open-api-1.8.11.RELEASE.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.mail</groupId>
+            <artifactId>javax.mail</artifactId>
+            <version>1.6.2</version>
+            <scope>compile</scope>
+        </dependency>
+
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <!-- 本地开发环境 -->
+            <id>dev</id>
+            <properties>
+                <profiles.active>dev</profiles.active>
+            </properties>
+            <activation>
+                <!-- 设置默认激活这个配置 -->
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+        <profile>
+            <!-- 测试环境 -->
+            <id>test</id>
+            <properties>
+                <profiles.active>test</profiles.active>
+            </properties>
+        </profile>
+        <profile>
+            <!-- 正式环境 -->
+            <id>prd</id>
+            <properties>
+                <profiles.active>prd</profiles.active>
+            </properties>
+        </profile>
+    </profiles>
+
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <includeSystemScope>true</includeSystemScope>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>com.plus.plugin</groupId>
+                <artifactId>plus-maven-plugin</artifactId>
+                <version>5.0.0-SNAPSHOT</version>
+                <configuration>
+                    <configPath>src/main/resources/generator-${profiles.active}.properties</configPath>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
+    <repositories>
+        <repository>
+            <id>nexus</id>
+            <name>Releases</name>
+            <url>http://121.43.111.127:8081/repository/maven-public</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <!--snapshots默认是关闭的,需要开启  -->
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>nexus</id>
+            <name>Releases</name>
+            <url>http://121.43.111.127:8081/repository/maven-public</url>
+        </pluginRepository>
+    </pluginRepositories>
+
+</project>

mall-server-sync-api/src/main/java/com/gree/mall/manager/annotation/ZfireField.java

@@ -0,0 +1,25 @@
+package com.gree.mall.manager.annotation;
+
+import java.lang.annotation.*;
+
+@Target({ElementType.FIELD,ElementType.TYPE})
+@Retention(value = RetentionPolicy.RUNTIME)
+@Documented
+public @interface ZfireField {
+
+    String tbName() default "";//表简称或全称
+    String colName() default "";//表字段
+    String type() default "input";//input=输入框 select=下拉框
+    String frontCode() default "";//前端特定用
+    String fixed() default ""; //left固定左侧，right固定右侧，默认不固定
+    boolean pk() default false; //是否为列表主键id
+    boolean isShow() default true;
+    boolean isTotal() default false;//汇总
+    boolean hide() default false;
+    boolean isQuery() default true;//是否支持查询
+    boolean multiple() default false;//是否支持多选
+    int sortNum() default 999;
+
+    boolean ignoreSelect() default false;//是否忽略查询该字段
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/annotation/ZfireList.java

@@ -0,0 +1,10 @@
+package com.gree.mall.manager.annotation;
+
+import java.lang.annotation.*;
+
+@Target({ElementType.METHOD})
+@Retention(value = RetentionPolicy.RUNTIME)
+@Documented
+public @interface ZfireList {
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/CommonParam.java

@@ -0,0 +1,20 @@
+package com.gree.mall.manager.bean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class CommonParam {
+
+    @ApiModelProperty("appId")
+    private String appId;
+    @ApiModelProperty("appKey")
+    private String appKey;
+    @ApiModelProperty("json字符串")
+    private String json;
+    @ApiModelProperty("appPath")
+    private String appPath;
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/CommonTemplateVO.java

@@ -0,0 +1,47 @@
+package com.gree.mall.manager.bean;
+
+
+import com.gree.mall.manager.annotation.ZfireField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@ZfireField(tbName = "a")
+@Data
+public class CommonTemplateVO   {
+
+    @ZfireField(tbName = "a",hide = true)
+    @ApiModelProperty(value = "公共模板id")
+    private String commonTemplateId;
+
+    @ZfireField(tbName = "a",hide = true)
+    @ApiModelProperty(value = "内容")
+    private String content;
+
+    @ApiModelProperty(value = "模板名称")
+    private String name;
+
+    @ZfireField(tbName = "a",hide = true)
+    @ApiModelProperty(value = "类型")
+    private Integer type;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ZfireField(tbName = "a",hide = true)
+    @ApiModelProperty(value = "企业微信id")
+    private String companyWechatId;
+
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyName;
+
+    @ZfireField(tbName = "a",hide = true)
+    @ApiModelProperty(value = "水印logo")
+    private String logo;
+
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/ExcelExamData.java

@@ -0,0 +1,32 @@
+package com.gree.mall.manager.bean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ExcelExamData{
+    /**
+     * 表头
+     */
+    private List<ExcelTitle> excelTitleBean;
+    /**
+     * 数据
+     */
+    private List<List<Object>> rows;
+    /**
+     * 页签名称
+     */
+    private String name;
+
+
+    @Data
+    public static class ExcelTitle{
+        private String title;
+        private List<String> childTitle;
+        private Short colorIndex;
+    }
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/Freight/FreightTemplateBean.java

@@ -0,0 +1,19 @@
+package com.gree.mall.manager.bean.Freight;
+
+import com.gree.mall.manager.plus.entity.FreightTemplate;
+import com.gree.mall.manager.plus.entity.FreightTemplateDetail;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class FreightTemplateBean extends FreightTemplate {
+
+    @ApiModelProperty("运费明细")
+    private List<FreightTemplateDetail> freightTemplateDetails;
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/Freight/RegionTreeBean.java

@@ -0,0 +1,18 @@
+package com.gree.mall.manager.bean.Freight;
+
+import com.gree.mall.manager.plus.entity.Region;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@EqualsAndHashCode(callSuper = true)
+@ApiModel
+@Data
+public class RegionTreeBean extends Region{
+
+    private String parentName;
+
+    public List<RegionTreeBean> child;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/FreightTemplateVO.java

@@ -0,0 +1,42 @@
+package com.gree.mall.manager.bean;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.gree.mall.manager.annotation.ZfireField;
+import com.gree.mall.manager.enums.FreightStatusEnum;
+import com.gree.mall.manager.enums.OrderStatusEnum;
+import com.gree.mall.manager.enums.StatusEnum;
+import com.gree.mall.manager.plus.entity.FreightTemplate;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ZfireField(tbName = "a")
+public class FreightTemplateVO {
+
+    @ZfireField(hide = true)
+    @TableId(value = "freight_template_id", type = IdType.ID_WORKER_STR)
+    private String freightTemplateId;
+
+    @ApiModelProperty(value = "模板名称")
+    private String name;
+
+    @ApiModelProperty(value = "状态")
+    private StatusEnum status;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "企业微信id")
+    private String companyWechatId;
+
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyName;
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/ItfTblCollectionChargeBean.java

@@ -0,0 +1,17 @@
+package com.gree.mall.manager.bean;
+
+
+import com.gree.mall.manager.plus.entity.ItfTblCollectionCharge;
+import com.gree.mall.manager.plus.entity.ItfTblCollectionChargeDetail;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class ItfTblCollectionChargeBean extends ItfTblCollectionCharge {
+
+    @ApiModelProperty(value = "同步任务生成时间")
+    private List<ItfTblCollectionChargeDetail> collectionChargeDetails;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/ItfTblWorkOrderCollection0Bean.java

@@ -0,0 +1,18 @@
+package com.gree.mall.manager.bean;
+
+import com.gree.mall.manager.plus.entity.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ItfTblWorkOrderCollection0Bean extends ItfTblWorkOrderCollection {
+
+
+    private List<ItfTblCollectionRepair> collectionRepairList;
+    private List<ItfTblCollectionRepairPart> collectionRepairPartList;
+    private List<ItfTblCollectionRepairProject> collectionRepairProjectList;
+    private List<ItfTblCollectionRepairSymptomReason> collectionRepairSymptomReasonList;
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/OutAppDefaultReq.java

@@ -0,0 +1,32 @@
+package com.gree.mall.manager.bean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel
+public class OutAppDefaultReq {
+    @ApiModelProperty("接入ID")
+    private String appid;
+    @ApiModelProperty("时间戳")
+    private String timestamp;
+    @ApiModelProperty("签名类型")
+    private String signType;
+    @ApiModelProperty("签名")
+    private String sign;
+    @ApiModelProperty("版本")
+    private String version;
+    @ApiModelProperty("接口名称")
+    private String apiPath;
+    @ApiModelProperty("业务参数")
+    private String bizContent;
+    @ApiModelProperty("六位随机字符")
+    private String rand;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/StorageVO.java

@@ -0,0 +1,61 @@
+package com.gree.mall.manager.bean;
+
+import com.gree.mall.manager.annotation.ZfireField;
+import com.gree.mall.manager.enums.IsEnum;
+import com.gree.mall.manager.enums.StatusEnum;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@ZfireField(tbName = "a")
+@Data
+public class StorageVO   {
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "仓储id")
+    private String storageId;
+
+    @ApiModelProperty(value = "网点编号")
+    private String websitId;
+
+    @ApiModelProperty(value = "网点名称")
+    private String websitName;
+
+    @ApiModelProperty(value = "仓储属性")
+    private String type;
+
+    @ApiModelProperty(value = "状态")
+    private StatusEnum status;
+
+    @ApiModelProperty(value = "仓储名称")
+    private String storageName;
+
+    @ApiModelProperty(value = "仓储地址")
+    private String storageAddress;
+
+    @ApiModelProperty(value = "仓储电话")
+    private String storageMobile;
+
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "企业微信id")
+    private String companyWechatId;
+
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyName;
+
+    @ApiModelProperty(value = "是否默认仓")
+    private IsEnum isDefault;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/SyncOrderDto.java

@@ -0,0 +1,25 @@
+package com.gree.mall.manager.bean;
+
+import com.gree.mall.manager.plus.entity.PgOrderBase;
+import com.gree.mall.manager.plus.entity.PgOrderOperatorLog;
+import com.gree.mall.manager.plus.entity.PgOrderProduct;
+import com.gree.mall.manager.plus.entity.PgOrderWorker;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SyncOrderDto   {
+
+    @ApiModelProperty("工单列表")
+    private List<PgOrderBase> pgOrderBases;
+
+    @ApiModelProperty("师傅id(第一个为大工)")
+    private List<PgOrderWorker> orderWorkers;
+    @ApiModelProperty("产品信息")
+    private List<PgOrderProduct> orderProducts;
+
+    @ApiModelProperty("操作明细")
+    private List<PgOrderOperatorLog> pgOrderOperatorLogs;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/WorkOrderRelationBean.java

@@ -0,0 +1,50 @@
+package com.gree.mall.manager.bean;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.gree.mall.manager.plus.entity.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class WorkOrderRelationBean  extends ItfTblWorkOrder{
+
+
+    private List<ItfTblWorkOrderFeedback> feedbackRespList;
+
+    private List<ItfTblCollectionChargeBean> collectionChargeList;
+    List<ItfTblWorkOrderDetail> tblWorkOrderDetailList ;
+
+
+    private List<ItfTblOldProductOrderDetail> tblOldProductOrderDetailList;
+    private List<ItfTblWorkOrderAddComplain> tblWorkOrderAddComplainList;
+    private List<ItfTblWorkOrderAppoint> tblWorkOrderAppointList;
+    private List<ItfTblWorkOrderCancel> tblWorkOrderCancelList;
+    private List<ItfTblWorkOrderComplainFeedback> tblWorkOrderComplainFeedbackList;
+    private List<ItfTblWorkOrderComplain> tblWorkOrderComplainList;
+    private List<ItfTblWorkOrderCompleteInfo> tblWorkOrderCompleteInfoList;
+    private List<ItfTblWorkOrderConsult> tblWorkOrderConsultList;
+    private List<ItfTblWorkOrderDetailBarcode> tblWorkOrderDetailBarcodeList;
+    private List<ItfTblWorkOrderDetailRelocation> tblWorkOrderDetailRelocationList;
+    private List<ItfTblWorkOrderDispatchOutlets> tblWorkOrderDispatchOutletsList;
+    private List<ItfTblWorkOrderEngineer> tblWorkOrderEngineerList;
+    private List<ItfTblWorkOrderEvaluation> tblWorkOrderEvaluationList;
+    private List<ItfTblWorkOrderExt> tblWorkOrderExtList;
+    private List<ItfTblWorkOrderIndicators> tblWorkOrderIndicatorsList;
+    private List<ItfTblWorkOrderSign> tblWorkOrderSignList;
+    private List<ItfTblWorkOrderTag> tblWorkOrderTagList;
+    private List<ItfTblWorkOrderCharge> workOrderChargeList;
+    private List<ItfTblWorkOrderCollectionComplain> workOrderCollectionComplainList;
+
+    private List<ItfTblWorkOrderCollection0Bean> workOrderCollectionList;
+
+    private List<ItfTblWorkOrderDispatchEngineer> tblWorkOrderDispatchEngineerList;
+    private List<ItfTblWorkOrderStatus> tblWorkOrderStatusList;
+
+
+
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/WorkOrderSearchReq.java

@@ -0,0 +1,13 @@
+package com.gree.mall.manager.bean;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class WorkOrderSearchReq {
+
+    @ApiModelProperty(value = "工单号")
+    private List<String> workOrderIds;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/activity/CustomSecSpecBean.java

@@ -0,0 +1,50 @@
+package com.gree.mall.manager.bean.activity;
+
+import com.gree.mall.manager.plus.entity.SecKillStage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@ApiModel
+@Data
+public class CustomSecSpecBean {
+
+    @ApiModelProperty("秒杀商品规格id")
+    private String secKillSpecId;
+
+    @ApiModelProperty("商品名称")
+    private String goodsName;
+
+    @ApiModelProperty("秒杀图片链接")
+    private String imgUrl;
+
+    @ApiModelProperty("划线价")
+    private String orgPrice;
+
+    @ApiModelProperty("已售数量")
+    private Long soldNum;
+
+    @ApiModelProperty("秒杀价格")
+    private BigDecimal price;
+
+    @ApiModelProperty("分账金额")
+    private BigDecimal amount;
+
+    @ApiModelProperty("秒杀开始时间")
+    private Date startTime;
+
+    @ApiModelProperty("秒杀结束时间")
+    private Date endTime;
+
+    @ApiModelProperty(value = "分销比例")
+    private Double sharePercent;
+
+    @ApiModelProperty("秒杀状态,0全部,1未开始,2进行中,3已结束,4已关闭")
+    private Integer status;
+
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/activity/CustomSpecBean.java

@@ -0,0 +1,50 @@
+package com.gree.mall.manager.bean.activity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@ApiModel
+@Data
+public class CustomSpecBean {
+
+    @ApiModelProperty("商品id")
+    private String goodsId;
+
+    @ApiModelProperty("商品规格Id")
+    private String goodsSpecId;
+
+    @ApiModelProperty("商品名称")
+    private String goodsName;
+
+    @ApiModelProperty("商品图片")
+    private String imgUrl;
+
+    @ApiModelProperty("商品价格")
+    private String goodsPrice;
+
+    @ApiModelProperty("商品库存")
+    private String stockNum;
+
+    @ApiModelProperty("商品规格名")
+    private String name;
+
+    @ApiModelProperty("商品规格值")
+    private String specValue;
+
+    @ApiModelProperty(value = "分销比例")
+    private Double sharePercent;
+
+    @ApiModelProperty("分账金额")
+    private BigDecimal amount;
+
+    @ApiModelProperty("划线价")
+    private String orgPrice;
+
+    @ApiModelProperty("已售数量")
+    private Long salesVolume;
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/activity/PromotionActivityBatchBean.java

@@ -0,0 +1,22 @@
+package com.gree.mall.manager.bean.activity;
+
+import com.gree.mall.manager.enums.promotion.PromotionStatusEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class PromotionActivityBatchBean {
+
+    @ApiModelProperty(value = "活动单id")
+    private List<String> ids;
+
+    @ApiModelProperty(value = "最新跟进结果")
+    private PromotionStatusEnum status = PromotionStatusEnum.ING;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/activity/PromotionActivityVO.java

@@ -0,0 +1,87 @@
+package com.gree.mall.manager.bean.activity;
+
+import com.gree.mall.manager.annotation.ZfireField;
+import com.gree.mall.manager.enums.promotion.PromotionStatusEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel
+@ZfireField(tbName = "a")
+public class PromotionActivityVO {
+
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "商户编号")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "所属商户")
+//    private String companyWechatName;
+
+    @ApiModelProperty(value = "所属网点")
+    private String customWebsitName;
+
+    @ApiModelProperty(value = "活动提交单号")
+    private String promotionActivityId;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "设置活动id")
+    private String promotionQuestionnaireId;
+
+    @ZfireField(tbName = "b")
+    @ApiModelProperty(value = "活动名称")
+    private String name;
+
+    @ApiModelProperty(value = "状态")
+    private PromotionStatusEnum status;
+
+    @ZfireField(type = "date", tbName = "b")
+    @ApiModelProperty(value = "活动开始日期")
+    private Date startTime;
+
+    @ZfireField(type = "date", tbName = "b")
+    @ApiModelProperty(value = "活动结束日期")
+    private Date endTime;
+
+    @ApiModelProperty(value = "客户名称")
+    private String userName;
+
+    @ApiModelProperty(value = "联系人")
+    private String linkName;
+
+    @ApiModelProperty(value = "客户电话")
+    private String userMobile;
+
+    @ApiModelProperty(value = "客户电话2")
+    private String userMobile2;
+
+    @ApiModelProperty(value = "客户地址")
+    private String userAddress;
+
+    @ApiModelProperty(value = "提交人")
+    private String createBy;
+
+    @ApiModelProperty(value = "提交时间")
+    private Date createTime;
+
+    @ZfireField(tbName = "b", hide = true, colName = "create_by", ignoreSelect = true)
+    @ApiModelProperty(value = "创建人")
+    private String orderCreateBy;
+
+    @ZfireField(tbName = "b", hide = true, colName = "create_mobile", ignoreSelect = true)
+    @ApiModelProperty(value = "创建人电话")
+    private String orderCreateMobile;
+
+    @ZfireField(tbName = "b", hide = true, colName = "create_time", ignoreSelect = true)
+    @ApiModelProperty(value = "创建时间")
+    private Date orderCreateTime;
+
+    @ApiModelProperty(value = "最新跟进人")
+    private String updateBy;
+
+    @ApiModelProperty(value = "最新跟进时间")
+    private Date updateTime;
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/activity/PromotionApplyBean.java

@@ -0,0 +1,15 @@
+package com.gree.mall.manager.bean.activity;
+
+import com.gree.mall.manager.plus.entity.PromotionApply;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class PromotionApplyBean extends PromotionApply {
+
+    @ApiModelProperty("网点名称")
+    private String adminWebsitName;
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/activity/PromotionGoods.java

@@ -0,0 +1,25 @@
+package com.gree.mall.manager.bean.activity;
+
+import com.gree.mall.manager.plus.entity.PromotionGroupSpec;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class PromotionGoods {
+
+    @ApiModelProperty("商品id")
+    private String goodsId;
+    @ApiModelProperty("商品名称")
+    private String goodsName;
+    @ApiModelProperty("商品图")
+    private String goodsImgSrc;
+    @ApiModelProperty("活动规格列表")
+    private List<PromotionGroupSpec> specs;
+    @ApiModelProperty("排序")
+    private Integer sortNum;
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/activity/PromotionGroupBean.java

@@ -0,0 +1,22 @@
+package com.gree.mall.manager.bean.activity;
+
+import com.gree.mall.manager.plus.entity.PromotionGroup;
+import com.gree.mall.manager.plus.entity.PromotionGroupSpec;
+import com.gree.mall.manager.plus.entity.PromotionGroupUser;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class PromotionGroupBean extends PromotionGroup {
+
+    @ApiModelProperty("商品详情")
+    private List<PromotionGoods> goods;
+
+    @ApiModelProperty("团员id")
+    private List<PromotionGroupUser> promotionGroupUsers;
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/activity/PromotionGroupDetail.java

@@ -0,0 +1,38 @@
+package com.gree.mall.manager.bean.activity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel
+@Data
+public class PromotionGroupDetail {
+
+    @ApiModelProperty("用户id")
+    private String userId;
+    @ApiModelProperty("团长名称")
+    private String nickName;
+    @ApiModelProperty("所属网点")
+    private String websitName;
+    @ApiModelProperty("职务")
+    private String position;
+    @ApiModelProperty("手机号码")
+    private String phone;
+    @ApiModelProperty("首次分享时间")
+    private Date firstTime;
+    @ApiModelProperty("分享次数")
+    private Integer shareNum;
+    @ApiModelProperty("订单数量")
+    private Integer orderNum;
+    @ApiModelProperty("订单台数")
+    private Integer goodsNum;
+    @ApiModelProperty("成交金额")
+    private BigDecimal orderTotalAmount;
+    @ApiModelProperty("团长分佣总额")
+    private BigDecimal shareTotalAmount;
+    @ApiModelProperty("团长已分佣金额")
+    private BigDecimal settledAmount;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/activity/PromotionGroupList.java

@@ -0,0 +1,26 @@
+package com.gree.mall.manager.bean.activity;
+
+import com.gree.mall.manager.plus.entity.PromotionGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@ApiModel
+@Data
+public class PromotionGroupList extends PromotionGroup {
+
+    @ApiModelProperty("参数产品数量")
+    private Integer goodsNum;
+    @ApiModelProperty("订单数量")
+    private Integer orderNum;
+    @ApiModelProperty("订单台数")
+    private Integer orderDetailNum;
+    @ApiModelProperty("订单总金额")
+    private BigDecimal orderTotalAmount;
+    @ApiModelProperty("团长分佣总额")
+    private BigDecimal shareTotalAmount;
+
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/activity/PromotionGroupSpecBean.java

@@ -0,0 +1,17 @@
+package com.gree.mall.manager.bean.activity;
+
+import com.gree.mall.manager.plus.entity.PromotionGroupSpec;
+import com.gree.mall.manager.plus.entity.PromotionGroupSpecUser;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class PromotionGroupSpecBean extends PromotionGroupSpec {
+
+    @ApiModelProperty("团长集合")
+    private List<PromotionGroupSpecUser> promotionGroupSpecUsers;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/activity/SecKillActivityBean.java

@@ -0,0 +1,22 @@
+package com.gree.mall.manager.bean.activity;
+
+import com.gree.mall.manager.plus.entity.CommonFile;
+import com.gree.mall.manager.plus.entity.SecKillActivity;
+import com.gree.mall.manager.plus.entity.SecKillActivitySpec;
+import com.gree.mall.manager.plus.entity.SecKillStage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class SecKillActivityBean extends SecKillActivity {
+
+    @ApiModelProperty("秒杀商品规格列表")
+    private List<SecKillActivitySpecBean> goodsSpecs;
+    @ApiModelProperty("秒杀场次列表")
+    private List<SecKillStage> stages;
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/activity/SecKillActivitySpecBean.java

@@ -0,0 +1,17 @@
+package com.gree.mall.manager.bean.activity;
+
+import com.gree.mall.manager.plus.entity.SecKillActivity;
+import com.gree.mall.manager.plus.entity.SecKillActivitySpec;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class SecKillActivitySpecBean extends SecKillActivitySpec {
+    @ApiModelProperty("商品总库存")
+    private Integer stockNum;
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/activity/SecKillActivityStageBean.java

@@ -0,0 +1,21 @@
+package com.gree.mall.manager.bean.activity;
+
+import com.gree.mall.manager.plus.entity.SecKillActivity;
+import com.gree.mall.manager.plus.entity.SecKillStage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+@ApiModel
+@Data
+public class SecKillActivityStageBean extends SecKillActivity {
+
+    @ApiModelProperty("秒杀场次列表")
+    private List<SecKillStage> stages;
+    @ApiModelProperty("状态1未开始,2进行中,3已结束")
+    private Integer activityStatus;
+    @ApiModelProperty("秒杀商品数量")
+    private Integer specCount;
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/activity/fullpiece/PromotionFullPieceBean.java

@@ -0,0 +1,22 @@
+package com.gree.mall.manager.bean.activity.fullpiece;
+
+import com.gree.mall.manager.plus.entity.PromotionFullPiece;
+import com.gree.mall.manager.plus.entity.PromotionFullPieceItem;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class PromotionFullPieceBean extends PromotionFullPiece {
+
+    @ApiModelProperty("活动门揽")
+    private List<PromotionFullPieceItem> items;
+
+    @ApiModelProperty("参与商品")
+    private List<String> goodsIds;
+
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/activity/fullpiece/PromotionFullPieceListVO.java

@@ -0,0 +1,39 @@
+package com.gree.mall.manager.bean.activity.fullpiece;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel
+@Data
+public class PromotionFullPieceListVO {
+
+    private String id;
+    @ApiModelProperty("活动名称")
+    private String name;
+    @ApiModelProperty("参与产品数量")
+    private Integer goodsNum;
+    @ApiModelProperty("活动开始时间")
+    private Date startTime;
+    @ApiModelProperty("活动结束时间")
+    private Date endTime;
+    @ApiModelProperty("状态")
+    private String status;
+    @ApiModelProperty("订单数量")
+    private Integer orderNums;
+    @ApiModelProperty("订单总金额")
+    private BigDecimal orderTotalAmount;
+    @ApiModelProperty("创建人")
+    private String createBy;
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+    @ApiModelProperty("更新人")
+    private String updateBy;
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/activity/fullpiece/PromotionFullPieceOrderVO.java

@@ -0,0 +1,28 @@
+package com.gree.mall.manager.bean.activity.fullpiece;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel
+@Data
+public class PromotionFullPieceOrderVO {
+
+    @ApiModelProperty("订单号")
+    private String orderId;
+    @ApiModelProperty("商品名称")
+    private String goodsName;
+    @ApiModelProperty("件数")
+    private Integer num;
+    @ApiModelProperty("订单金额")
+    private BigDecimal payAmount;
+    @ApiModelProperty("佣金比例(例如：0.1)")
+    private BigDecimal shareRate;
+    @ApiModelProperty("订单状态 NOPAY:待付款 DFH:待发货 YFH:已发货 OVER:已完成 CLOSE:已关闭 TIMEOUT:超时取消 REFUND:售后")
+    private String orderStatus;
+    @ApiModelProperty("下单时间")
+    private Date createTime;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/activity/fullpiece/PromotionFullPieceVO.java

@@ -0,0 +1,23 @@
+package com.gree.mall.manager.bean.activity.fullpiece;
+
+import com.gree.mall.manager.plus.entity.Goods;
+import com.gree.mall.manager.plus.entity.PromotionFullPiece;
+import com.gree.mall.manager.plus.entity.PromotionFullPieceItem;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class PromotionFullPieceVO extends PromotionFullPiece {
+
+    @ApiModelProperty("活动门揽")
+    private List<PromotionFullPieceItem> itemList;
+
+    @ApiModelProperty("参与的商品")
+    private List<Goods> goodsList;
+
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/activity/luckdraw/PromotionLuckDrawBean.java

@@ -0,0 +1,21 @@
+package com.gree.mall.manager.bean.activity.luckdraw;
+
+import com.gree.mall.manager.plus.entity.PromotionLuckDraw;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@EqualsAndHashCode(callSuper = true)
+@ApiModel
+@Data
+public class PromotionLuckDrawBean extends PromotionLuckDraw {
+
+    @NotNull
+    @ApiModelProperty("优惠券")
+    private List<PromotionLuckDrawCouponBean> promotionLuckDrawCoupons;
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/activity/luckdraw/PromotionLuckDrawCodeBean.java

@@ -0,0 +1,41 @@
+package com.gree.mall.manager.bean.activity.luckdraw;
+
+import com.gree.mall.manager.plus.entity.PromotionLuckDraw;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel
+@Data
+public class PromotionLuckDrawCodeBean extends PromotionLuckDraw {
+
+    @ApiModelProperty("券名称")
+    private String couponName;
+    @ApiModelProperty("券类型 SATISFY=满减券 GOODS=商品券 DISCOUNT=折扣券")
+    private String couponType;
+    @ApiModelProperty("券面值")
+    private BigDecimal discountAmount;
+    @ApiModelProperty("兑换码")
+    private String code;
+    @ApiModelProperty("状态 0=未兑换 1=已兑换未使用 2=已使用")
+    private Integer status2;
+    @ApiModelProperty("领取人昵称")
+    private String userNickName;
+    @ApiModelProperty("领取人手机号")
+    private String userMobile;
+    @ApiModelProperty("领取人兑换时间")
+    private Date userExchangeTime;
+    @ApiModelProperty("领取人使用时间")
+    private Date userUseTime;
+    @ApiModelProperty("订单号")
+    private String orderId;
+    @ApiModelProperty("订单用户")
+    private String userName;
+    @ApiModelProperty("订单状态")
+    private String orderStatus;
+
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/activity/luckdraw/PromotionLuckDrawCouponBean.java

@@ -0,0 +1,30 @@
+package com.gree.mall.manager.bean.activity.luckdraw;
+
+import com.gree.mall.manager.plus.entity.Goods;
+import com.gree.mall.manager.plus.entity.PromotionLuckDrawCoupon;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class PromotionLuckDrawCouponBean extends PromotionLuckDrawCoupon {
+
+    @ApiModelProperty("商品券对应商品id")
+    private List<String> goodsIds;
+
+    @ApiModelProperty("商品券对应的商品（详情用，新增不用传）")
+    private List<Goods> goodsList;
+
+    @ApiModelProperty("兑换数量（详情用，新增不用传）")
+    private Integer dhsl = 0;
+    @ApiModelProperty("剩余兑换数量（详情用，新增不用传）")
+    private Integer sydhsl = 0;
+    @ApiModelProperty("使用数量（详情用，新增不用传）")
+    private Integer sysl = 0;
+    @ApiModelProperty("未使用数量（详情用，新增不用传）")
+    private Integer wsysl = 0;
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/activity/luckdraw/PromotionLuckDrawList.java

@@ -0,0 +1,34 @@
+package com.gree.mall.manager.bean.activity.luckdraw;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@ApiModel
+@Data
+public class PromotionLuckDrawList {
+
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("商户")
+    private String companyWechatName;
+    @ApiModelProperty("活动名称")
+    private String name;
+    @ApiModelProperty("优惠券总数")
+    private Integer total;
+    @ApiModelProperty("兑换总数")
+    private Integer exchangeTotal;
+    @ApiModelProperty("剩余兑换数量")
+    private Integer surplusExchange;
+    @ApiModelProperty("使用总数")
+    private Integer useTotal;
+    @ApiModelProperty("未使用数量")
+    private Integer notUse;
+    @ApiModelProperty("状态 true/false")
+    private Boolean status;
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/admin/AdminCompanyPayConfigVO.java

@@ -0,0 +1,65 @@
+package com.gree.mall.manager.bean.admin;
+
+import com.gree.mall.manager.annotation.ZfireField;
+import com.gree.mall.manager.enums.StatusEnum;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ZfireField(tbName = "a")
+public class AdminCompanyPayConfigVO {
+
+    @ZfireField(hide = true)
+    private String id;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "企业的微信配置id")
+    private String companyWechatId;
+
+    @ApiModelProperty(value = "商户属性")
+    private String attr;
+
+    @ApiModelProperty(value = "电子商户名称")
+    private String payMerchantName;
+
+    @ApiModelProperty(value = "appid")
+    private String appId;
+
+    @ApiModelProperty(value = "子appid")
+    private String subAppId;
+
+    @ApiModelProperty(value = "商户号")
+    private String mchId;
+
+    @ApiModelProperty(value = "子商户号")
+    private String subMchId;
+
+    @ApiModelProperty(value = "Key")
+    private String mchKey;
+
+    @ApiModelProperty(value = "小程序appid")
+    private String appletAppid;
+
+    @ApiModelProperty(value = "小程序密钥")
+    private String appletSecret;
+
+    @ApiModelProperty(value = "支付说明")
+    private String remark;
+
+    @ApiModelProperty(value = "状态")
+    private StatusEnum status;
+
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "修改人")
+    private String updateBy;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/admin/AdminDeptTree.java

@@ -0,0 +1,21 @@
+package com.gree.mall.manager.bean.admin;
+
+import com.gree.mall.manager.plus.entity.AdminDept;
+import com.gree.mall.manager.plus.entity.AdminWebsit;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class AdminDeptTree extends AdminDept {
+
+    @ApiModelProperty(value = "是否网点")
+    private Boolean isWebsit = false;
+
+    @ApiModelProperty("children")
+    private List<AdminDeptTree> children;
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/admin/AdminDeptWebsitVO.java

@@ -0,0 +1,52 @@
+package com.gree.mall.manager.bean.admin;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.gree.mall.manager.annotation.ZfireField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel
+public class AdminDeptWebsitVO   {
+
+
+    @ZfireField(hide = true)
+    @TableId(value = "admin_dept_websit_id", type = IdType.ID_WORKER_STR)
+    private String adminDeptWebsitId;
+
+    @ApiModelProperty(value = "部门名称")
+    private String deptName;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "部门id")
+    private String adminDeptId;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新人")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+//    @ZfireField(hide = true)
+    @ApiModelProperty(value = "网点编号")
+    private String websitId;
+
+    @ApiModelProperty(value = "网点名称")
+    private String websitName;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/admin/AdminModuleBean.java

@@ -0,0 +1,22 @@
+package com.gree.mall.manager.bean.admin;
+
+import com.gree.mall.manager.plus.entity.AdminModule;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author ：lijh
+ * @description：TODO
+ * @date ：2024/1/13 15:19
+ */
+@ApiModel
+@Data
+public class AdminModuleBean extends AdminModule {
+
+    @ApiModelProperty("按钮子集")
+    private List<AdminModule> childList;
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/admin/AdminModuleTree.java

@@ -0,0 +1,20 @@
+package com.gree.mall.manager.bean.admin;
+
+import com.gree.mall.manager.plus.entity.AdminModule;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@ApiModel
+@Data
+public class AdminModuleTree extends AdminModule {
+
+    @ApiModelProperty("子级")
+    private List<AdminModuleTree> children = new ArrayList<>();
+    @ApiModelProperty("是否显示")
+    private Boolean show = false;
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/admin/AdminModuleVO.java

@@ -0,0 +1,69 @@
+package com.gree.mall.manager.bean.admin;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author qinrongjun
+ * @description
+ * @date 2023/8/12 14:55 星期六
+ */
+@Data
+public class AdminModuleVO {
+
+    @ApiModelProperty( "id")
+    private String moduleId;
+
+    @ApiModelProperty( "名称")
+    private String moduleName;
+
+    @ApiModelProperty( "模块路径")
+    private String modulePath;
+
+    @ApiModelProperty( "true=正常 false=作废")
+    private Boolean status;
+
+    @ApiModelProperty( "1=普通菜单 2=功能菜单 3=功能点  4=外部菜单")
+    private Integer type;
+
+    @ApiModelProperty( "编号")
+    private String code;
+
+    @ApiModelProperty( "层级")
+    private Integer level;
+
+    @ApiModelProperty( "url")
+    private String url;
+
+    @ApiModelProperty( "全url")
+    private String fullUrl;
+
+    @ApiModelProperty( "当前url")
+    private String curUrl;
+
+    @ApiModelProperty( "父id")
+    private String parentId;
+
+    @ApiModelProperty( "父级名称")
+    private String parentModule;
+
+    @ApiModelProperty( "排序号")
+    private Integer sortNum;
+
+    @ApiModelProperty( "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty( "icon")
+    private String icon;
+
+    @ApiModelProperty( "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty( "type=2的功能点")
+    List<AdminModuleVO> childList;
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/admin/AdminUserBean.java

@@ -0,0 +1,134 @@
+package com.gree.mall.manager.bean.admin;
+
+import com.gree.mall.manager.plus.entity.AdminUser;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@ApiModel
+@Data
+public class AdminUserBean extends AdminUser {
+
+    @ApiModelProperty("企业id")
+    private String corpId;
+    @ApiModelProperty("小程序应用id")
+    private Integer agentId1;
+    @ApiModelProperty("企业微信小程序密钥")
+    private String secret1;
+    @ApiModelProperty("标签密钥")
+    private String secret2;
+    @ApiModelProperty("通讯录密钥")
+    private String secret3;
+    @ApiModelProperty("token")
+    private String token;
+//    @ApiModelProperty("所属公司")
+//    private List<AdminUserCompanyRela> adminUserCompanyRelaList;
+    @ApiModelProperty("appId")
+    private String appId;
+    private String mchId;
+    private String mchKey;
+    private String subAppId;
+    private String subSecret;
+    private String subMchId;
+    private String template;
+    @ApiModelProperty("小程序名称")
+    private String minAppName;
+    @ApiModelProperty("小程序授权页logo")
+    private String minLogo1;
+    @ApiModelProperty("小程序通用logo")
+    private String minLogo2;
+    @ApiModelProperty("小程序默认头像logo")
+    private String minLogo3;
+    @ApiModelProperty("网点id")
+    private List<String> adminWebsitId;
+
+    @ApiModelProperty("部门id")
+    private List<String> adminDeptId;
+
+    @ApiModelProperty("部门ids")
+    private List<String> adminWebsitIds;
+    @ApiModelProperty("使用小程序模板类型:  1=模板1 2=模板2")
+    private Integer useTemplate;
+
+    @ApiModelProperty(value = "隔多少天")
+    private Integer dayNum;
+
+    @ApiModelProperty(value = "几点")
+    private String hourTime;
+
+    @ApiModelProperty("小程序码")
+    private String qrcode1;
+    @ApiModelProperty("公众号码")
+    private String qrcode2;
+
+    @ApiModelProperty(value = "公司开通时间")
+    private Date companyOpenTime;
+
+    @ApiModelProperty(value = "公司过期时间")
+    private Date companyExpireTime;
+
+    @ApiModelProperty(value = "购买方id")
+    private String buyCompanyInfo;
+
+    private String pubAppId;
+    private String pubAppSecret;
+    private String appletAppid;
+    private String appletSecret;
+    @ApiModelProperty("辅材配件权限")
+    private Boolean moduleMaterialPart;
+    @ApiModelProperty("延保权限")
+    private Boolean moduleYb;
+    @ApiModelProperty("维保权限")
+    private Boolean moduleWb;
+    @ApiModelProperty("租赁业务权限")
+    private Boolean moduleZl;
+    @ApiModelProperty("二手商城业务")
+    private Boolean moduleEs;
+    @ApiModelProperty("以旧换新抵扣方式")
+    private Integer yjhxDkFlag;
+
+    @ApiModelProperty("分销员是否承担销售佣金的手续费")
+    private Boolean isShareTax;
+
+    @ApiModelProperty("客户端菜单json")
+    private String appModuleJson;
+
+    private String pubTemplateId1;
+    private String pubTemplateId2;
+    private String pubTemplateId3;
+    private String pubTemplateId4;
+    private String pubTemplateId5;
+    private String pubTemplateId6;
+    private String pubTemplateId7;
+    private String pubTemplateId8;
+
+    @ApiModelProperty("库存管理方式 NO 不管理  CODE 管条码   NUM 管数量")
+    private String joinCode;
+    @ApiModelProperty("租户类型 1=销售 2=售后")
+    private Integer companyType;
+
+    @ApiModelProperty("支付二维码")
+    private String payQrcode;
+
+    @ApiModelProperty("打印单名称")
+    private String billTitle;
+
+    @ApiModelProperty("是否到店支付")
+    private Boolean storePay;
+
+
+    @ApiModelProperty("市")
+    private String city;
+
+    @ApiModelProperty("省")
+    private String province;
+
+    @ApiModelProperty("街道")
+    private String street;
+
+    @ApiModelProperty("区")
+    private String area;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/admin/AdminUserCom.java

@@ -0,0 +1,51 @@
+package com.gree.mall.manager.bean.admin;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.gree.mall.manager.plus.entity.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AdminUserCom extends AdminUser {
+
+
+    private List<AdminWebsit> adminWebsit;
+    private List<AdminDept> adminDept;
+
+    @ApiModelProperty("部门id")
+    private List<String> adminWebsitIds;
+    @ApiModelProperty("只读帐号")
+    private Boolean onlyRead = false;
+    @ApiModelProperty("商户ids")
+    private List<String> companyWechatIds;
+//    @ApiModelProperty("企微id")
+//    private List<String> corpIds;
+//    @ApiModelProperty("企业微信id")
+//    private String corpId;
+//    @ApiModelProperty("当前登录人企业微信id")
+//    private String loginCompanyWechatId;
+//    @ApiModelProperty("当前登录人企业名称")
+//    private String loginCompanyName;
+    @ApiModelProperty("当前登录人所使用的商户信息")
+    private AdminCompanyWechat adminCompanyWechat;
+
+    private String token;
+
+    @ApiModelProperty("库存管理方式 NO 不管理  CODE 管条码   NUM 管数量")
+    private String joinCode;
+
+    @ApiModelProperty("是否需要跳签约 true=是 false=否")
+    private Boolean isJumpSign;
+
+    @ApiModelProperty("合同签约信息")
+    private String contractSignInfo;
+
+
+
+    @JsonIgnore
+    public String getJoinNickName() {
+        return "(" + this.getUserName() + ")" + this.getNickName();
+    }
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/admin/AdminWebsitBean.java

@@ -0,0 +1,16 @@
+package com.gree.mall.manager.bean.admin;
+
+import com.gree.mall.manager.plus.entity.AdminUser;
+import com.gree.mall.manager.plus.entity.WebsitZone;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class AdminWebsitBean extends AdminUser {
+    @ApiModelProperty("weidsitIds")
+    private List<WebsitZone> weidsitIds;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/admin/AdminWebsitGrantBean.java

@@ -0,0 +1,21 @@
+package com.gree.mall.manager.bean.admin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@ApiModel
+@Data
+public class AdminWebsitGrantBean {
+
+    @ApiModelProperty("角色id")
+    private String adminRoleId;
+    @ApiModelProperty("功能模块ids")
+    private List<String> adminModuleIds;
+    @ApiModelProperty("连带的功能模块ids")
+    private List<String> adminModuleIds2 = new ArrayList<>();
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/admin/AdminWebsitNewBean.java

@@ -0,0 +1,19 @@
+package com.gree.mall.manager.bean.admin;
+
+import com.gree.mall.manager.plus.entity.AdminWebsit;
+import com.gree.mall.manager.plus.entity.AdminWebsitPayConfig;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@EqualsAndHashCode(callSuper = true)
+@ApiModel
+@Data
+public class AdminWebsitNewBean extends AdminWebsit {
+
+    @ApiModelProperty("通联支付配置")
+    private List<AdminWebsitPayConfig> payConfigList;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/admin/AdminWebsitTree.java

@@ -0,0 +1,17 @@
+package com.gree.mall.manager.bean.admin;
+
+import com.gree.mall.manager.plus.entity.AdminWebsit;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class AdminWebsitTree extends AdminWebsit {
+
+    @ApiModelProperty("children")
+    private List<AdminWebsitTree> children;
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/admin/EnterpriseWechatWorkerImportList.java

@@ -0,0 +1,13 @@
+package com.gree.mall.manager.bean.admin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value="EnterpriseWechatWorker对象", description="嘉讯茂企业微信成员信息导出")
+public class EnterpriseWechatWorkerImportList  {
+
+    @ApiModelProperty("部门编号")
+    private String websitNum;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/admin/ExternalMapBean.java

@@ -0,0 +1,17 @@
+package com.gree.mall.manager.bean.admin;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ExternalMapBean {
+
+    @ApiModelProperty("token")
+    private String token;
+
+    @ApiModelProperty("url")
+    private String url;
+
+    @ApiModelProperty("userid")
+    private String userid;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/admin/reqDto/AdminCompanyWechatReqBean.java

@@ -0,0 +1,25 @@
+package com.gree.mall.manager.bean.admin.reqDto;
+
+import com.gree.mall.manager.plus.entity.AdminCompanyWechat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value="AdminCompanyWechatReqBean对象", description="新增商户dto")
+public class AdminCompanyWechatReqBean extends AdminCompanyWechat {
+
+    private String userName;
+    private String password;
+    private String linkName;
+    //private String linkPhone;
+
+    private String nickName;
+    @ApiModelProperty("电子邮箱")
+    private String email;
+
+    @ApiModelProperty("经度")
+    private String lng;
+    @ApiModelProperty("纬度")
+    private String lat;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/admin/reqDto/AdminCompanyWechatTemplateUpdateReqDto.java

@@ -0,0 +1,28 @@
+package com.gree.mall.manager.bean.admin.reqDto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.gree.mall.manager.plus.entity.AdminCompanyWechatTemplate;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel(value="AdminCompanyWechatUpdateReqDto对象", description="编辑商户dto")
+public class AdminCompanyWechatTemplateUpdateReqDto {
+
+    @ApiModelProperty(value = "企业的微信配置id")
+    private String companyWechatId;
+    @ApiModelProperty("使用小程序模板:  1=模板1 2=模板2 ")
+    private Integer useTemplate;
+    @ApiModelProperty(value = "主log")
+    private String mainLog;
+    @ApiModelProperty("通用loc")
+    private String commonLog;
+    @ApiModelProperty("头像log")
+    private String minLogo;
+    @ApiModelProperty("模板信息")
+    List<AdminCompanyWechatTemplate> companyWechatTemplatesList;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/admin/reqDto/AdminUserAddReqBean.java

@@ -0,0 +1,20 @@
+package com.gree.mall.manager.bean.admin.reqDto;
+
+import com.gree.mall.manager.plus.entity.AdminUser;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+@Data
+@ApiModel(value="AdminUserAddBean对象", description="新增用户对象")
+public class AdminUserAddReqBean extends AdminUser {
+
+    @ApiModelProperty("网点id")
+    private List<String> adminWebsitId;
+
+    @ApiModelProperty("选择得部门id")
+    private List<String> adminDeptId;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/admin/respDto/AdminCompanyWechatRespPageBean.java

@@ -0,0 +1,37 @@
+package com.gree.mall.manager.bean.admin.respDto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.gree.mall.manager.plus.entity.AdminCompanyWechat;
+import com.gree.mall.manager.plus.entity.AdminUser;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(description = "商戶列表响应bean")
+@Data
+public class AdminCompanyWechatRespPageBean extends AdminCompanyWechat {
+
+    private AdminUser adminUser;
+
+    @TableId(value = "admin_user_id", type = IdType.ID_WORKER_STR)
+    private String adminUserId;
+    @ApiModelProperty(value = "用户名")
+    private String nickName;
+    @ApiModelProperty(value = "帐号")
+    private String userName;
+    @ApiModelProperty(value = "负责人")
+    private String linkName;
+    @ApiModelProperty(value = "角色名")
+    private String roleName;
+//    @ApiModelProperty(value = "联系人电话")
+//    private String linkPhone;
+    @ApiModelProperty(value = "邮箱")
+    private String email;
+
+    @ApiModelProperty(value = "状态: true=正常  false=冻结")
+    private Boolean status;
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/big/LargeMpBean.java

@@ -0,0 +1,36 @@
+package com.gree.mall.manager.bean.big;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class LargeMpBean {
+
+
+    @ApiModelProperty(value = "辅材销售")
+    private Integer  fcxs;
+
+
+    @ApiModelProperty(value = "辅材退货")
+    private Integer fcth;
+
+
+    @ApiModelProperty(value = "配件销售")
+    private Integer pjxs;
+
+    @ApiModelProperty(value = "配件退货")
+    private Integer pjth;
+
+    @ApiModelProperty(value = "新件待返还")
+    private BigDecimal xjdfh;
+
+    @ApiModelProperty(value = "旧件待返还")
+    private BigDecimal jjdfh;
+
+
+    @ApiModelProperty(value = "旧件待返厂")
+    private BigDecimal jjdfc;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/big/LargeNumCity.java

@@ -0,0 +1,24 @@
+package com.gree.mall.manager.bean.big;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class LargeNumCity {
+
+    @ApiModelProperty(value = "区")
+    private String  area;
+
+    @ApiModelProperty(value = "市")
+    private String  city;
+
+
+    @ApiModelProperty(value = "已完工台数")
+    private BigDecimal num;
+
+
+    @ApiModelProperty(value = "未完工台数")
+    private BigDecimal numWwg;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/big/LargeOneBean.java

@@ -0,0 +1,64 @@
+package com.gree.mall.manager.bean.big;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class LargeOneBean {
+
+    @ApiModelProperty(value = "总商户数")
+    private Integer companyNum;
+
+    @ApiModelProperty(value = "今日登录商户数")
+    private Integer loginCompanyNum;
+
+    @ApiModelProperty(value = "今日登录商户数百分比")
+    private BigDecimal loginCompanyNumPer;
+
+    @ApiModelProperty(value = "总工程师")
+    private Integer allWorker;
+
+    @ApiModelProperty(value = "今日登录总工程师")
+    private Integer loginAllWorker;
+
+    @ApiModelProperty(value = "今日登录总工程师数百分比")
+    private BigDecimal loginAllWorkerPer;
+
+    @ApiModelProperty(value = "总分销员")
+    private Integer allService;
+
+    @ApiModelProperty(value = "今日登录分销员")
+    private Integer loginAllService;
+
+    @ApiModelProperty(value = "今日登录分销员数百分比")
+    private BigDecimal loginAllServicePer;
+
+
+    @ApiModelProperty(value = "总用户")
+    private Integer allUser;
+
+    @ApiModelProperty(value = "今日登录用户")
+    private Integer loginAllUser;
+
+    @ApiModelProperty(value = "今日登录分销员数百分比")
+    private BigDecimal loginAllUserPer;
+
+
+    @ApiModelProperty(value = "总工单")
+    private Integer allWorkerOrderNum;
+
+
+    @ApiModelProperty(value = "未完工")
+    private Integer neverWorkerNum;
+
+
+    @ApiModelProperty(value = "销售订单")
+    private Integer salesOrderNum;
+
+    @ApiModelProperty(value = "增值订单")
+    private Integer increOrderNum;
+
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/big/LargeOrderBean.java

@@ -0,0 +1,34 @@
+package com.gree.mall.manager.bean.big;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class LargeOrderBean {
+
+    @ApiModelProperty(value = "销售订单数")
+    private Integer sxdds;
+
+    @ApiModelProperty(value = "销售订单金额")
+    private BigDecimal sxddje;
+
+    @ApiModelProperty(value = "辅材订单数")
+    private Integer fcdds;
+
+    @ApiModelProperty(value = "辅材订单金额")
+    private BigDecimal fcddje;
+
+    @ApiModelProperty(value = "配件订单数")
+    private Integer pjdds;
+
+    @ApiModelProperty(value = "配件订单金额")
+    private BigDecimal pjddje;
+
+    @ApiModelProperty(value = "增值订单数")
+    private Integer zzdds;
+
+    @ApiModelProperty(value = "增值订单金额")
+    private BigDecimal zzddje;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/big/LargeWorkerOrderBean.java

@@ -0,0 +1,41 @@
+package com.gree.mall.manager.bean.big;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class LargeWorkerOrderBean {
+
+    @ApiModelProperty(value = "安装工单")
+    private Integer  azgd;
+
+    @ApiModelProperty(value = "安装工单占比")
+    private BigDecimal azgdzb;
+
+    @ApiModelProperty(value = "维修工单")
+    private Integer  wxgd;
+
+    @ApiModelProperty(value = "维修工单占比")
+    private BigDecimal  wxgdzb;
+
+    @ApiModelProperty(value = "清洗工单")
+    private Integer  qxgd;
+
+    @ApiModelProperty(value = "清洗工单占比")
+    private BigDecimal  qxgdzb;
+
+    @ApiModelProperty(value = "增值工单")
+    private Integer  zzgd;
+
+    @ApiModelProperty(value = "增值工单占比")
+    private BigDecimal  zzgdzb;
+
+    @ApiModelProperty(value = "维保工单")
+    private Integer  wbgd;
+
+    @ApiModelProperty(value = "维保工单占比")
+    private BigDecimal  wbgdzb;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/big/LargeWorkerOrderDateBean.java

@@ -0,0 +1,19 @@
+package com.gree.mall.manager.bean.big;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class LargeWorkerOrderDateBean {
+
+    @ApiModelProperty(value = "工单类型")
+    private String  lx;
+
+    @ApiModelProperty(value = "每天数量已完工")
+    private List<Integer> unitNum;
+
+    @ApiModelProperty(value = "每天数量未完工")
+    private List<Integer> unitNumWwg;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/big/LargeWorkerOrderList.java

@@ -0,0 +1,42 @@
+package com.gree.mall.manager.bean.big;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class LargeWorkerOrderList {
+
+    @ApiModelProperty(value = "街道名称")
+    private String  streetName;
+
+    @ApiModelProperty(value = "安装工单")
+    private Integer  azgd;
+
+    @ApiModelProperty(value = "安装工单未完工")
+    private Integer  azgdwwg;
+
+    @ApiModelProperty(value = "维修工单")
+    private Integer  wxgd;
+
+    @ApiModelProperty(value = "维修工单未完工")
+    private Integer  wxgdwwg;
+
+    @ApiModelProperty(value = "清洗工单")
+    private Integer  qxgd;
+
+    @ApiModelProperty(value = "清洗工单未完工")
+    private Integer  qxgdwwg;
+
+    @ApiModelProperty(value = "增值工单")
+    private Integer  zzgd;
+
+    @ApiModelProperty(value = "增值工单未完工")
+    private Integer  zzgdwwg;
+
+    @ApiModelProperty(value = "维保工单")
+    private Integer  wbgd;
+
+    @ApiModelProperty(value = "维保工单未完工")
+    private Integer  wbgdwwg;
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/big/largeSeeLogin.java

@@ -0,0 +1,17 @@
+package com.gree.mall.manager.bean.big;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class largeSeeLogin {
+
+    @ApiModelProperty(value = "日期")
+    private String dStr;
+
+    @ApiModelProperty(value = "访问量")
+    private Integer num;
+
+    @ApiModelProperty(value = "访客量")
+    private Integer userNum;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/carouselMap/CarouselMapVO.java

@@ -0,0 +1,73 @@
+package com.gree.mall.manager.bean.carouselMap;
+
+import com.gree.mall.manager.annotation.ZfireField;
+import com.gree.mall.manager.enums.CarouseTypeEnum;
+import com.gree.mall.manager.enums.StatusEnum;
+import com.gree.mall.manager.enums.es.CarouselMapPortEnum;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@ZfireField(tbName = "a")
+@Data
+public class CarouselMapVO   {
+
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "轮翻id")
+    private String id;
+
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyName;
+
+    @ApiModelProperty(value = "轮播图名称")
+    private String carouselName;
+
+    @ApiModelProperty(value = "类型")
+    private CarouselMapPortEnum port;
+
+    @ApiModelProperty(value = "链接类型")
+    private CarouseTypeEnum type;
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "链接地址")
+    private String linkUrl;
+
+    @ApiModelProperty(value = "状态")
+    private StatusEnum state;
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "图片类型")
+    private String imgType;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "图片地址")
+    private String imgSrc;
+
+    @ApiModelProperty(value = "排序(降序)")
+    private Integer sortNum;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "链接商品id")
+    private String goodsId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "修改人")
+    private String updateBy;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "企业微信id")
+    private String companyWechatId;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "凡科活动APPID")
+    private String appId;
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/common/AmityUrlVO.java

@@ -0,0 +1,44 @@
+package com.gree.mall.manager.bean.common;
+
+
+import com.gree.mall.manager.annotation.ZfireField;
+import com.gree.mall.manager.enums.StatusEnum;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+
+public class AmityUrlVO {
+
+   @ApiModelProperty( "友情链接id")
+    private String amityUrlId;
+
+   @ApiModelProperty( "友情链接名称")
+    private String amityUrlName;
+
+   @ApiModelProperty( "友链地址")
+    private String amityUrl;
+
+   @ApiModelProperty( "logo")
+    private String amityUrlLogo;
+
+   @ApiModelProperty( "排序")
+    private Integer amityUrlSort;
+
+   @ApiModelProperty( "状态")
+    private StatusEnum status;
+
+   @ApiModelProperty( "创建人")
+    private String createBy;
+
+   @ApiModelProperty( "创建时间")
+    private Date createTime;
+
+   @ApiModelProperty( "更新人")
+    private String updateBy;
+
+   @ApiModelProperty( "更新时间")
+    private Date updateTime;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/common/CallRecordOrderVo.java

@@ -0,0 +1,81 @@
+package com.gree.mall.manager.bean.common;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.gree.mall.manager.annotation.ZfireField;
+import com.gree.mall.manager.plus.entity.CallRecord;
+import com.gree.mall.manager.plus.entity.CallSendRecord;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ZfireField(tbName = "a")
+public class CallRecordOrderVo   {
+
+
+    @ZfireField(hide = true)
+    @TableId(value = "id", type = IdType.ID_WORKER_STR)
+    private String id;
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "工单号")
+    private String orderBaseId;
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "当时的工单状态")
+    private String orderStatus;
+
+    @ApiModelProperty(value = "呼叫方式")
+    private String callType1;
+
+    @ApiModelProperty(value = "通话类型")
+    private String callType2;
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "师傅手机号")
+    private String workerMobile;
+
+    @ApiModelProperty(value = "通话发起时间")
+    private Date startTime;
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "摘机接通时间")
+    private Date start;
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "通话结束时间")
+    private Date end;
+
+    @ApiModelProperty(value = "客户手机号")
+    private String phone;
+
+    @ApiModelProperty(value = "后台云呼信息")
+    private String promoter;
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "回访成功/回访失败")
+    private String status;
+
+    @ApiModelProperty(value = "通话时长(秒)")
+    private Integer callTimestamp;
+
+    @ApiModelProperty(value = "振铃时长(秒)")
+    private Integer ringTimestamp;
+
+    @ApiModelProperty(value = "录音文件")
+    private String fileUrl;
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "录音转文本")
+    private String contentText;
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "原因描述")
+    private String remark;
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/common/CallRecordVo.java

@@ -0,0 +1,62 @@
+package com.gree.mall.manager.bean.common;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.gree.mall.manager.annotation.ZfireField;
+import com.gree.mall.manager.plus.entity.CallSendRecord;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ZfireField(tbName = "a")
+public class CallRecordVo   {
+
+    @ZfireField(hide = true)
+    @TableId(value = "id", type = IdType.ID_WORKER_STR)
+    private String id;
+
+    @ApiModelProperty(value = "信息编号")
+    private String orderBaseId;
+
+    @ApiModelProperty(value = "流程名称")
+    private String name;
+
+    @ApiModelProperty(value = "网点编号")
+    private String websitId;
+
+    @ApiModelProperty(value = "网点名称")
+    private String websitName;
+
+    @ApiModelProperty(value = "客户名称")
+    private String userName;
+
+    @ApiModelProperty(value = "客户电话")
+    private String userMobile;
+
+    @ApiModelProperty(value = "状态")
+    private String status;
+
+    @ApiModelProperty(value = "AI标签")
+    private String tag;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    @ApiModelProperty(value = "修改时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    @ApiModelProperty(value = "修改人")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/common/ImgCarouselManageBean.java

@@ -0,0 +1,66 @@
+package com.gree.mall.manager.bean.common;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+public class ImgCarouselManageBean {
+
+    private String id;
+
+    @ApiModelProperty(  "轮播图名称")
+    private String imgCarouselName;
+
+    @ApiModelProperty(  "轮播图")
+    private String imgCarouselUrl;
+
+    @ApiModelProperty(  "顺序")
+    private Integer imgCarouselOrder;
+
+    @ApiModelProperty( "状态：显示，隐藏")
+    private String status;
+    //状态  1:显示  0:隐藏
+    public final static String STATUS_SHOW = "1";
+    public final static String STATUS_HIDE = "0";
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getImgCarouselName() {
+        return imgCarouselName;
+    }
+
+    public void setImgCarouselName(String imgCarouselName) {
+        this.imgCarouselName = imgCarouselName;
+    }
+
+    public String getImgCarouselUrl() {
+        return imgCarouselUrl;
+    }
+
+    public void setImgCarouselUrl(String imgCarouselUrl) {
+        this.imgCarouselUrl = imgCarouselUrl;
+    }
+
+    public Integer getImgCarouselOrder() {
+        return imgCarouselOrder;
+    }
+
+    public void setImgCarouselOrder(Integer imgCarouselOrder) {
+        this.imgCarouselOrder = imgCarouselOrder;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/common/OpenDictVO.java

@@ -0,0 +1,30 @@
+package com.gree.mall.manager.bean.common;
+
+
+import com.gree.mall.manager.enums.StatusEnum;
+import com.gree.mall.manager.enums.material.StateEnum;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+public class OpenDictVO {
+    @ApiModelProperty("id")
+    private String sysDictId;
+
+    @ApiModelProperty("字典编号")
+    private String dictCode;
+
+    @ApiModelProperty("字典值")
+    private String dictValue;
+
+    @ApiModelProperty("状态")
+    private StateEnum status;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("排序")
+    private Integer sortNum;
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/common/SysDictAddParam.java

@@ -0,0 +1,41 @@
+package com.gree.mall.manager.bean.common;
+
+
+import com.gree.mall.manager.enums.material.StateEnum;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author qinrongjun
+ * @description
+ * @date 2023/8/4 11:10 星期五
+ */
+@Data
+public class SysDictAddParam {
+
+    @NotBlank(message = "字典类型不能为空")
+    @ApiModelProperty("字典类型")
+    private String dictType;
+
+    @NotBlank(message = "字典值不能为空")
+    @ApiModelProperty("字典编号")
+    private String dictCode;
+
+    @NotBlank(message = "字典值不能为空")
+    @ApiModelProperty("字典值")
+    private String dictValue;
+
+    @NotNull(message = "字典状态不能为空")
+    @ApiModelProperty("字典状态")
+    private StateEnum status;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @NotNull(message = "排序不能为空")
+    @ApiModelProperty("排序")
+    private Integer sortNum;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/common/SysDictBean.java

@@ -0,0 +1,35 @@
+package com.gree.mall.manager.bean.common;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * @author change
+ */
+
+@Data
+public class SysDictBean {
+
+
+    @ApiModelProperty("字典名称")
+    private String dictCode;
+
+    @ApiModelProperty("字典值")
+    private String dictValue;
+
+    @ApiModelProperty("父字典code(请结合字典类型一起使用)")
+    private String parentDictCode;
+
+    @ApiModelProperty("父字典类型")
+    private String parentDictType;
+
+    @ApiModelProperty("标记")
+    private String flag;
+
+    private Integer sortNum;
+
+    @ApiModelProperty("字典状态(有效无效) ON/OFF")
+    private String status;
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/common/SysDictCompanyVO.java

@@ -0,0 +1,44 @@
+package com.gree.mall.manager.bean.common;
+
+import com.gree.mall.manager.annotation.ZfireField;
+import com.gree.mall.manager.constant.SysDictConstant;
+import com.gree.mall.manager.enums.material.StateEnum;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ZfireField(tbName = "a")
+public class SysDictCompanyVO {
+
+    @ApiModelProperty("id")
+    @ZfireField(hide = true)
+    private String sysDictId;
+
+    @ZfireField(type="select",frontCode = SysDictConstant.SYS_DICT_TYPE,colName = "dict_type", hide = true)
+    @ApiModelProperty("字典类型")
+    private String dictTypeName;
+
+    @ZfireField(type="select")
+    @ApiModelProperty("状态")
+    private StateEnum status;
+
+    @ApiModelProperty("字典编号")
+    private String dictCode;
+
+    @ApiModelProperty("字典值")
+    private String dictValue;
+
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("排序")
+    private Integer sortNum;
+
+//    @ApiModelProperty("所属商户")
+//    private String  companyName;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty("所属商户id")
+    private String  companyWechatId;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/common/SysDictEditParam.java

@@ -0,0 +1,33 @@
+package com.gree.mall.manager.bean.common;
+
+
+import com.gree.mall.manager.enums.material.StateEnum;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author qinrongjun
+ * @description
+ * @date 2023/8/4 11:16 星期五
+ */
+@Data
+public class SysDictEditParam {
+
+    @NotBlank(message = "字典值id不能为空")
+    @ApiModelProperty("字典值id")
+    private String sysDictId;
+
+    @ApiModelProperty("字典值")
+    private String dictValue;
+
+    @ApiModelProperty("字典状态")
+    private StateEnum status;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("排序")
+    private Integer sortNum;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/common/SysDictRefVO.java

@@ -0,0 +1,58 @@
+package com.gree.mall.manager.bean.common;
+
+
+import com.gree.mall.manager.annotation.ZfireField;
+import com.gree.mall.manager.constant.SysDictConstant;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@ZfireField(tbName = "a")
+
+@Data
+public class SysDictRefVO {
+
+    @ZfireField(hide = true)
+    private String id;
+
+    @ZfireField(frontCode = SysDictConstant.SYS_DICT_TYPE,type="select",colName = "dict_type")
+    @ApiModelProperty("字典类型")
+    private String dictTypeName;
+
+    @ApiModelProperty("字典编号")
+    private String dictCode;
+
+    @ApiModelProperty("字典值")
+    private String dictValue;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ZfireField(isQuery = false)
+    @ApiModelProperty("排序")
+    private Integer sortNum;
+
+    @ZfireField(frontCode = SysDictConstant.BRAND,type = "select",colName = "brand_id")
+    @ApiModelProperty("结算主体")
+    private String brandName;
+
+    @ApiModelProperty("对应字典编号")
+    private String refDictCode;
+
+    @ApiModelProperty("对应字典名称")
+    private String refDictName;
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("修改时间")
+    private Date updateTime;
+
+    @ApiModelProperty("修改人")
+    private String updateBy;
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/common/SysDictTypeVO.java

@@ -0,0 +1,22 @@
+package com.gree.mall.manager.bean.common;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author qinrongjun
+ * @description
+ * @date 2023/8/4 10:53 星期五
+ */
+@Data
+public class SysDictTypeVO {
+    @ApiModelProperty("字典类型")
+    private String dictType;
+
+    @ApiModelProperty("字典名称")
+    private String remark;
+
+    @ApiModelProperty("是否开放让业务人配置")
+    private Boolean open;
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/common/SysDictVO.java

@@ -0,0 +1,52 @@
+package com.gree.mall.manager.bean.common;
+
+
+import com.gree.mall.manager.annotation.ZfireField;
+import com.gree.mall.manager.constant.SysDictConstant;
+import com.gree.mall.manager.enums.material.StateEnum;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@ZfireField(tbName = "a")
+@Data
+public class SysDictVO {
+
+    @ApiModelProperty("id")
+    @ZfireField(hide = true)
+    private String sysDictId;
+
+    @ZfireField(type="select",frontCode = SysDictConstant.SYS_DICT_TYPE,colName = "dict_type")
+    @ApiModelProperty("字典类型")
+    private String dictTypeName;
+
+    @ZfireField(type="select")
+    @ApiModelProperty("状态")
+    private StateEnum status;
+
+    @ApiModelProperty("字典编号")
+    private String dictCode;
+
+    @ApiModelProperty("字典值")
+    private String dictValue;
+
+    @ApiModelProperty("父字典类型")
+    private String parentDictType;
+
+    @ApiModelProperty("父字典编号")
+    private String parentDictCode;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("排序")
+    private Integer sortNum;
+
+//    @ApiModelProperty("所属商户")
+//    private String  companyName;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty("所属商户id")
+    private String  companyWechatId;
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/common/WechatOpenBean.java

@@ -0,0 +1,24 @@
+package com.gree.mall.manager.bean.common;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class WechatOpenBean {
+    private String openid;
+    private String sessionKey;
+    private String unionid;
+    private String mobile;
+    @ApiModelProperty("公众号appid")
+    private String pubAppId;
+
+    @ApiModelProperty("小程序logo")
+    private String logo;
+    @ApiModelProperty("小程序名称")
+    private String appName;
+
+    @ApiModelProperty("客户端菜单json")
+    private String appModuleJson;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/container/DelayBucket.java

@@ -0,0 +1,107 @@
+//package com.gree.mall.manager.bean.container;
+//
+//import com.alibaba.fastjson.JSON;
+//import com.gree.mall.manager.bean.delay.DelayJob;
+//import lombok.extern.slf4j.Slf4j;
+//import org.apache.commons.collections4.CollectionUtils;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.data.redis.core.BoundZSetOperations;
+//import org.springframework.data.redis.core.RedisTemplate;
+//import org.springframework.data.redis.core.ZSetOperations;
+//import org.springframework.stereotype.Component;
+//
+//import java.util.ArrayList;
+//import java.util.List;
+//import java.util.Set;
+//import java.util.concurrent.atomic.AtomicInteger;
+//
+///**
+// * 延时处理队列
+// * @author change
+// *
+// **/
+//@Slf4j
+//@Component
+//public class DelayBucket {
+//
+//    @Autowired
+//    private RedisTemplate redisTemplate;
+//
+//    private static AtomicInteger index = new AtomicInteger(0);
+//
+//    @Value("${thread.size}")
+//    private int bucketsSize;
+//
+//    private List <String> bucketNames = new ArrayList <>();
+//
+//    @Bean
+//    public List <String> createBuckets() {
+//        for (int i = 0; i < bucketsSize; i++) {
+//            bucketNames.add("bucket" + i);
+//        }
+//        return bucketNames;
+//    }
+//
+//    /**
+//     * 获得桶的名称
+//     * @return
+//     */
+//    private String getThisBucketName() {
+//        int thisIndex = index.addAndGet(1);
+//        int i1 = thisIndex % bucketsSize;
+//        return bucketNames.get(i1);
+//    }
+//
+//    /**
+//     * 获得桶集合
+//     * @param bucketName
+//     * @return
+//     */
+//    private BoundZSetOperations getBucket(String bucketName) {
+//        return redisTemplate.boundZSetOps(bucketName);
+//    }
+//
+//    /**
+//     * 放入延时任务
+//     * @param job
+//     */
+//    public void addDelayJob(DelayJob job) {
+//        log.info("添加延迟任务:{}", JSON.toJSONString(job));
+//        String thisBucketName = getThisBucketName();
+//        BoundZSetOperations bucket = getBucket(thisBucketName);
+//        bucket.add(job,job.getDelayDate());
+//    }
+//
+//    /**
+//     * 获得最新的延期任务
+//     * @return
+//     */
+//    public DelayJob getFirstDelayTime(Integer index) {
+//        String name = bucketNames.get(index);
+//        BoundZSetOperations bucket = getBucket(name);
+//        Set<ZSetOperations.TypedTuple> set = bucket.rangeWithScores(0, 1);
+//        if (CollectionUtils.isEmpty(set)) {
+//            return null;
+//        }
+//        ZSetOperations.TypedTuple typedTuple = (ZSetOperations.TypedTuple) set.toArray()[0];
+//        Object value = typedTuple.getValue();
+//        if (value instanceof DelayJob) {
+//            return (DelayJob) value;
+//        }
+//        return null;
+//    }
+//
+//    /**
+//     * 移除延时任务
+//     * @param index
+//     * @param delayJob
+//     */
+//    public void removeDelayTime(Integer index,DelayJob delayJob) {
+//        String name = bucketNames.get(index);
+//        BoundZSetOperations bucket = getBucket(name);
+//        bucket.remove(delayJob);
+//    }
+//
+//}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/container/JobPool.java

@@ -0,0 +1,63 @@
+package com.gree.mall.manager.bean.container;
+
+import com.alibaba.fastjson.JSON;
+import com.gree.mall.manager.bean.delay.Job;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.BoundHashOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * 任务池
+ * @author change
+ *
+ **/
+@Component
+@Slf4j
+public class JobPool {
+    
+    @Autowired
+    private RedisTemplate redisTemplate;
+
+    private String NAME = "job.pool";
+    
+    private BoundHashOperations getPool () {
+        BoundHashOperations ops = redisTemplate.boundHashOps(NAME);
+        return ops;
+    }
+
+    /**
+     * 添加任务
+     * @param job
+     */
+    public void addJob (Job job) {
+        log.info("任务池添加任务：{}", JSON.toJSONString(job));
+        getPool().put(job.getId(),job);
+        return ;
+    }
+
+    /**
+     * 获得任务
+     * @param jobId
+     * @return
+     */
+    public Job getJob(String jobId) {
+        Object o = getPool().get(jobId);
+        if (o instanceof Job) {
+            return (Job) o;
+        }
+        return null;
+    }
+
+    /**
+     * 移除任务
+     * @param jobId
+     */
+    public void removeDelayJob (String jobId) {
+        log.info("任务池移除任务：{}",jobId);
+        // 移除任务
+        getPool().delete(jobId);
+    }
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/container/ReadyQueue.java

@@ -0,0 +1,64 @@
+package com.gree.mall.manager.bean.container;
+
+import com.alibaba.fastjson.JSON;
+import com.gree.mall.manager.bean.delay.DelayJob;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.BoundListOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+
+/**
+ *
+ * @author change
+ *
+ **/
+@Component
+@Slf4j
+public class ReadyQueue {
+
+    @Autowired
+    private RedisTemplate redisTemplate;
+
+    private String NAME = "process.queue";
+
+    private String getKey(String topic) {
+        return NAME + topic;
+    }
+
+    /**
+     * 获得队列
+     * @param topic
+     * @return
+     */
+    private BoundListOperations getQueue (String topic) {
+        BoundListOperations ops = redisTemplate.boundListOps(getKey(topic));
+        return ops;
+    }
+
+    /**
+     * 设置任务
+     * @param delayJob
+     */
+    public void pushJob(DelayJob delayJob) {
+        log.info("执行队列添加任务:{}",delayJob);
+        BoundListOperations listOperations = getQueue(delayJob.getTopic());
+        listOperations.leftPush(delayJob);
+    }
+
+    /**
+     * 移除并获得任务
+     * @param topic
+     * @return
+     */
+    public DelayJob popJob(String topic) {
+        BoundListOperations listOperations = getQueue(topic);
+        Object o = listOperations.leftPop();
+        if (o instanceof DelayJob) {
+            log.info("执行队列取出任务:{}", JSON.toJSONString((DelayJob) o));
+            return (DelayJob) o;
+        }
+        return null;
+    }
+    
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/contract/AgentInfo.java

@@ -0,0 +1,28 @@
+package com.gree.mall.manager.bean.contract;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class AgentInfo {
+
+    @ApiModelProperty(value = "代理人姓名")
+    private String agentName = "";
+
+    @ApiModelProperty(value = "代理人证件号")
+    private String agentId = "";
+
+    @ApiModelProperty(value = "代理人手机号（仅支持国内运营商）")
+    private String agentMobile = "";
+
+    @ApiModelProperty(value = "代理人证件正面照下载地址")
+    private String agentIdFrontPath = "";
+
+    @ApiModelProperty(value = "代理人证件反面照下载地址")
+    private String agentIdBackPath = "";
+
+    @ApiModelProperty(value = "代理人银行卡号")
+    private String bankCardNo = "";
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/contract/AuthBean.java

@@ -0,0 +1,17 @@
+package com.gree.mall.manager.bean.contract;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class AuthBean {
+
+    @ApiModelProperty(value = "是否跳转链接")
+    private boolean isJump = false;
+
+    @ApiModelProperty(value = "地址")
+    private String url = "";
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/contract/BankInfo.java

@@ -0,0 +1,19 @@
+package com.gree.mall.manager.bean.contract;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class BankInfo {
+
+    @ApiModelProperty(value = "代理人姓名")
+    private String bankName = "";
+
+    @ApiModelProperty(value = "代理人姓名")
+    private String bankId = "";
+
+    @ApiModelProperty(value = "代理人姓名")
+    private String subbranchName = "";
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/contract/CompanyCaAuthVO.java

@@ -0,0 +1,120 @@
+package com.gree.mall.manager.bean.contract;
+
+import com.gree.mall.manager.annotation.ZfireField;
+import com.gree.mall.manager.enums.IsYesNoEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel
+@ZfireField(tbName = "a")
+public class CompanyCaAuthVO {
+
+    @ZfireField(hide = true)
+    private String companyCaAuthId;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "商户id")
+    private String companyWechatId;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "商户名称")
+    private String companyWechatName;
+
+    @ZfireField(tbName = "b")
+    @ApiModelProperty(value = "所属公司")
+    private String belongCompany;
+
+    @ZfireField(tbName = "b")
+    @ApiModelProperty(value = "所属公司编号")
+    private String belongCompanyCode;
+
+    @ApiModelProperty(value = "网点名称")
+    private String websitName;
+
+    @ApiModelProperty(value = "网点编号")
+    private String websitId;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "公司名称")
+    private String companyName;
+
+    @ApiModelProperty(value = "公司地址")
+    private String companyAddress;
+
+    @ApiModelProperty(value = "统一社会信用代码")
+    private String taxNo;
+
+    @ApiModelProperty(value = "营业执照附件")
+    private String businessLicenseUrl;
+
+    @ApiModelProperty(value = "法人")
+    private String legalName;
+
+    @ApiModelProperty(value = "法人联系方式")
+    private String legalMobile;
+
+    @ApiModelProperty(value = "法人身份证")
+    private String legalIdCard;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "法大大客户编号")
+    private String fadadaCustomerId;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "法大大认证交易号")
+    private String fadadaTransactionNo;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "法大大认证地址")
+    private String fadadaAuthUrl;
+
+    @ApiModelProperty(value = "企业认证状态")
+    private IsYesNoEnum fadadaIsAuth;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "法大大授权状态(0：未认证;1：管理员资料已提交;2：企业基本资料(没有申请表)已提交;3：已提交待审核;4：审核通过（认证完成）;5：审核不通过;6：人工初审通过)")
+    private String fadadaStatus;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "法大大不通过原因")
+    private String fadadaAuditFailReason;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "法大大自动签授权交易号")
+    private String fadadaAuthAutoId;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "法大大自动签授权合同编号")
+    private String fadadaAuthAutoContractId;
+
+    @ApiModelProperty(value = "自动签章状态")
+    private IsYesNoEnum fadadaAuthAutoStatus;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "法大大自动签授权地址")
+    private String fadadaAuthAutoUrl;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "法大大自动签授权查看地址")
+    private String fadadaAuthAutoViewpdfUrl;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "法大大自动签授权下载地址")
+    private String fadadaAuthAutoDownloadUrl;
+
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/contract/CompanyInfo.java

@@ -0,0 +1,23 @@
+package com.gree.mall.manager.bean.contract;
+
+import com.fadada.sdk.verify.model.req.CompanyVerifyUrlParams;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel
+public class CompanyInfo extends CompanyVerifyUrlParams.CompanyInfo {
+
+    @ApiModelProperty(value = "企业名称")
+    private String companyName = "";
+
+    @ApiModelProperty(value = "统一社会信用代码")
+    private String creditNo = "";
+
+    @ApiModelProperty(value = "统一社会信用代码证件照路径")
+    private String creditImagePath = "";
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/contract/ContractTemplateBean.java

@@ -0,0 +1,18 @@
+package com.gree.mall.manager.bean.contract;
+
+import com.gree.mall.manager.plus.entity.ContractTemplate;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel
+public class ContractTemplateBean extends ContractTemplate {
+
+    @ApiModelProperty(value = "明细")
+    private List<ContractWebsitBean> items;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/contract/ContractTemplateVO.java

@@ -0,0 +1,70 @@
+package com.gree.mall.manager.bean.contract;
+
+import com.gree.mall.manager.annotation.ZfireField;
+import com.gree.mall.manager.enums.ContractTypeEnum;
+import com.gree.mall.manager.enums.material.StateEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel
+@ZfireField(tbName = "a")
+public class ContractTemplateVO {
+
+    @ZfireField(isShow = false)
+    @ApiModelProperty(value = "合同模版编号")
+    private String contractTemplateId;
+
+//    @ApiModelProperty(value = "商户id")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
+
+    @ApiModelProperty(value = "合同名称")
+    private String contractTemplateName;
+
+//    @ApiModelProperty(value = "模版路径")
+//    private String contractTemplatePdf;
+
+//    @ApiModelProperty(value = "模版图片路径")
+//    private String contractTemplateImg;
+
+    @ApiModelProperty(value = "合同类型")
+    private ContractTypeEnum contractType;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "附件所属主合同id")
+    private String followContractTemplateId;
+
+    @ZfireField(tbName = "b", colName = "contract_template_name", ignoreSelect = true)
+    @ApiModelProperty(value = "附件所属主合同")
+    private String followContractTemplateName;
+
+    @ApiModelProperty(value = "状态")
+    private StateEnum status;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "生效日期")
+    private Date validDate;
+
+    @ApiModelProperty(value = "过期日期")
+    private Date expireDate;
+
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/contract/ContractWebsitBean.java

@@ -0,0 +1,25 @@
+package com.gree.mall.manager.bean.contract;
+
+import com.gree.mall.manager.plus.entity.ContractWebsit;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel
+public class ContractWebsitBean extends ContractWebsit {
+
+    @ApiModelProperty(value = "所属公司")
+    private String belongCompany;
+
+    @ApiModelProperty(value = "所属公司编号")
+    private String belongCompanyCode;
+
+    @ApiModelProperty(value = "上级网点名称")
+    private String parentName;
+
+    @ApiModelProperty(value = "网点名称")
+    private String name;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/contract/LegalInfo.java

@@ -0,0 +1,32 @@
+package com.gree.mall.manager.bean.contract;
+
+import com.fadada.sdk.verify.model.req.CompanyVerifyUrlParams;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel
+public class LegalInfo extends CompanyVerifyUrlParams.LegalInfo {
+
+    @ApiModelProperty(value = "法人姓名")
+    private String legalName = "";
+
+    @ApiModelProperty(value = "法人证件号")
+    private String legalId = "";
+
+    @ApiModelProperty(value = "法人手机号（仅支持国内运营商）")
+    private String legalMobile = "";
+
+    @ApiModelProperty(value = "法人证件正面照下载地址")
+    private String legalIdFrontPath = "";
+
+    @ApiModelProperty(value = "法人证件反面照下载地址")
+    private String legalIdBackPath = "";
+
+    @ApiModelProperty(value = "法人银行卡号")
+    private String bankCardNo = "";
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/contract/SettleRelaConfigVO.java

@@ -0,0 +1,47 @@
+package com.gree.mall.manager.bean.contract;
+
+import com.gree.mall.manager.annotation.ZfireField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+@ZfireField(tbName = "a")
+public class SettleRelaConfigVO {
+
+    @ZfireField(tbName = "b")
+    @ApiModelProperty(value = "所属公司")
+    private String belongCompany;
+
+    @ZfireField(tbName = "b")
+    @ApiModelProperty(value = "所属公司编号")
+    private String belongCompanyCode;
+
+    @ZfireField(tbName = "b", colName = "name", ignoreSelect = true)
+    @ApiModelProperty(value = "一级网点名称")
+    private String parentName;
+
+    @ApiModelProperty(value = "一级网点编号")
+    private String websitId;
+
+    @ZfireField(tbName = "d", colName = "name", ignoreSelect = true)
+    @ApiModelProperty(value = "二级网点名称")
+    private String subName;
+
+    @ZfireField(tbName = "c")
+    @ApiModelProperty(value = "二级网点编号")
+    private String subWebsitId;
+
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+    @ApiModelProperty(value = "创建时间")
+    private String createTime;
+
+    @ApiModelProperty(value = "修改人")
+    private String updateBy;
+
+    @ApiModelProperty(value = "修改时间")
+    private String updateTime;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/contract/WebsitContractSignRecordBean.java

@@ -0,0 +1,19 @@
+package com.gree.mall.manager.bean.contract;
+
+import com.gree.mall.manager.plus.entity.WebsitContractSignItem;
+import com.gree.mall.manager.plus.entity.WebsitContractSignRecord;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel
+public class WebsitContractSignRecordBean extends WebsitContractSignRecord {
+
+    @ApiModelProperty(value = "明细")
+    private List<WebsitContractSignItem> items;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/contract/WebsitContractSignVO.java

@@ -0,0 +1,72 @@
+package com.gree.mall.manager.bean.contract;
+
+import com.gree.mall.manager.annotation.ZfireField;
+import com.gree.mall.manager.enums.IsYesNoEnum;
+import com.gree.mall.manager.enums.contract.SignContractStatusEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel
+@ZfireField(tbName = "a")
+public class WebsitContractSignVO {
+
+    @ZfireField(hide = true)
+    private String id;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "商户id")
+    private String companyWechatId;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "商户名称")
+    private String companyWechatName;
+
+    @ApiModelProperty(value = "所属公司")
+    private String belongCompany;
+
+    @ApiModelProperty(value = "所属公司编号")
+    private String belongCompanyCode;
+
+    @ApiModelProperty(value = "二级网点编号")
+    private String websitId;
+
+    @ApiModelProperty(value = "二级网点名称")
+    private String websitName;
+
+    @ApiModelProperty(value = "一级网点名称")
+    private String parentName;
+
+    @ApiModelProperty(value = "一级网点编号")
+    private String parentId;
+
+    @ApiModelProperty(value = "合同名称")
+    private String contractName;
+
+    @ApiModelProperty(value = "实名状态")
+    private IsYesNoEnum authStatus;
+
+    @ApiModelProperty(value = "审核状态")
+    private SignContractStatusEnum status;
+
+    @ApiModelProperty(value = "签约时间")
+    private Date signTime;
+
+    @ApiModelProperty(value = "签约过期时间")
+    private Date signOverTime;
+
+    @ApiModelProperty(value = "审核人")
+    private String confirmBy;
+
+    @ApiModelProperty(value = "审核时间")
+    private Date confirmTime;
+
+    @ApiModelProperty(value = "失效操作人")
+    private String cancelBy;
+
+    @ApiModelProperty(value = "失效操作时间")
+    private Date cancelTime;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/contract/WebsitFollowConfigBean.java

@@ -0,0 +1,18 @@
+package com.gree.mall.manager.bean.contract;
+
+import com.gree.mall.manager.plus.entity.WebsitFollowConfig;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel
+public class WebsitFollowConfigBean extends WebsitFollowConfig {
+
+    @ApiModelProperty(value = "明细")
+    private List<WebsitFollowConfigItemBean> items;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/contract/WebsitFollowConfigItemBean.java

@@ -0,0 +1,25 @@
+package com.gree.mall.manager.bean.contract;
+
+import com.gree.mall.manager.plus.entity.WebsitFollowConfigItem;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel
+public class WebsitFollowConfigItemBean extends WebsitFollowConfigItem {
+
+    @ApiModelProperty(value = "所属公司")
+    private String belongCompany;
+
+    @ApiModelProperty(value = "所属公司编号")
+    private String belongCompanyCode;
+
+    @ApiModelProperty(value = "网点名称")
+    private String name;
+
+    @ApiModelProperty(value = "网点编号")
+    private String websitId;
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/count/CountBean.java

@@ -0,0 +1,40 @@
+package com.gree.mall.manager.bean.count;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@ApiModel
+@Data
+public class CountBean {
+
+    @ApiModelProperty("累计销售")
+    private Integer total = 0;
+    @ApiModelProperty("已售中商品")
+    private Integer sold = 0;
+    @ApiModelProperty("待发货数量")
+    private Integer dfh = 0;
+    @ApiModelProperty("维权订单数量")
+    private Integer refund = 0;
+    @ApiModelProperty("待审核提现/结算金额")
+    private BigDecimal orderShareAmount;
+    @ApiModelProperty("今日访客数量")
+    private Integer todayVisit = 0;
+    @ApiModelProperty("昨日访客")
+    private Integer yestodayVisit = 0;
+    @ApiModelProperty("今日订单数")
+    private Integer todayOrder = 0;
+    @ApiModelProperty("昨日订单数")
+    private Integer yestodayOrder = 0;
+    @ApiModelProperty("今日收益")
+    private BigDecimal todayProfit = new BigDecimal(0);
+    @ApiModelProperty("昨日收益")
+    private BigDecimal yestodayProfit = new BigDecimal(0);
+    @ApiModelProperty("下单转化率")
+    private BigDecimal orderTax = new BigDecimal(0);
+
+
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/count/CountOrderBean.java

@@ -0,0 +1,25 @@
+package com.gree.mall.manager.bean.count;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@ApiModel
+@Data
+public class CountOrderBean {
+
+    @ApiModelProperty("成交量")
+    private Integer orderNum = 0;
+    @ApiModelProperty("成交额")
+    private BigDecimal amount = new BigDecimal(0);
+    @ApiModelProperty("人均消费")
+    private BigDecimal avgAmount = new BigDecimal(0);
+
+    @ApiModelProperty("x轴")
+    private String[] x;
+    //各时段订单数
+    private int[] countAry ;
+
+}

mall-server-sync-api/src/main/java/com/gree/mall/manager/bean/count/EsCountBean.java

@@ -0,0 +1,38 @@
+package com.gree.mall.manager.bean.count;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class EsCountBean {
+
+    @ApiModelProperty("累计销售")
+    private Integer total = 0;
+    @ApiModelProperty("已售中商品")
+    private Integer sold = 0;
+    @ApiModelProperty("待发货数量")
+    private Integer dfh = 0;
+    @ApiModelProperty("维权订单数量")
+    private Integer refund = 0;
+//    @ApiModelProperty("待审核提现/结算金额")
+//    private BigDecimal orderShareAmount;
+    @ApiModelProperty("今日访客数量")
+    private Integer todayVisit = 0;
+    @ApiModelProperty("昨日访客")
+    private Integer yestodayVisit = 0;
+    @ApiModelProperty("今日订单数")
+    private Integer todayOrder = 0;
+    @ApiModelProperty("昨日订单数")
+    private Integer yestodayOrder = 0;
+    @ApiModelProperty("今日收益")
+    private BigDecimal todayProfit = new BigDecimal(0);
+    @ApiModelProperty("昨日收益")
+    private BigDecimal yestodayProfit = new BigDecimal(0);
+    @ApiModelProperty("下单转化率")
+    private BigDecimal orderTax = new BigDecimal(0);
+
+
+
+}