no message

.gitignore

@@ -0,0 +1,40 @@
+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.zfire.mall/manager/plus/
+/src/test/
+.DS_Store
+logs/
+src/main/java/com/zfire/mall/manager/plus/
+.mvn/

mvnw

@@ -0,0 +1,310 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   M2_HOME - location of maven2's installed home dir
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+  if [ -f /etc/mavenrc ] ; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ] ; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
+  Darwin*) darwin=true
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+    if [ -z "$JAVA_HOME" ]; then
+      if [ -x "/usr/libexec/java_home" ]; then
+        export JAVA_HOME="`/usr/libexec/java_home`"
+      else
+        export JAVA_HOME="/Library/Java/Home"
+      fi
+    fi
+    ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+  if [ -r /etc/gentoo-release ] ; then
+    JAVA_HOME=`java-config --jre-home`
+  fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+  ## resolve links - $0 may be a link to maven's home
+  PRG="$0"
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+      PRG="$link"
+    else
+      PRG="`dirname "$PRG"`/$link"
+    fi
+  done
+
+  saveddir=`pwd`
+
+  M2_HOME=`dirname "$PRG"`/..
+
+  # make it fully qualified
+  M2_HOME=`cd "$M2_HOME" && pwd`
+
+  cd "$saveddir"
+  # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --unix "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME="`(cd "$M2_HOME"; pwd)`"
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="`which javac`"
+  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=`which readlink`
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+      if $darwin ; then
+        javaHome="`dirname \"$javaExecutable\"`"
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+      else
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
+      fi
+      javaHome="`dirname \"$javaExecutable\"`"
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="`which java`"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+  if [ -z "$1" ]
+  then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while [ "$wdir" != '/' ] ; do
+    if [ -d "$wdir"/.mvn ] ; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=`cd "$wdir/.."; pwd`
+    fi
+    # end of workaround
+  done
+  echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    echo "$(tr -s '\n' ' ' < "$1")"
+  fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+  exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Found .mvn/wrapper/maven-wrapper.jar"
+    fi
+else
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+    fi
+    if [ -n "$MVNW_REPOURL" ]; then
+      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    else
+      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    fi
+    while IFS="=" read key value; do
+      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+      esac
+    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Downloading from: $jarUrl"
+    fi
+    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+    if $cygwin; then
+      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+    fi
+
+    if command -v wget > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found wget ... using wget"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            wget "$jarUrl" -O "$wrapperJarPath"
+        else
+            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+        fi
+    elif command -v curl > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found curl ... using curl"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            curl -o "$wrapperJarPath" "$jarUrl" -f
+        else
+            curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+        fi
+
+    else
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Falling back to using Java to download"
+        fi
+        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        # For Cygwin, switch paths to Windows format before running javac
+        if $cygwin; then
+          javaClass=`cygpath --path --windows "$javaClass"`
+        fi
+        if [ -e "$javaClass" ]; then
+            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Compiling MavenWrapperDownloader.java ..."
+                fi
+                # Compiling the Java class
+                ("$JAVA_HOME/bin/javac" "$javaClass")
+            fi
+            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                # Running the downloader
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Running MavenWrapperDownloader.java ..."
+                fi
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+            fi
+        fi
+    fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+  echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

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%

pom.xml

@@ -0,0 +1,264 @@
+<?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>supply_job</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>supply_job</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>
+<!--            <version>RELEASE</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.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>2.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+            <version>3.1.2</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>
+
+        <!--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>
+
+        <!--okhttp3-->
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.0.1</version>
+        </dependency>
+        <!--fastjson-->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.59</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>
+        <!-- 支持 @ConfigurationProperties 注解 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </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>org.springframework</groupId>
+            <artifactId>spring-mock</artifactId>
+            <version>2.0.8</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.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>-->
+        <!-- hutool工具 -->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.0.M4</version>
+        </dependency>
+
+        <!-- 校验工具 -->
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>6.1.6.Final</version>
+        </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>
+                <version>2.3.10.RELEASE</version>
+            </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>

src/main/java/com/zfire/mall/manager/ManagerApplication.java

@@ -0,0 +1,31 @@
+package com.zfire.mall.manager;
+
+import com.zfire.mall.manager.utils.ApplicationContextUtils;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.ApplicationContext;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+@SpringBootApplication
+@ServletComponentScan(basePackages = {"com.zfire.mall.manager"})
+@EnableAsync
+@EnableScheduling
+//@EnableFeignClients
+//@EnableDiscoveryClient
+@EnableCaching
+@MapperScan(basePackages = {
+        "com.zfire.mall.manager.plus.mapper",
+        "com.zfire.mall.manager.commonmapper.*"
+})
+public class ManagerApplication {
+
+    public static void main(String[] args) {
+        ApplicationContext context = SpringApplication.run(ManagerApplication.class, args);
+        ApplicationContextUtils.setApplicationContext(context);
+    }
+
+}

src/main/java/com/zfire/mall/manager/annotation/ApiNotAuth.java

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

src/main/java/com/zfire/mall/manager/bean/admin/AdminModuleTree.java

@@ -0,0 +1,21 @@
+package com.zfire.mall.manager.bean.admin;
+
+import com.zfire.mall.manager.plus.entity.AdminModule;
+import com.zfire.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;
+
+}

src/main/java/com/zfire/mall/manager/bean/admin/AdminUserBean.java

@@ -0,0 +1,32 @@
+package com.zfire.mall.manager.bean.admin;
+
+import com.zfire.mall.manager.plus.entity.AdminUser;
+import com.zfire.mall.manager.plus.entity.AdminUserBindEngin;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class AdminUserBean extends AdminUser {
+
+    @ApiModelProperty("工程机地址")
+    private String enginSysUrl;
+    @ApiModelProperty("token")
+    private String token;
+    @ApiModelProperty("部门id集合")
+    private List<String> adminWebsitIds;
+    @ApiModelProperty("经销商存货分类")
+    public List<String> mainNames;
+    @ApiModelProperty("是否折让")
+    private Boolean isZr;
+
+    @ApiModelProperty("绑定仓库")
+    private String[] stockCorrespondList;
+
+    @ApiModelProperty("已绑定工程账号")
+    private List<AdminUserBindEngin> bindEnginList;
+
+}

src/main/java/com/zfire/mall/manager/bean/admin/AdminUserCom.java

@@ -0,0 +1,44 @@
+package com.zfire.mall.manager.bean.admin;
+
+import com.zfire.mall.manager.plus.entity.AdminUser;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AdminUserCom extends AdminUser {
+
+
+    @ApiModelProperty("拥有的部门权限id")
+    private List<String> adminWebsitIds;
+    @ApiModelProperty("有用的企业权限ids")
+    private List<String> adminCompanyIds;
+    @ApiModelProperty("只读帐号")
+    private Boolean onlyRead = false;
+
+    @ApiModelProperty("用户所属部门")
+    private String adminWebsitId;
+    @ApiModelProperty("用户所属部门名称")
+    private String adminWebsitName;
+    @ApiModelProperty("当前登录人企业微信id")
+    private String loginCompanyId;
+    @ApiModelProperty("当前登录人企业名称")
+    private String loginCompanyName;
+    @ApiModelProperty("金蝶企业编号")
+    private String useOrgNumber;
+    @ApiModelProperty("金蝶企业名称")
+    private String useOrgName;
+    @ApiModelProperty("金蝶企业编号")
+    private List<String> useOrgNumbers;
+
+    @ApiModelProperty("是否为财务")
+    private Boolean isCw;
+
+//    @ApiModelProperty("工程用户id")
+//    private List<Integer> enginUserIds;
+//    @ApiModelProperty("已绑定工程账号")
+//    private List<AdminUserBindEngin> bindEnginList;
+    @ApiModelProperty("所有子级的业务员")
+    private List<String> serviceIds;
+}

src/main/java/com/zfire/mall/manager/bean/admin/AdminWebsitBean.java

@@ -0,0 +1,11 @@
+package com.zfire.mall.manager.bean.admin;
+
+import com.zfire.mall.manager.plus.entity.AdminUser;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class AdminWebsitBean extends AdminUser {
+
+}

src/main/java/com/zfire/mall/manager/bean/admin/AdminWebsitTree.java

@@ -0,0 +1,18 @@
+package com.zfire.mall.manager.bean.admin;
+
+import com.zfire.mall.manager.plus.entity.AdminWebsit;
+import com.zfire.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;
+
+}

src/main/java/com/zfire/mall/manager/bean/admin/NoticeRecordReadBean.java

@@ -0,0 +1,15 @@
+package com.zfire.mall.manager.bean.admin;
+
+import com.zfire.mall.manager.plus.entity.NoticeRecord;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class NoticeRecordReadBean extends NoticeRecord {
+
+    @ApiModelProperty("已读取总人数")
+    private Integer readCount;
+
+}

src/main/java/com/zfire/mall/manager/bean/admin/reqDto/AdminCompanyWechatReqBean.java

@@ -0,0 +1,15 @@
+package com.zfire.mall.manager.bean.admin.reqDto;
+
+import com.zfire.mall.manager.plus.entity.AdminCompany;
+import com.zfire.mall.manager.plus.entity.AdminUser;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value="AdminCompanyWechatReqBean对象", description="新增商户dto")
+public class AdminCompanyWechatReqBean extends AdminCompany {
+
+    @ApiModelProperty(value = "企业负责人")
+    private AdminUser adminUser;
+}

src/main/java/com/zfire/mall/manager/bean/admin/reqDto/AdminCompanyWechatUpdateReqDto.java

@@ -0,0 +1,21 @@
+package com.zfire.mall.manager.bean.admin.reqDto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value="AdminCompanyWechatUpdateReqDto对象", description="编辑商户dto")
+public class AdminCompanyWechatUpdateReqDto {
+
+    @ApiModelProperty(value = "企业的微信配置id")
+    private String companyWechatId;
+    @ApiModelProperty(value = "主log")
+    private String mainLog;
+    @ApiModelProperty("通用loc")
+    private String commonLog;
+    @ApiModelProperty("头像log")
+    private String minLogo;
+}

src/main/java/com/zfire/mall/manager/bean/admin/reqDto/AdminUserAddReqBean.java

@@ -0,0 +1,24 @@
+package com.zfire.mall.manager.bean.admin.reqDto;
+
+import com.zfire.mall.manager.plus.entity.AdminUser;
+import com.zfire.mall.manager.plus.entity.AdminUser;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel(value="AdminUserAddBean对象", description="新增用户对象")
+public class AdminUserAddReqBean extends AdminUser {
+
+    @ApiModelProperty("部门id集合")
+    private List<String> adminWebsitIds;
+    @ApiModelProperty("父经销商id")
+    private String parentCustomerId;
+    @ApiModelProperty("是否折让 true/false")
+    private Boolean isZr;
+
+    @ApiModelProperty("绑定对应仓库id")
+    private List<String> correspondIds;
+}

src/main/java/com/zfire/mall/manager/bean/admin/respDto/AdminCompanyWechatRespPageBean.java

@@ -0,0 +1,36 @@
+package com.zfire.mall.manager.bean.admin.respDto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.zfire.mall.manager.plus.entity.AdminCompany;
+import com.zfire.mall.manager.plus.entity.AdminUser;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(description = "商戶列表响应bean")
+@Data
+public class AdminCompanyWechatRespPageBean extends AdminCompany {
+
+    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 = "地址")
+    private String address;
+    @ApiModelProperty(value = "状态: true=正常  false=冻结")
+    private Boolean status;
+
+}

src/main/java/com/zfire/mall/manager/bean/admin/respDto/AdminUserDto.java

@@ -0,0 +1,23 @@
+package com.zfire.mall.manager.bean.admin.respDto;
+
+import com.zfire.mall.manager.plus.entity.AdminUser;
+import com.zfire.mall.manager.plus.entity.StockCorrespond;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class AdminUserDto extends AdminUser {
+
+    @ApiModelProperty("金蝶商户编号")
+    private String useOrgNumber;
+    @ApiModelProperty("金蝶商户名称")
+    private String useOrgName;
+
+    @ApiModelProperty("绑定仓库")
+    private String[] stockCorrespondList;
+
+}

src/main/java/com/zfire/mall/manager/bean/admin/respDto/AdminWebsitDto.java

@@ -0,0 +1,18 @@
+package com.zfire.mall.manager.bean.admin.respDto;
+
+import com.zfire.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 AdminWebsitDto extends AdminWebsit {
+
+    @ApiModelProperty("所属业务线")
+    private List<String> mainIds;
+
+
+}

src/main/java/com/zfire/mall/manager/bean/front/CallBackItemDTO.java

@@ -0,0 +1,27 @@
+package com.zfire.mall.manager.bean.front;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author changelin
+ */
+@ApiModel
+@Data
+public class CallBackItemDTO {
+
+    @ApiModelProperty(value = "回调类型枚举")
+    private String callBackType;
+
+    @ApiModelProperty(value = "创建时间")
+    private List<CallBackItemList> callBackItemList;
+
+
+
+
+
+
+}

src/main/java/com/zfire/mall/manager/bean/front/CallBackItemList.java

@@ -0,0 +1,17 @@
+package com.zfire.mall.manager.bean.front;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@ApiModel
+@Data
+public class CallBackItemList {
+
+    @ApiModelProperty(value = "回调id")
+    private Integer itemId;
+
+    @ApiModelProperty(value = "状态")
+    private String status;
+}

src/main/java/com/zfire/mall/manager/bean/front/CostBillVO.java

@@ -0,0 +1,199 @@
+package com.zfire.mall.manager.bean.front;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.zfire.mall.manager.plus.entity.CostBill;
+import com.zfire.mall.manager.plus.entity.CostTicketBill;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author gejiang
+ * @since 2023-04-08
+ */
+@ApiModel
+@Data
+public class CostBillVO   {
+
+
+    @ApiModelProperty(value = "账单唯一id")
+    private String id;
+
+
+    @ApiModelProperty(value = "账单唯一id")
+    private String ticketCode;
+
+    @ApiModelProperty(value = "嘉贤创建时间")
+    private Long createTime;
+
+    @ApiModelProperty(value = "产品名称")
+    private String materialName;
+
+    @ApiModelProperty(value = "物料名称")
+    private String materialCode;
+
+    @ApiModelProperty(value = "规格型号")
+    private String materialSpecification;
+
+    @ApiModelProperty(value = "物料类型")
+    private String materialType;
+
+    @ApiModelProperty(value = "订单号，物流单号或销售单号")
+    private String orderCode;
+
+    @ApiModelProperty(value = "退货单号")
+    private String returnOrderCode;
+
+    @ApiModelProperty(value = "商家编码")
+    private String merchantCode;
+
+    @ApiModelProperty(value = "商家名称")
+    private String merchantName;
+
+    @ApiModelProperty(value = "所属销售公司类型,GE_JIANG(格匠)GUANG_ZHOU(广州销售公司)FO_SHAN(佛山销售公司)OTHER(其他销售公司)")
+    private String belongCompanyType;
+
+    @ApiModelProperty(value = "订单类型。TOB(商家机工程机类型)，ALL(所有类型，广州的订单统一开单价)，TOC(销售订单类型)")
+    private String orderType;
+
+    @ApiModelProperty(value = "客户名称")
+    private String customerName;
+
+    @ApiModelProperty(value = "客户电话")
+    private String customerPhone;
+
+    @ApiModelProperty(value = "发货仓库编码")
+    private String warehouseCode;
+
+    @ApiModelProperty(value = " 发货仓库名称")
+    private String warehouseName;
+
+    @ApiModelProperty(value = "收货送货地址")
+    private String receiptAddress;
+
+    @ApiModelProperty(value = "订单类型细分。PICKING_UP_ORDER(前置仓提货订单)SALE_ORDER(销售订单),MERCHANT_WAREHOUSE_ORDER(商家仓订单)PROJECT_ORDER(工程机订单)SALE_RETURN_ORDER(销售退货单),")
+    private String orderTypeDetail;
+
+    @ApiModelProperty(value = "物料计费分类，空调生活家电等")
+    private String materialCostType;
+
+    @ApiModelProperty(value = "运费结算系数")
+    private BigDecimal coefficient;
+
+    @ApiModelProperty(value = "补贴结算系数")
+    private BigDecimal subsidyCoefficient;
+
+    @ApiModelProperty(value = "卸货上楼结算系数")
+    private BigDecimal unloadUpstairsCoefficient;
+
+    @ApiModelProperty(value = "退货订单按单价计算")
+    private BigDecimal unitPrice;
+
+    @ApiModelProperty(value = "最终算出来的运费")
+    private BigDecimal cost;
+
+    @ApiModelProperty(value = "补贴费用，补贴系数*开单价")
+    private BigDecimal allowanceCost;
+
+    @ApiModelProperty(value = "上楼卸货费用，上楼结算系数* 开单价")
+    private BigDecimal unloadUpstairsCost;
+
+    @ApiModelProperty(value = "费用汇总，前面三个费用相加")
+    private BigDecimal totalCost;
+
+    @ApiModelProperty(value = "备注")
+    private String comment;
+
+    @ApiModelProperty(value = "订单时间")
+    private String orderDate;
+
+    @ApiModelProperty(value = "无法生成的原因")
+    private String errorResult;
+
+    @ApiModelProperty(value = " 是否已经对过帐")
+    private String isAccountChecking;
+
+    @ApiModelProperty(value = " 是否已经审核")
+    private String isAudit;
+
+    @ApiModelProperty(value = " 是否卸货")
+    private String isUnload;
+
+    @ApiModelProperty(value = " 是否上楼")
+    private String isUpstairs;
+
+    @ApiModelProperty(value = " 实际是否卸货")
+    private String isRealUnload;
+
+    @ApiModelProperty(value = "实际是否上楼")
+    private String isRealUpstairs;
+
+    @ApiModelProperty(value = "是否完结 0 未完结，1 已经完结")
+    private Integer isFinish;
+
+
+    @ApiModelProperty(value = "上个版本订单编码")
+    private String lastBillCode;
+
+    @ApiModelProperty(value = "商家对账单编号")
+    private String merchantCheckCode;
+
+    @ApiModelProperty(value = "销司对账单编号")
+    private String salesCheckCode;
+
+    @ApiModelProperty(value = "订单流程")
+    private String processStatus;
+
+    @ApiModelProperty(value = "GE_JIANG,//所属哪一个销售公司计费规则，GE_JIANG(格 匠 ),GUANG_ZHOU( 广 州 销 售 公 司 ),FO_SHAN(佛山销售公司),OTHER(其他销售公司")
+    private String belongCompanyCostRule;
+
+    @ApiModelProperty(value = "物料开单价")
+    private BigDecimal materialPrice;
+
+    @ApiModelProperty(value = "是否已经被删除")
+    private String isDelete;
+
+    @ApiModelProperty(value = "0")
+    private String createOrg;
+
+    @ApiModelProperty(value = "0")
+    private String updateOrg;
+
+    @ApiModelProperty(value = "更新人")
+    private String updateUser;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUser;
+
+    @ApiModelProperty(value = "订单编号")
+    private String billCode;
+
+    @ApiModelProperty(value = "销售类型名称")
+    private String saleType;
+
+    @ApiModelProperty(value = "供应链发货单号")
+    private String saleCode;
+
+    @ApiModelProperty(value = "商家费用汇总")
+    private String merchantCostSum;
+
+    @ApiModelProperty(value = "格力比例扣返利")
+    private String geliRebate;
+
+
+    @ApiModelProperty(value = "项目类别")
+    private String refProjectCategory;
+
+    @ApiModelProperty(value = "提货密钥")
+    private String goodsPickingKey;
+
+
+}

src/main/java/com/zfire/mall/manager/bean/front/CostMerchantCheckCodeList.java

@@ -0,0 +1,24 @@
+package com.zfire.mall.manager.bean.front;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author gejiang
+ * @since 2023-04-08
+ */
+@ApiModel
+@Data
+public class CostMerchantCheckCodeList {
+
+
+    @ApiModelProperty(value = "list")
+    private List<String> costMerchantCheckCodeList;
+}

src/main/java/com/zfire/mall/manager/bean/front/CostMerchantVO.java

@@ -0,0 +1,163 @@
+package com.zfire.mall.manager.bean.front;
+
+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.zfire.mall.manager.plus.entity.CostMerchant;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author gejiang
+ * @since 2023-04-08
+ */
+@ApiModel
+@Data
+public class CostMerchantVO   {
+
+
+    @ApiModelProperty(value = "30")
+    @TableId(value = "id", type = IdType.ID_WORKER_STR)
+    private String id;
+
+    @ApiModelProperty(value = "商家对账单编码")
+    private String merchantCheckCode;
+
+    @ApiModelProperty(value = "销司对账单编码")
+    private String salesCheckCode;
+
+    @ApiModelProperty(value = "商家编码")
+    private String merchantCode;
+
+    @ApiModelProperty(value = "商家名称")
+    private String merchantName;
+
+    @ApiModelProperty(value = "对账人")
+    private String checkMan;
+
+    @ApiModelProperty(value = "对账时间")
+    private Long checkTime;
+
+    @ApiModelProperty(value = "对账时间")
+    private Date checkTimeSupply;
+
+    @ApiModelProperty(value = "自动核对时间。商家长时间不确认，系统自动确认")
+    private Long autoCheckTime;
+
+    @ApiModelProperty(value = "自动核对时间。商家长时间不确认，系统自动确认")
+    private Date autoCheckTimeSupply;
+
+    @ApiModelProperty(value = "退货订单费用汇总")
+    private BigDecimal totalReturnOrderCost;
+
+    @ApiModelProperty(value = "一般算出来的运费")
+    private BigDecimal totalMerchantCost;
+
+    @ApiModelProperty(value = "补贴费用，补贴系数*开单价")
+    private BigDecimal totalAllowanceCost;
+
+    @ApiModelProperty(value = "上楼卸货费用，上楼结算系数*开单价")
+    private BigDecimal totalUnloadUpstairsCost;
+
+    @ApiModelProperty(value = "费用汇总，前面四个费用相加")
+    private BigDecimal totalCost;
+
+    @ApiModelProperty(value = "对账时间范围的开始时间")
+    private Long startTime;
+
+    @ApiModelProperty(value = "对账时间范围的开始时间")
+    private Date startTimeSupply;
+
+    @ApiModelProperty(value = "对账时间范围的结束时间")
+    private Long endTime;
+
+    @ApiModelProperty(value = "对账时间范围的结束时间")
+    private Date endTimeSupply;
+
+    @ApiModelProperty(value = "备注")
+    private String comment;
+
+    @ApiModelProperty(value = "0")
+    private String createOrg;
+
+    @ApiModelProperty(value = "0")
+    private String updateOrg;
+
+    @ApiModelProperty(value = "更新人")
+    private String updateUser;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUser;
+
+    @ApiModelProperty(value = "更新时间")
+    private Long updateTime;
+
+    @ApiModelProperty(value = "创建时间")
+    private Long createTime;
+
+    @ApiModelProperty(value = "是否已经被删除")
+    private String isDelete;
+
+    @ApiModelProperty(value = "流程状态")
+    private String processStatus;
+
+
+    @ApiModelProperty(value = "商家费用汇总")
+    private String merchantCostSum;
+
+    @ApiModelProperty(value = "格力比例扣返利")
+    private String geliRebate;
+
+    @ApiModelProperty(value = "仓储物流费")
+    private BigDecimal toccost;
+
+    @ApiModelProperty(value = "工程费")
+    private BigDecimal tobcost;
+
+    @ApiModelProperty(value = "TOC 补贴费用")
+    private BigDecimal tocallowanceCost;
+
+    @ApiModelProperty(value = "TOB补贴费用")
+    private BigDecimal toballowanceCost;
+
+    @ApiModelProperty(value = "所属月份账单")
+    private String costTerm;
+
+    @ApiModelProperty(value = "发起商家对账时间")
+    private String startMerchantCheckTime;
+
+    @ApiModelProperty(value = "发起商家对账时间")
+    private String startSalesCheckTime;
+
+    @ApiModelProperty(value = "发起商家对账时间")
+    private Date startMerchantCheckTimeSupply;
+
+    @ApiModelProperty(value = "发起商家对账时间")
+    private Date startSalesCheckTimeSupply;
+
+    @ApiModelProperty(value = "其他费用")
+    private BigDecimal otherCost;
+
+    @ApiModelProperty(value = "其他费用附件url地址")
+    private String otherCostAttachmentUrl;
+
+    @ApiModelProperty(value = "商家所属销售公司名称")
+    private String belongSalesCompanyName;
+
+    @ApiModelProperty(value = "商家所属销售公司名称编号")
+    private String belongSalesCompanyCode;
+
+    @ApiModelProperty(value = "商家简称")
+    private String merchantShortName;
+
+
+}

src/main/java/com/zfire/mall/manager/bean/front/CostSalesCheckCodeList.java

@@ -0,0 +1,24 @@
+package com.zfire.mall.manager.bean.front;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author gejiang
+ * @since 2023-04-08
+ */
+@ApiModel
+@Data
+public class CostSalesCheckCodeList {
+
+
+    @ApiModelProperty(value = "list")
+    private List<String> costSalesCheckCodeList;
+}

src/main/java/com/zfire/mall/manager/bean/front/CostSalesVO.java

@@ -0,0 +1,146 @@
+package com.zfire.mall.manager.bean.front;
+
+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.zfire.mall.manager.plus.entity.CostSales;
+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 CostSalesVO    {
+
+
+    @ApiModelProperty(value = "30")
+    private String id;
+
+    @ApiModelProperty(value = "销司对账单编码")
+    private String salesCheckCode;
+
+    @ApiModelProperty(value = "销售公司名称")
+    private String salesCompanyCode;
+
+    @ApiModelProperty(value = "销售公司编码")
+    private String salesCompanyName;
+
+    @ApiModelProperty(value = "对账人")
+    private String checkMan;
+
+    @ApiModelProperty(value = "对账时间")
+    private Long checkTime;
+
+    @ApiModelProperty(value = "对账时间")
+    private Date checkTimeSupply;
+
+    @ApiModelProperty(value = "自动核对时间。商家长时间不确认，系统自动确认")
+    private Long autoCheckTime;
+
+    @ApiModelProperty(value = "自动核对时间。商家长时间不确认，系统自动确认")
+    private Date autoCheckTimeSupply;
+
+    @ApiModelProperty(value = "退货订单费用汇总")
+    private BigDecimal totalReturnOrderCost;
+
+    @ApiModelProperty(value = "一般算出来的运费")
+    private BigDecimal totalMerchantCost;
+
+    @ApiModelProperty(value = "补贴费用，补贴系数*开单价")
+    private BigDecimal totalAllowanceCost;
+
+    @ApiModelProperty(value = "上楼卸货费用，上楼结算系数*开单价")
+    private BigDecimal totalUnloadUpstairsCost;
+
+    @ApiModelProperty(value = "费用汇总，前面四个费用相加")
+    private BigDecimal totalCost;
+
+    @ApiModelProperty(value = "对账时间范围的开始时间")
+    private Long startTime;
+
+    @ApiModelProperty(value = "对账时间范围的开始时间")
+    private Date startTimeSupply;
+
+    @ApiModelProperty(value = "对账时间范围的结束时间")
+    private Long endTime;
+
+    @ApiModelProperty(value = "对账时间范围的结束时间")
+    private Date endTimeSupply;
+
+    @ApiModelProperty(value = "备注")
+    private String comment;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+
+    @ApiModelProperty(value = "0")
+    private String createOrg;
+
+    @ApiModelProperty(value = "0")
+    private String updateOrg;
+
+    @ApiModelProperty(value = "更新人")
+    private String updateUser;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUser;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+
+    private Date costCreateTime;
+
+    private Date costUpdateTime;
+
+    @ApiModelProperty(value = "是否已经被删除")
+    private String isDelete;
+
+    @ApiModelProperty(value = "流程状态")
+    private String processStatus;
+
+
+
+    @ApiModelProperty(value = "其他费用")
+    private BigDecimal otherCost;
+
+    @ApiModelProperty(value = "商家费用汇总")
+    private String merchantCostSum;
+
+    @ApiModelProperty(value = "格力比例扣返利")
+    private String geliRebate;
+
+    @ApiModelProperty(value = "仓储物流费")
+    private BigDecimal toccost;
+
+    @ApiModelProperty(value = "工程费")
+    private BigDecimal tobcost;
+
+    @ApiModelProperty(value = "TOC 补贴费用")
+    private BigDecimal tocallowanceCost;
+
+    @ApiModelProperty(value = "TOB补贴费用")
+    private BigDecimal toballowanceCost;
+
+    @ApiModelProperty(value = "格力应付嘉贤费用")
+    private BigDecimal shouldPayCost;
+
+    @ApiModelProperty(value = "账期")
+    private String costTerm;
+
+    @ApiModelProperty(value = "销司简称")
+    private String salesCompanyShortName;
+
+    @ApiModelProperty(value = "发起销司对账时间")
+    private String startSalesCheckTime;
+
+    @ApiModelProperty(value = "发起销司对账时间")
+    private Date startSalesCheckTimeSupply;
+
+
+}

src/main/java/com/zfire/mall/manager/bean/front/CostTicketBillVO.java

@@ -0,0 +1,174 @@
+package com.zfire.mall.manager.bean.front;
+
+import com.zfire.mall.manager.plus.entity.CostTicketBill;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author gejiang
+ * @since 2023-04-08
+ */
+@ApiModel
+@Data
+public class CostTicketBillVO   {
+
+
+    @ApiModelProperty(value = "账单唯一id")
+    private String id;
+
+    @ApiModelProperty(value = "工单编号")
+    private String ticketCode;
+
+    @ApiModelProperty(value = "嘉贤创建时间")
+    private Long createTime;
+
+    @ApiModelProperty(value = "产品名称")
+    private String materialName;
+
+    @ApiModelProperty(value = "物料名称")
+    private String materialCode;
+
+    @ApiModelProperty(value = "规格型号")
+    private String materialSpecification;
+
+    @ApiModelProperty(value = "物料类型")
+    private String materialType;
+
+    @ApiModelProperty(value = "订单号，物流单号或销售单号")
+    private String orderCode;
+
+    @ApiModelProperty(value = "退货单号")
+    private String returnOrderCode;
+
+    @ApiModelProperty(value = "商家编码")
+    private String merchantCode;
+
+    @ApiModelProperty(value = "商家名称")
+    private String merchantName;
+
+    @ApiModelProperty(value = "所属销售公司类型,GE_JIANG(格匠)GUANG_ZHOU(广州销售公司)FO_SHAN(佛山销售公司)OTHER(其他销售公司)")
+    private String belongCompanyType;
+
+    @ApiModelProperty(value = "订单类型。TOB(商家机工程机类型)，ALL(所有类型，广州的订单统一开单价)，TOC(销售订单类型)")
+    private String orderType;
+
+    @ApiModelProperty(value = "客户名称")
+    private String customerName;
+
+    @ApiModelProperty(value = "客户电话")
+    private String customerPhone;
+
+    @ApiModelProperty(value = "发货仓库编码")
+    private String warehouseCode;
+
+    @ApiModelProperty(value = " 发货仓库名称")
+    private String warehouseName;
+
+    @ApiModelProperty(value = "收货送货地址")
+    private String receiptAddress;
+
+    @ApiModelProperty(value = "订单类型细分。PICKING_UP_ORDER(前置仓提货订单)SALE_ORDER(销售订单),MERCHANT_WAREHOUSE_ORDER(商家仓订单)PROJECT_ORDER(工程机订单)SALE_RETURN_ORDER(销售退货单),")
+    private String orderTypeDetail;
+
+    @ApiModelProperty(value = "物料计费分类，空调生活家电等")
+    private String materialCostType;
+
+    @ApiModelProperty(value = "运费结算系数")
+    private BigDecimal coefficient;
+
+    @ApiModelProperty(value = "补贴结算系数")
+    private BigDecimal subsidyCoefficient;
+
+    @ApiModelProperty(value = "卸货上楼结算系数")
+    private BigDecimal unloadUpstairsCoefficient;
+
+    @ApiModelProperty(value = "退货订单按单价计算")
+    private BigDecimal unitPrice;
+
+    @ApiModelProperty(value = "最终算出来的运费")
+    private BigDecimal cost;
+
+    @ApiModelProperty(value = "补贴费用，补贴系数*开单价")
+    private BigDecimal allowanceCost;
+
+    @ApiModelProperty(value = "上楼卸货费用，上楼结算系数* 开单价")
+    private BigDecimal unloadUpstairsCost;
+
+    @ApiModelProperty(value = "费用汇总，前面三个费用相加")
+    private BigDecimal totalCost;
+
+    @ApiModelProperty(value = "备注")
+    private String comment;
+
+    @ApiModelProperty(value = "订单时间")
+    private String orderDate;
+
+    @ApiModelProperty(value = "无法生成的原因")
+    private String errorResult;
+
+    @ApiModelProperty(value = " 是否已经对过帐")
+    private String isAccountChecking;
+
+    @ApiModelProperty(value = " 是否已经审核")
+    private String isAudit;
+
+    @ApiModelProperty(value = " 是否卸货")
+    private String isUnload;
+
+    @ApiModelProperty(value = " 是否上楼")
+    private String isUpstairs;
+
+    @ApiModelProperty(value = " 实际是否卸货")
+    private String isRealUnload;
+
+    @ApiModelProperty(value = "实际是否上楼")
+    private String isRealUpstairs;
+
+    @ApiModelProperty(value = "是否完结 0 未完结，1 已经完结")
+    private Integer isFinish;
+
+
+    @ApiModelProperty(value = "上个版本订单编码")
+    private String lastBillCode;
+
+    @ApiModelProperty(value = "商家对账单编号")
+    private String merchanCheckCode;
+
+    @ApiModelProperty(value = "销司对账单编号")
+    private String salesCheckCode;
+
+    @ApiModelProperty(value = "订单流程")
+    private String processStatus;
+
+    @ApiModelProperty(value = "GE_JIANG,//所属哪一个销售公司计费规则，GE_JIANG(格 匠 ),GUANG_ZHOU( 广 州 销 售 公 司 ),FO_SHAN(佛山销售公司),OTHER(其他销售公司")
+    private String belongCompanyCostRule;
+
+    @ApiModelProperty(value = "物料开单价")
+    private BigDecimal materialPrice;
+
+    @ApiModelProperty(value = "是否已经被删除")
+    private String isDelete;
+
+    @ApiModelProperty(value = "0")
+    private String createOrg;
+
+    @ApiModelProperty(value = "0")
+    private String updateOrg;
+
+    @ApiModelProperty(value = "更新人")
+    private String updateUser;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUser;
+
+    @ApiModelProperty(value = "订单编号")
+    private String billCode;
+
+}

src/main/java/com/zfire/mall/manager/bean/front/CostTicketVO.java

@@ -0,0 +1,90 @@
+package com.zfire.mall.manager.bean.front;
+
+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.zfire.mall.manager.plus.entity.CostTicket;
+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;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author gejiang
+ * @since 2023-04-08
+ */
+@ApiModel
+@Data
+public class CostTicketVO{
+
+
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "工单编号")
+    private String ticketCode;
+
+    @ApiModelProperty(value = "工单类型,MERCHANT_CHECK(商家对账),SALES_CHECK(销司对账)")
+    private String ticketType;
+
+    @ApiModelProperty(value = "对账单编码。若是商家对账类型，则填写商家对账单编号;若是销司对账类型，则填写销司对账编号")
+    private String orderCode;
+
+    @ApiModelProperty(value = "审核人")
+    private String reviewMan;
+
+    @ApiModelProperty(value = "审核时间")
+    private Long reviewTime;
+
+    @ApiModelProperty(value = "流程状态")
+    private String processStatus;
+
+    @ApiModelProperty(value = "备注")
+    private String comment;
+
+    @ApiModelProperty(value = "创建数据的组织")
+    private String createOrg;
+
+    @ApiModelProperty(value = "更新数据的组织")
+    private String updateOrg;
+
+    @ApiModelProperty(value = "创建时间")
+    private Long createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    private Long updateTime;
+
+    @ApiModelProperty(value = "更新人")
+    private String updateUser;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUser;
+
+    @ApiModelProperty(value = "是否已经被删除")
+    private String isDelete;
+
+    @ApiModelProperty(value = "审核备注")
+    private String reviewComment;
+
+    @ApiModelProperty(value = "商家简称")
+    private String merchantShortName;
+
+    @ApiModelProperty(value = "商家编码")
+    private String merchantCode;
+
+    @ApiModelProperty(value = "商家名称")
+    private String merchantName;
+
+
+
+    private List<CostBillVO> costTicketDetailList;
+
+}

src/main/java/com/zfire/mall/manager/bean/front/CreateTicketBill.java

@@ -0,0 +1,21 @@
+package com.zfire.mall.manager.bean.front;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class CreateTicketBill {
+
+    @ApiModelProperty(value = "工单编号，必填")
+    private String comment;
+
+    @ApiModelProperty(value = "工单备注")
+    private String ticketCode;
+
+    @ApiModelProperty(value = "结算单")
+    private List<CreateTicketBillList> modifiedCostBillList;
+}

src/main/java/com/zfire/mall/manager/bean/front/CreateTicketBillList.java

@@ -0,0 +1,183 @@
+package com.zfire.mall.manager.bean.front;
+
+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.zfire.mall.manager.plus.entity.CostTicketBill;
+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 CreateTicketBillList {
+
+    @ApiModelProperty(value = "账单唯一id")
+    private String id;
+
+    @ApiModelProperty(value = "工单编号")
+    private String ticketCode;
+
+    @ApiModelProperty(value = "嘉贤创建时间")
+    private Date time;
+
+    @ApiModelProperty(value = "产品名称")
+    private String materialName;
+
+    @ApiModelProperty(value = "物料名称")
+    private String materialCode;
+
+    @ApiModelProperty(value = "规格型号")
+    private String materialSpecification;
+
+    @ApiModelProperty(value = "物料类型")
+    private String materialType;
+
+    @ApiModelProperty(value = "账号对应物料数量")
+    private Integer materialNumber;
+
+    @ApiModelProperty(value = "订单号，物流单号或销售单号")
+    private String orderCode;
+
+    @ApiModelProperty(value = "退货单号")
+    private String returnOrderCode;
+
+    @ApiModelProperty(value = "商家编码")
+    private String merchantCode;
+
+    @ApiModelProperty(value = "商家名称")
+    private String merchantName;
+
+    @ApiModelProperty(value = "所属销售公司类型,GE_JIANG(格匠)GUANG_ZHOU(广州销售公司)FO_SHAN(佛山销售公司)OTHER(其他销售公司)")
+    private String belongCompanyType;
+
+    @ApiModelProperty(value = "订单类型。TOB(商家机工程机类型)，ALL(所有类型，广州的订单统一开单价)，TOC(销售订单类型)")
+    private String orderType;
+
+    @ApiModelProperty(value = "客户名称")
+    private String customerName;
+
+    @ApiModelProperty(value = "客户电话")
+    private String customerPhone;
+
+    @ApiModelProperty(value = "发货仓库编码")
+    private String warehouseCode;
+
+    @ApiModelProperty(value = " 发货仓库名称")
+    private String warehouseName;
+
+    @ApiModelProperty(value = "收货送货地址")
+    private String receiptAddress;
+
+    @ApiModelProperty(value = "订单类型细分。PICKING_UP_ORDER(前置仓提货订单)SALE_ORDER(销售订单),MERCHANT_WAREHOUSE_ORDER(商家仓订单)PROJECT_ORDER(工程机订单)SALE_RETURN_ORDER(销售退货单),")
+    private String orderTypeDetail;
+
+    @ApiModelProperty(value = "物料计费分类，空调生活家电等")
+    private String materialCostType;
+
+    @ApiModelProperty(value = "运费结算系数")
+    private BigDecimal coefficient;
+
+    @ApiModelProperty(value = "补贴结算系数")
+    private BigDecimal subsidyCoefficient;
+
+    @ApiModelProperty(value = "卸货上楼结算系数")
+    private BigDecimal unloadUpstairsCoefficient;
+
+    @ApiModelProperty(value = "退货订单按单价计算")
+    private BigDecimal unitPrice;
+
+    @ApiModelProperty(value = "退货费用")
+    private BigDecimal returnOrderCost;
+
+    @ApiModelProperty(value = "商家承担费用")
+    private BigDecimal merchantCost;
+
+    @ApiModelProperty(value = "补贴费用，补贴系数*开单价")
+    private BigDecimal allowanceCost;
+
+    @ApiModelProperty(value = "上楼卸货费用，上楼结算系数* 开单价")
+    private BigDecimal unloadUpstairsCost;
+
+    @ApiModelProperty(value = "费用汇总，前面三个费用相加")
+    private BigDecimal totalCost;
+
+    @ApiModelProperty(value = "备注")
+    private String comment;
+
+    @ApiModelProperty(value = "订单时间")
+    private String orderDate;
+
+    @ApiModelProperty(value = "无法生成的原因")
+    private String errorResult;
+
+    @ApiModelProperty(value = " 是否已经对过帐")
+    private String isAccountChecking;
+
+    @ApiModelProperty(value = " 是否已经审核")
+    private String isAudit;
+
+    @ApiModelProperty(value = " 是否卸货")
+    private String isUnload;
+
+    @ApiModelProperty(value = " 是否上楼")
+    private String isUpstairs;
+
+    @ApiModelProperty(value = " 实际是否卸货")
+    private String isRealUnload;
+
+    @ApiModelProperty(value = "实际是否上楼")
+    private String isRealUpstairs;
+
+    @ApiModelProperty(value = "是否完结 0 未完结，1 已经完结")
+    private Integer isFinish;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty(value = "上个版本订单编码")
+    private String lastBillCode;
+
+    @ApiModelProperty(value = "商家对账单编号")
+    private String merchanCheckCode;
+
+    @ApiModelProperty(value = "销司对账单编号")
+    private String salesCheckCode;
+
+    @ApiModelProperty(value = "订单流程")
+    private String processStatus;
+
+    @ApiModelProperty(value = "GE_JIANG,所属哪一个销售公司计费规则，GE_JIANG(格 匠 ),GUANG_ZHOU(广 州 销 售 公 司),FO_SHAN(佛山销售公司),OTHER(其他销售公司")
+    private String belongCompanyCostRule;
+
+    @ApiModelProperty(value = "物料开单价")
+    private BigDecimal materialPrice;
+
+    @ApiModelProperty(value = "是否已经被删除")
+    private String isDelete;
+
+    @ApiModelProperty(value = "0")
+    private String createOrg;
+
+    @ApiModelProperty(value = "0")
+    private String updateOrg;
+
+    @ApiModelProperty(value = "更新人")
+    private String updateUser;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUser;
+
+    @ApiModelProperty(value = "订单编号")
+    private String billCode;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+}

src/main/java/com/zfire/mall/manager/bean/front/CreateTicketMain.java

@@ -0,0 +1,16 @@
+package com.zfire.mall.manager.bean.front;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class CreateTicketMain {
+
+    @ApiModelProperty(value = "工单类型,MERCHANT_CHECK(商家对账),SALES_CHECK(销司对账)")
+    private String ticketType;
+
+    @ApiModelProperty(value = "对账单编码。若是商家对账类型，则填写商家对账单编号;若是销司对账类型，则填写销司对账编号")
+    private String orderCode;
+}

src/main/java/com/zfire/mall/manager/bean/front/CustomerOrderJiaBean.java

@@ -0,0 +1,62 @@
+package com.zfire.mall.manager.bean.front;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author gejiang
+ * @since 2023-04-08
+ */
+@ApiModel
+@Data
+public class CustomerOrderJiaBean   {
+
+
+    @ApiModelProperty(value = "isCheck=1")
+    private Integer isCheck = 1;
+
+
+    @ApiModelProperty(value = "送货地址（省市区详细地址）")
+    private String receiptAddress;
+
+    @ApiModelProperty(value = "要求送货日期(时间戳)")
+    private String requireDeliveryDate;
+
+
+    @ApiModelProperty(value = "商家名称")
+    private String merchantName;
+
+    @ApiModelProperty(value = "客户名称")
+    private String customerName;
+
+    @ApiModelProperty(value = "商家编码")
+    private String merchantCode;
+
+    @ApiModelProperty(value = "客户电话")
+    private String customerPhone;
+
+    @ApiModelProperty(value = "备注")
+    private String comment;
+
+    @ApiModelProperty(value = "省")
+    private String province;
+
+    @ApiModelProperty(value = "市")
+    private String city;
+
+    @ApiModelProperty(value = "区")
+    private String area;
+
+    @ApiModelProperty(value = "街道")
+    private String street;
+
+    @ApiModelProperty(value = "物料")
+    private List<SaleOrderJsonListDto> saleOrderDetailList;
+}

src/main/java/com/zfire/mall/manager/bean/front/CustomerOrderJiaBeanList.java

@@ -0,0 +1,24 @@
+package com.zfire.mall.manager.bean.front;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author gejiang
+ * @since 2023-04-08
+ */
+@ApiModel
+@Data
+public class CustomerOrderJiaBeanList {
+
+
+    @ApiModelProperty(value = "list")
+    private List<CustomerOrderJiaBean> list;
+}

src/main/java/com/zfire/mall/manager/bean/front/CustomerOrderJiaRemoveBeanList.java

@@ -0,0 +1,24 @@
+package com.zfire.mall.manager.bean.front;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author gejiang
+ * @since 2023-04-08
+ */
+@ApiModel
+@Data
+public class CustomerOrderJiaRemoveBeanList {
+
+
+    @ApiModelProperty(value = "list")
+    private List<String> list;
+}

src/main/java/com/zfire/mall/manager/bean/front/CustomerOrderJiaReturnBeanList.java

@@ -0,0 +1,24 @@
+package com.zfire.mall.manager.bean.front;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author gejiang
+ * @since 2023-04-08
+ */
+@ApiModel
+@Data
+public class CustomerOrderJiaReturnBeanList {
+
+
+    @ApiModelProperty(value = "list")
+    private List<SaleOrderReturnJsonList> list;
+}

src/main/java/com/zfire/mall/manager/bean/front/CustomerOrderTrackTocBean.java

@@ -0,0 +1,38 @@
+package com.zfire.mall.manager.bean.front;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author changelin
+ */
+@ApiModel
+@Data
+public class CustomerOrderTrackTocBean {
+
+    @ApiModelProperty(value = "嘉贤物流id")
+    private String id;
+
+    @ApiModelProperty(value = "创建时间")
+    private String createTime;
+
+    @ApiModelProperty(value = "运单号")
+    private String branchOrderCode;
+
+    @ApiModelProperty(value = "销售订单号")
+    private String saleCode;
+
+    @ApiModelProperty(value = "签收状态")
+    private String status;
+
+    @ApiModelProperty(value = "状态详情")
+    private String statusDetails;
+
+    @ApiModelProperty(value = "备注")
+    private String comment;
+
+
+
+
+}

src/main/java/com/zfire/mall/manager/bean/front/CustomerTransferJiaBeanList.java

@@ -0,0 +1,24 @@
+package com.zfire.mall.manager.bean.front;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author gejiang
+ * @since 2023-04-08
+ */
+@ApiModel
+@Data
+public class CustomerTransferJiaBeanList {
+
+
+    @ApiModelProperty(value = "list")
+    private List<MerchantAllocationOrderMainJsonListDto> list;
+}

src/main/java/com/zfire/mall/manager/bean/front/CustomerTransferJiaRemoveBeanList.java

@@ -0,0 +1,24 @@
+package com.zfire.mall.manager.bean.front;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author gejiang
+ * @since 2023-04-08
+ */
+@ApiModel
+@Data
+public class CustomerTransferJiaRemoveBeanList {
+
+
+    @ApiModelProperty(value = "list")
+    private List<String> list;
+}

src/main/java/com/zfire/mall/manager/bean/front/MerchantAllocationOrderDetailList.java

@@ -0,0 +1,41 @@
+package com.zfire.mall.manager.bean.front;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author gejiang
+ * @since 2023-04-08
+ */
+@ApiModel
+@Data
+public class MerchantAllocationOrderDetailList {
+
+
+    @ApiModelProperty(value = "物料代码")
+    private String materialCode;
+
+
+    @ApiModelProperty(value = "物料名称")
+    private String materialName;
+
+    @ApiModelProperty(value = "规格型号")
+    private String materialSpecification;
+
+    @ApiModelProperty(value = "物料类型")
+    private String materialType;
+
+    @ApiModelProperty(value = "调拨数量")
+    private Integer deliveredNumber;
+
+
+    @ApiModelProperty(value = "备注")
+    private String comment;
+
+
+}

src/main/java/com/zfire/mall/manager/bean/front/MerchantAllocationOrderMainJsonListDto.java

@@ -0,0 +1,40 @@
+package com.zfire.mall.manager.bean.front;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author gejiang
+ * @since 2023-04-08
+ */
+@ApiModel
+@Data
+public class MerchantAllocationOrderMainJsonListDto {
+
+
+    @ApiModelProperty(value = "商家名称")
+    private String upMerchantName;
+
+    @ApiModelProperty(value = "客户名称")
+    private String upMerchantCode;
+
+    @ApiModelProperty(value = "商家编码")
+    private String inMerchantName;
+
+    @ApiModelProperty(value = "客户电话")
+    private String inMerchantCode;
+
+    @ApiModelProperty(value = "备注")
+    private String comment;
+
+
+    @ApiModelProperty(value = "物料")
+    private List<MerchantAllocationOrderDetailList> merchantAllocationOrderDetailList;
+}

src/main/java/com/zfire/mall/manager/bean/front/SaleOrderJsonListDto.java

@@ -0,0 +1,31 @@
+package com.zfire.mall.manager.bean.front;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author gejiang
+ * @since 2023-04-08
+ */
+@ApiModel
+@Data
+public class SaleOrderJsonListDto {
+
+
+    @ApiModelProperty(value = "物料代码")
+    private String materialCode;
+
+
+    @ApiModelProperty(value = "物料名称")
+    private String materialName;
+
+    @ApiModelProperty(value = "销售数量")
+    private Integer deliveredNumber;
+
+
+}

src/main/java/com/zfire/mall/manager/bean/front/SaleOrderReturnDetailList.java

@@ -0,0 +1,46 @@
+package com.zfire.mall.manager.bean.front;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author gejiang
+ * @since 2023-04-08
+ */
+@ApiModel
+@Data
+public class SaleOrderReturnDetailList {
+
+
+    @ApiModelProperty(value = "物料代码")
+    private String materialCode;
+
+
+    @ApiModelProperty(value = "物料名称")
+    private String materialName;
+
+    @ApiModelProperty(value = "规格型号")
+    private String materialSpecification;
+
+    @ApiModelProperty(value = "销售数量")
+    private Integer deliveredNumber;
+
+    @ApiModelProperty(value = "需要退货的数量")
+    private Integer returnNumber;
+
+    @ApiModelProperty(value = "体积")
+    private String volume;
+
+    @ApiModelProperty(value = "总体积")
+    private String totalVolume;
+
+    @ApiModelProperty(value = "备注")
+    private String comment;
+
+
+}

src/main/java/com/zfire/mall/manager/bean/front/SaleOrderReturnJsonList.java

@@ -0,0 +1,64 @@
+package com.zfire.mall.manager.bean.front;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author gejiang
+ * @since 2023-04-08
+ */
+@ApiModel
+@Data
+public class SaleOrderReturnJsonList {
+
+
+
+    @ApiModelProperty(value = "取件地址（销售单收货地址）")
+    private String receiptAddress;
+
+    @ApiModelProperty(value = "取件日期（时间戳）")
+    private String pickUpDate;
+
+
+    @ApiModelProperty(value = "商家名称")
+    private String merchantName;
+
+    @ApiModelProperty(value = "商家编码")
+    private String merchantCode;
+
+    @ApiModelProperty(value = "客户名称")
+    private String customerName;
+
+    @ApiModelProperty(value = "销售订单号")
+    private String saleOrderCode;
+
+
+
+    @ApiModelProperty(value = "客户电话")
+    private String customerPhone;
+
+    @ApiModelProperty(value = "备注")
+    private String comment;
+
+    @ApiModelProperty(value = "省")
+    private String province;
+
+    @ApiModelProperty(value = "市")
+    private String city;
+
+    @ApiModelProperty(value = "区")
+    private String area;
+
+    @ApiModelProperty(value = "街道")
+    private String street;
+
+    @ApiModelProperty(value = "物料")
+    private List<SaleOrderReturnDetailList> saleOrderReturnDetailList;
+}

src/main/java/com/zfire/mall/manager/bean/front/WorkerOrderInfo.java

@@ -0,0 +1,176 @@
+package com.zfire.mall.manager.bean.front;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@ApiModel
+@Data
+public class WorkerOrderInfo {
+
+    @ApiModelProperty("信息编号")
+    private String workerOrder;
+    @ApiModelProperty("总部信息编号")
+    private String pgid;
+    @ApiModelProperty("工单状态数值")
+    private Integer orderStateInt;
+    @ApiModelProperty("工单状态")
+    private String orderState;
+    @ApiModelProperty("售后服务网点编号")
+    private String installNumber;
+    @ApiModelProperty("售后服务网点名称")
+    private String installName;
+    @ApiModelProperty("主要服务人员")
+    private String workerName;
+    @ApiModelProperty("主要服务人员电话")
+    private String workerPhone;
+    @ApiModelProperty("主要服务人员电话")
+    private String workerNumber;
+
+    @ApiModelProperty("工单接收时间")
+    private String orderReceTime;
+    @ApiModelProperty("完工时间")
+    private String finishTime;
+    @ApiModelProperty("工单反馈信息")
+    private List<Fkxx> fkxxs;
+    @ApiModelProperty("辅材支付信息")
+    private List<Fcxx> fcxxs;
+    @ApiModelProperty("订单明细")
+    private List<OrderDetail> orderDetails;
+    @ApiModelProperty("订单号")
+    private String orderId;
+    @ApiModelProperty("下单时间")
+    private Date payTime;
+    @ApiModelProperty("辅助人员名称")
+    private String assistName;
+    @ApiModelProperty("辅助人员编号")
+    private String assistNumber;
+    @ApiModelProperty("辅助人员电话")
+    private String assistPhone;
+
+
+    @ApiModelProperty("预约时间")
+    private String reserveTime;
+    @ApiModelProperty("服务内容")
+    private String serverContent;
+    @ApiModelProperty("支架")
+    private String bracket;
+    @ApiModelProperty("加长管")
+    private String pipe;
+    @ApiModelProperty("空气开关")
+    private String switchFlag;
+    @ApiModelProperty("高空作业")
+    private String highAltitude;
+    @ApiModelProperty("一次成型墙孔")
+    private String hole;
+    @ApiModelProperty("服务备注")
+    private String remark;
+
+    @ApiModelProperty("销售网点编号")
+    private String salesNumber;
+    @ApiModelProperty("销售网点名称")
+    private String salesWname;
+
+    @ApiModelProperty("用户电话")
+    private String userPhone;
+
+    @ApiModelProperty("派工状态:0=待接收,1=待签到,2=待采集,3=已采集,4=已完工,5=改约中,6=改派中")
+    private Integer appointState;
+
+    @ApiModelProperty("信息员名称")
+    private String adminOfficerName;
+
+    @ApiModelProperty("信息员编号")
+    private String adminOfficerNumber;
+
+    @ApiModelProperty("信息员编号")
+    private String afterWname;
+
+    @ApiModelProperty("信息员编号")
+    private String afterNumber;
+
+    @ApiModelProperty("信息员编号")
+    private String afterTime;
+
+    @ApiModelProperty("创建人")
+    private String createWname;
+
+    @ApiModelProperty("创建编号")
+    private String createNumber;
+
+    @ApiModelProperty("创建时间")
+    private String createtime;
+
+    @ApiModelProperty("总机器数量")
+    private Integer machineNum;
+
+    @ApiModelProperty("未完成数量")
+    private Integer needNum;
+
+    @ApiModel
+    @Data
+    public static class Fkxx{
+        @ApiModelProperty("主键")
+        private Integer id;
+        @ApiModelProperty("操作类型")
+        private String operatorType;
+        @ApiModelProperty("操作内容")
+        private String operatorContent;
+        @ApiModelProperty("最后操作时间")
+        private String lastOperatorTime;
+        @ApiModelProperty("操作人")
+        private String operatorName;
+        @ApiModelProperty("操作网点")
+        private String operatorWebsit;
+        @ApiModelProperty("反馈结果")
+        private String result;
+        @ApiModelProperty("附件")
+        private String files;
+    }
+
+    @ApiModel
+    @Data
+    public static class Fcxx{
+        @ApiModelProperty("id")
+        private Integer id;
+        @ApiModelProperty("费用单号")
+        private String orderNo;
+        @ApiModelProperty("操作网点")
+        private String operatorWebsit;
+        @ApiModelProperty("操作人")
+        private String operatorName;
+        @ApiModelProperty("支付状态")
+        private String payStatus;
+        @ApiModelProperty("支付时间")
+        private String payTime;
+        @ApiModelProperty("金额")
+        private String amount;
+        @ApiModelProperty("备注")
+        private String remark;
+        @ApiModelProperty("详情")
+        private List<Map<String,Object>> details;
+    }
+
+
+    @ApiModel
+    @Data
+    public static class OrderDetail{
+        @ApiModelProperty("id")
+        private Integer id;
+        @ApiModelProperty("内机")
+        private String insideCode;
+        @ApiModelProperty("内机2")
+        private String insideCode2;
+        @ApiModelProperty("外机")
+        private String outCode;
+
+        @ApiModelProperty("外机")
+        private String pname;
+
+    }
+
+}

src/main/java/com/zfire/mall/manager/bean/k3/K3ReceiptBean.java

@@ -0,0 +1,14 @@
+package com.zfire.mall.manager.bean.k3;
+
+import com.zfire.mall.manager.plus.entity.KingDeeReceipt;
+import lombok.Data;
+
+
+@Data
+public class K3ReceiptBean extends KingDeeReceipt {
+
+    private String customerName;
+    private String walletName;
+    private String wlCompanyName;
+
+}

src/main/java/com/zfire/mall/manager/bean/k3/RequestApiBean.java

@@ -0,0 +1,101 @@
+package com.zfire.mall.manager.bean.k3;
+
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class RequestApiBean implements Serializable {
+
+    /**
+     * 组织
+     */
+    @JsonIgnore
+    private String orgId;
+    /**
+     * 组织编码
+     */
+    @JsonIgnore
+    private String orgNumber;
+    /**
+     * 范围查询开始时间
+     */
+    @JsonIgnore
+    private String startTime;
+    /**
+     * 范围查询结束时间
+     */
+    @JsonIgnore
+    private String endTime;
+    /**
+     * 表单类型(默认基础资料)
+     */
+    @JsonIgnore
+    private int formType = 0;
+    /**
+     * 不记录同步时间
+     */
+    private Boolean notTime = false;
+
+    /**
+     * 业务对象表单Id
+     */
+    @JsonProperty("FormId")
+    private String formId;
+    /**
+     * 需查询的字段key集合，字符串类型
+     */
+    @JsonProperty("FieldKeys")
+    private String fieldKeys;
+    /**
+     * 过滤条件，字符串类型，"fieldKey = '123' AND fieldKey in('123','456') AND fieldKey like '测试'"
+     *
+     */
+    @JsonProperty("FilterString")
+    private String filterString;
+    /**
+     * 排序字段，字符串类型
+     */
+    @JsonProperty("RrderString")
+    private String orderString;
+    /**
+     * 返回总行数，整型
+     */
+    @JsonProperty("TopRowCount")
+    private Integer topRowCount = 1000;
+    /**
+     * 开始行索引，整型
+     */
+    @JsonProperty("StartRow")
+    private Integer startRow = 0;
+    /**
+     * 最大行数，整型，不能超过2000
+     */
+    @JsonProperty("Limit")
+    private Integer limit = 1000;
+
+    public void setEndTime(String endTime) {
+        if (StringUtils.isEmpty(endTime)) {
+            endTime = DateUtil.formatDateTime(new Date());
+        }
+        this.endTime = endTime;
+    }
+
+//    public void setFieldKeys(String... fieldKeys) {
+//        if (ArrayUtils.isNotEmpty(fieldKeys)) {
+//            StringBuilder sb = new StringBuilder();
+//            for (int i = 0; i < fieldKeys.length; i++) {
+//                sb.append(fieldKeys[i]).append(",");
+//            }
+//            this.fieldKeys = sb.deleteCharAt(sb.lastIndexOf(",")).toString();
+//        } else {
+//            this.fieldKeys = "";
+//        }
+//    }
+
+}

src/main/java/com/zfire/mall/manager/bean/k3/bill/CommonOrderBean.java

@@ -0,0 +1,24 @@
+package com.zfire.mall.manager.bean.k3.bill;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+//@ApiModel
+@Data
+public abstract class CommonOrderBean {
+
+    @JsonProperty("FBillNo")
+    //@ApiModelProperty(value = "单号", required = true)
+    private String billNo;
+
+    @JsonIgnore
+    public boolean isPushUpdate() {
+        return false;
+    }
+
+    public String[] pushUpdateFields() {
+        return new String[] {};
+    }
+
+}

src/main/java/com/zfire/mall/manager/bean/k3/bill/result/BillItem.java

@@ -0,0 +1,51 @@
+package com.zfire.mall.manager.bean.k3.bill.result;
+
+import lombok.Data;
+
+@Data
+public class BillItem {
+
+    /**
+     * 行号
+     */
+    private String seq;
+
+    /**
+     * 内码
+     */
+    private String entryId;
+
+    /**
+     * 物料id
+     */
+    private String materialId;
+
+    /**
+     * 供应链自定义值
+     */
+    private String supplyColVal;
+
+    /**
+     * 父单据内码
+     */
+    private String parentId;
+
+    private BillItem() {
+
+    }
+
+    public BillItem(String seq, String entryId, String materialId, String supplyColVal) {
+        this.seq = seq;
+        this.entryId = entryId;
+        this.materialId = materialId;
+        this.supplyColVal = supplyColVal;
+    }
+
+    public BillItem(String seq, String entryId, String materialId, String supplyColVal, String parentId) {
+        this.seq = seq;
+        this.entryId = entryId;
+        this.materialId = materialId;
+        this.supplyColVal = supplyColVal;
+        this.parentId = parentId;
+    }
+}

src/main/java/com/zfire/mall/manager/bean/k3/bill/result/SuccessEntitys.java

@@ -0,0 +1,21 @@
+package com.zfire.mall.manager.bean.k3.bill.result;
+
+import lombok.Data;
+
+@Data
+public class SuccessEntitys {
+    /**
+     * 下游单据内码id
+     */
+    private String id;
+
+    /**
+     * 下游单据单号
+     */
+    private String number;
+
+    /**
+     * 错误下标
+     */
+    private Integer dIndex;
+}

src/main/java/com/zfire/mall/manager/bean/trade/TradeLoginCountBean.java

@@ -0,0 +1,13 @@
+package com.zfire.mall.manager.bean.trade;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class TradeLoginCountBean {
+    private String customerId;
+    private Integer workCount;
+    private Integer homeCount;
+    private Integer spanCount;
+}

src/main/java/com/zfire/mall/manager/bean/wallet/CustomerWalletAmountBean.java

@@ -0,0 +1,64 @@
+package com.zfire.mall.manager.bean.wallet;
+
+import com.zfire.mall.manager.plus.entity.CustomerWallet;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class CustomerWalletAmountBean {
+
+
+
+    //类型 add =加钱  sub=减钱
+    private String type;
+    //钱包id
+    private String customerWalletId;
+    //金额
+    private BigDecimal amount;
+    //备注
+    private String remark;
+    //单据类型
+    private String billType;
+    //单据日期
+    private Date theTime;
+    //单据号
+    private String billNo;
+    //flag 1=预付货款 2=订单占款 3=支付货款 4=押金 5=工程保证金 6=其他暂扣款
+    private Integer flag;
+
+    //返利单用参数
+    private BigDecimal allowanceAmount;
+    private BigDecimal withholdAmount;
+
+    //钱包
+    private CustomerWallet customerWallet;
+
+
+    public CustomerWalletAmountBean(String customerWalletId,BigDecimal amount,String remark,String billType,Date theTime,String billNo,Integer flag,String type){
+        this.customerWalletId = customerWalletId;
+        this.amount = amount;
+        this.remark = remark;
+        this.billType = billType;
+        this.theTime = theTime;
+        this.billNo = billNo;
+        this.flag = flag;
+        this.type = type;
+    }
+
+    public CustomerWalletAmountBean(String customerWalletId,BigDecimal amount,String remark,String billType,Date theTime,String billNo,Integer flag,BigDecimal allowanceAmount,BigDecimal withholdAmount,String k3ReceiptId,String type){
+        this.customerWalletId = customerWalletId;
+        this.amount = amount;
+        this.remark = remark;
+        this.billType = billType;
+        this.theTime = theTime;
+        this.billNo = billNo;
+        this.flag = flag;
+        this.allowanceAmount = allowanceAmount;
+        this.withholdAmount = withholdAmount;
+        this.type = type;
+    }
+
+
+}

src/main/java/com/zfire/mall/manager/bean/wallet/CustomerWalletBean.java

@@ -0,0 +1,39 @@
+package com.zfire.mall.manager.bean.wallet;
+
+import com.zfire.mall.manager.plus.entity.CustomerWallet;
+import com.zfire.mall.manager.plus.entity.WalletRebateSaleType;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+//@ApiModel
+@Data
+public class CustomerWalletBean extends CustomerWallet {
+
+    //@ApiModelProperty("返利折扣(例如:0.1=1折)")
+    private BigDecimal rebateRate;
+
+//    @ApiModelProperty("优先顺序(倒序)")
+//    private Integer rebateSort;
+   // @ApiModelProperty("钱包名称")
+    private String name;
+
+    //@ApiModelProperty("是否折让")
+    private Boolean isZr = false;
+    //@ApiModelProperty("是否返利")
+    private Boolean isRebate = false;
+
+    //@ApiModelProperty("业务员ID")
+    private String serviceId;
+    //@ApiModelProperty("业务员名称")
+    private String serviceName;
+
+    //@ApiModelProperty("金蝶钱包编码")
+    private String walletNumber;
+
+    //a@ApiModelProperty("返利钱包")
+    private List<WalletRebateSaleType> walletRaleTypes;
+    private List<String> saleTypeIds;
+
+}

src/main/java/com/zfire/mall/manager/bean/wallet/RebateWalletSaleBean.java

@@ -0,0 +1,19 @@
+package com.zfire.mall.manager.bean.wallet;
+
+import com.zfire.mall.manager.plus.entity.WalletRebateSaleType;
+import lombok.Data;
+
+//@ApiModel
+@Data
+public class RebateWalletSaleBean extends WalletRebateSaleType {
+
+    //@ApiModelProperty("钱包名称")
+    private String name;
+//    @ApiModelProperty("返利比例")
+//    private BigDecimal rebateRate;
+    //@ApiModelProperty("销售类型编号")
+    private String saleTypeCode;
+    //@ApiModelProperty("销售类型名称")
+    private String saleTypeName;
+
+}

src/main/java/com/zfire/mall/manager/commonmapper/AdminMapper.java

@@ -0,0 +1,45 @@
+package com.zfire.mall.manager.commonmapper;
+
+import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.zfire.mall.manager.bean.admin.respDto.AdminUserDto;
+import com.zfire.mall.manager.plus.entity.AdminCompany;
+import com.zfire.mall.manager.plus.entity.StockCorrespond;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface AdminMapper {
+
+
+    /**
+     * 商户列表
+     */
+    @SqlParser(filter = true)
+    public IPage<AdminUserDto> mchList(IPage page,
+                                       @Param("adminCompanyIds") List<String> adminCompanyIds,
+                                       @Param("adminWebsitIds") List<String> adminWebsitIds,
+                                       @Param("userName") String userName,
+                                       @Param("nickName") String nickName,
+                                       @Param("linkPhone") String linkPhone,
+                                       @Param("email") String email,
+                                       @Param("status") Boolean status,
+                                       @Param("roleId") String roleId,
+                                       @Param("isMaster") Boolean isMaster,
+                                       @Param("isCustomer") Boolean isCustomer);
+
+
+    @SqlParser(filter = true)
+    public List<AdminCompany> queryAdminCompanyWechat(@Param("adminUserId") String adminUserId);
+
+
+    List<StockCorrespond> StockCorrespondList(String adminUserId);
+
+    /**
+     * 查询所有子级的业务员
+     */
+    public List<String> queryChildServiceId(List<String> adminWebsitIds);
+
+}

src/main/java/com/zfire/mall/manager/commonmapper/CustomerFrontOrderMapper.java

@@ -0,0 +1,21 @@
+package com.zfire.mall.manager.commonmapper;
+
+import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author chang
+ */
+@Mapper
+public interface CustomerFrontOrderMapper {
+
+
+
+    void updateToc();
+
+    void updateReturnToc();
+}

src/main/java/com/zfire/mall/manager/commonmapper/K3Mapper.java

@@ -0,0 +1,51 @@
+package com.zfire.mall.manager.commonmapper;
+
+import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.zfire.mall.manager.bean.k3.K3ReceiptBean;
+import com.zfire.mall.manager.plus.entity.KingDeeMaterial;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface K3Mapper {
+
+
+    /**
+     * 查询零售单的执行明细
+     */
+    @SqlParser(filter = true)
+    public IPage<K3ReceiptBean> queryReceiptBill(
+            IPage page,
+            @Param("billType") String billType,
+            @Param("billNo") String billNo,
+            @Param("wlCompanyType") String wlCompanyType,
+            @Param("customerName") String customerName,
+            @Param("settleType") String settleType,
+            @Param("startTime") String startTime,
+            @Param("endTime") String endTime,
+            @Param("customerId") String customerId
+    );
+
+
+    /**
+     * 查询物料的所有单位
+     */
+    @SqlParser(filter = true)
+    public List<KingDeeMaterial> queryMaterialUnit();
+
+    /**
+     * 同步更新价格表的物料名称
+     */
+    @SqlParser(filter = true)
+    public void updateProductBillItem(@Param("materialIds") List<String> materialIds);
+
+    /**
+     * 同步更新价格表的物料名称
+     */
+    @SqlParser(filter = true)
+    public void updateProductPrice(@Param("materialIds") List<String> materialIds);
+
+}

src/main/java/com/zfire/mall/manager/commonmapper/LoginOrderMapper.java

@@ -0,0 +1,16 @@
+package com.zfire.mall.manager.commonmapper;
+
+import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.zfire.mall.manager.bean.trade.TradeLoginCountBean;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Set;
+
+@Mapper
+public interface LoginOrderMapper {
+
+    @SqlParser(filter = true)
+    List<TradeLoginCountBean> updateLoginOrderLimit(@Param("customerList") Set<String> customerList);
+}

src/main/java/com/zfire/mall/manager/commonmapper/wallet/WalletCommonMapper.java

@@ -0,0 +1,74 @@
+package com.zfire.mall.manager.commonmapper.wallet;
+
+import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.zfire.mall.manager.bean.wallet.CustomerWalletBean;
+import com.zfire.mall.manager.bean.wallet.RebateWalletSaleBean;
+import com.zfire.mall.manager.plus.entity.CustomerWallet;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
+
+public interface WalletCommonMapper {
+
+
+    @Select("select * from customer_wallet where customer_wallet_id=#{customerWalletId} for update")
+    public CustomerWallet getCustomerWalletByIdForUpdate(@Param("customerWalletId") String customerWalletId);
+    /**
+     * 查询经销商的所有钱包
+     */
+    @SqlParser(filter = true)
+    public IPage<CustomerWalletBean> queryWalletByCustomerId(
+            IPage page,
+            @Param("customerId") String customerId,
+            @Param("type") String type,
+            @Param("hasRecord") Boolean hasRecord
+    );
+
+
+    /**
+     * 查询经销商的钱包详情
+     */
+    @SqlParser(filter = true)
+    public CustomerWalletBean queryWalletDetailByCustomerId(
+            @Param("customerWalletId") String customerWalletId
+    );
+
+    /**
+     * 重载可用的信用额度
+     */
+    @SqlParser(filter = true)
+    public void reloadCustomerWalletCert(@Param("customerId") String customerId);
+
+    /**
+     * 财务汇总
+     */
+    public List<Map<String,Object>> queryTotalAmount();
+
+    /**
+     * 经销商的余额汇总
+     */
+    public List<Map<String,Object>> queryCustomerTotalAmount(@Param("customerNumber") String customerNumber,
+                                                             @Param("customerName") String customerName);
+
+
+    @SqlParser(filter = true)
+    public IPage<RebateWalletSaleBean> queryRebateWalletSaleTypeList(IPage page,
+                                                                     @Param("name") String name,
+                                                                     @Param("saleTypeCode") String saleTypeCode,
+                                                                     @Param("saleTypeName") String saleTypeName,
+                                                                     @Param("status") Boolean status);
+
+
+    /**
+     * 初始化钱包
+     */
+    @SqlParser(filter = true)
+    public void initCustomerWallet(@Param("customerId") String customerId);
+
+
+
+
+}

src/main/java/com/zfire/mall/manager/component/StartRunner.java

@@ -0,0 +1,80 @@
+package com.zfire.mall.manager.component;
+
+import com.zfire.mall.manager.constant.KingDeeCons;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Method;
+
+
+@Component
+public class StartRunner implements ApplicationRunner {
+    @Value("${server.port}")
+    private String port;
+    @Value("${server.servlet.context-path}")
+    private String contextPath;
+    @Value("${spring.profiles.active}")
+    private String active;
+
+    @Override
+    public void run(ApplicationArguments args) throws Exception {
+
+        if(active.equals("prd")) {
+            KingDeeCons.SALERID = KingDeeCons.SALERID_PRD;
+        }
+
+        String url_format = "http://%s:%s%s/doc.html#";
+        String ip = null;
+        try {
+//            ip = IpUtil.getIpAddress();
+//            if (null == ip || "".equals(ip)) {
+//                ip = "127.0.0.1";
+//            }
+//            if (null == port || "".equals(port)) {
+//                port = "8080";
+//            }
+            String url = String.format(url_format, "127.0.0.1", port,contextPath);
+            browse(url);
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+        }
+    }
+
+    public String getPort() {
+        return port;
+    }
+
+    public void setPort(String port) {
+        this.port = port;
+    }
+
+    private void browse(String url) throws Exception {
+        // 获取操作系统的名字
+        String osName = System.getProperty("os.name", "");
+        if (osName.startsWith("Mac OS")) {
+            // 苹果的打开方式
+            Class fileMgr = Class.forName("com.apple.eio.FileManager");
+            Method openURL = fileMgr.getDeclaredMethod("openURL", new Class[]{String.class});
+            openURL.invoke(null, new Object[]{url});
+        } else if (osName.startsWith("Windows")) {
+            // windows的打开方式。
+            Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + url);
+        } else {
+            // Unix or Linux的打开方式
+            String[] browsers = {"firefox", "opera", "konqueror", "epiphany", "mozilla", "netscape"};
+            String browser = null;
+            for (int count = 0; count < browsers.length && browser == null; count++)
+                // 执行代码，在brower有值后跳出，
+                // 这里是如果进程创建成功了，==0是表示正常结束。
+                if (Runtime.getRuntime().exec(new String[]{"which", browsers[count]}).waitFor() == 0)
+                    browser = browsers[count];
+            if (browser == null)
+                throw new Exception("Could not find web browser");
+            else
+                // 这个值在上面已经成功的得到了一个进程。
+                Runtime.getRuntime().exec(new String[]{browser, url});
+        }
+    }
+}

src/main/java/com/zfire/mall/manager/config/CorsConfiguration.java

@@ -0,0 +1,26 @@
+package com.zfire.mall.manager.config;
+
+import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+
+
+@Configuration
+public class CorsConfiguration {
+    @Bean
+    public CorsFilter corsFilter() {
+
+        LoggerFactory.getLogger(this.getClass()).info("CorsFilter 启动运行");
+
+        final UrlBasedCorsConfigurationSource urlBasedCorsConfigurationSource = new UrlBasedCorsConfigurationSource();
+        final org.springframework.web.cors.CorsConfiguration corsConfiguration = new org.springframework.web.cors.CorsConfiguration();
+        corsConfiguration.setAllowCredentials(true);
+        corsConfiguration.addAllowedOrigin("*");
+        corsConfiguration.addAllowedHeader("*");
+        corsConfiguration.addAllowedMethod("*");
+        urlBasedCorsConfigurationSource.registerCorsConfiguration("/**", corsConfiguration);
+        return new CorsFilter(urlBasedCorsConfigurationSource);
+    }
+}

src/main/java/com/zfire/mall/manager/config/FeignConfigure.java

@@ -0,0 +1,19 @@
+package com.zfire.mall.manager.config;
+
+//@Configuration
+public class FeignConfigure {
+//    @Value("${ribbon.ConnectTimeout}")
+//    public int connectTimeout;
+//    @Value("${ribbon.ReadTimeout}")
+//    public int readTimeout;
+//    @Bean
+//    public Request.Options options() {
+//        return new Request.Options(connectTimeout, readTimeout);
+//    }
+//
+//    @Bean
+//    public Retryer feignRetryer() {
+//        return new Retryer.Default(1000, 3000, 3);
+//    }
+}
+

src/main/java/com/zfire/mall/manager/config/GlobalDefaultExceptionHandler.java

@@ -0,0 +1,74 @@
+package com.zfire.mall.manager.config;
+
+import cn.hutool.core.util.ReUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.zfire.mall.manager.exception.RemoteServiceException;
+import com.zfire.mall.manager.helper.ResponseHelper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+
+@ControllerAdvice
+@ResponseBody
+@Slf4j
+public class GlobalDefaultExceptionHandler {
+
+
+    @ExceptionHandler(value = Exception.class)
+    public ResponseHelper<Object> defaultErrorHandler(HttpServletRequest req, Exception ex) {
+
+        if(ex instanceof RemoteServiceException){
+            //自定义错误就不抛出栈异常
+            //log.error("网络异常:",ex);
+            log.error("网络异常:"+ex.getMessage()+req.getRequestURI()+JSONObject.toJSONString(this.bodyParam(req)));
+            return ResponseHelper.error(((RemoteServiceException) ex).getCode(),ex.getMessage());
+        }
+
+        if (ex instanceof MethodArgumentNotValidException) {
+            MethodArgumentNotValidException methodArgumentNotValidException = (MethodArgumentNotValidException) ex;
+            BindingResult bindingResult = methodArgumentNotValidException.getBindingResult();
+            StringBuilder sb = new StringBuilder();
+            bindingResult.getFieldErrors().forEach( item -> {
+                if (ReUtil.isMatch("^\\w+\\[\\d+\\]\\.\\w+", item.getField())) {
+                    String field = item.getField();
+                    int rowCount = Integer.parseInt(field.substring(field.indexOf("[") + 1, field.indexOf("]"))) + 1;
+                    sb.append("第").append(rowCount).append("行 ");
+                }
+                sb.append(item.getDefaultMessage()).append(",");
+            });
+            sb.deleteCharAt(sb.length() - 1);
+            log.error("bean验证有误：" + ex.getMessage() + sb);
+            return ResponseHelper.error(ResponseHelper.ResponseCode_VALIDATION_ERROR, sb.toString());
+        }
+
+        log.error("系统错误:"+ex.getMessage()+req.getRequestURI()+JSONObject.toJSONString(this.bodyParam(req)),ex);
+        return ResponseHelper.error(ResponseHelper.ResponseCode_COMMON,"系统异常");
+    }
+
+    private Map<String,Object> bodyParam(HttpServletRequest request){
+        Map<String,Object> params = new HashMap<String, Object>();
+//        BufferedReader br;
+//        try {
+//            br = request.getReader();
+//            String str, wholeStr = "";
+//            while((str = br.readLine()) != null){
+//                wholeStr += str;
+//            }
+//            if(StringUtils.isNotEmpty(wholeStr)){
+//                params = JSON.parseObject(wholeStr,Map.class);
+//            }
+//        } catch (IOException e1) {
+//            log.error(""+e1);
+//        }
+        return params;
+    }
+
+
+}

src/main/java/com/zfire/mall/manager/config/MpMetaObjectHandler.java

@@ -0,0 +1,36 @@
+package com.zfire.mall.manager.config;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+
+/**
+ * 自动补充插入或更新时的值
+ */
+@Component
+public class MpMetaObjectHandler implements MetaObjectHandler {
+    /**
+     * 插入时的填充策略
+     * @param metaObject
+     */
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        this.setFieldValByName("createBy", "system job",metaObject);
+        this.setFieldValByName("createTime", new Date(), metaObject);
+        this.setFieldValByName("updateBy", "system job",metaObject);
+        this.setFieldValByName("updateTime", new Date(), metaObject);
+    }
+
+    /**
+     * 更新时的填充策略
+     * @param metaObject
+     */
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        this.setFieldValByName("updateBy", "system job", metaObject);
+        this.setFieldValByName("updateTime", new Date(), metaObject);
+    }
+}

src/main/java/com/zfire/mall/manager/config/MyBatisPlusConfig.java

@@ -0,0 +1,72 @@
+package com.zfire.mall.manager.config;
+
+import com.baomidou.mybatisplus.core.injector.ISqlInjector;
+import com.baomidou.mybatisplus.core.parser.ISqlParser;
+import com.baomidou.mybatisplus.extension.injector.LogicSqlInjector;
+import com.baomidou.mybatisplus.extension.parsers.BlockAttackSqlParser;
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+@Configuration
+public class MyBatisPlusConfig {
+    private final static Logger logger = LoggerFactory.getLogger(MyBatisPlusConfig.class);
+
+    /**
+     * @description: 配置分页插件
+     *
+     * @author: gradual
+     * @date: 2019/1/15 10:17
+     * @param: []
+     * @return: com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor
+     */
+    @Bean
+    public PaginationInterceptor paginationInterceptor() {
+        logger.debug("注册分页插件");
+        PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
+
+
+        // 攻击 SQL 阻断解析器、加入解析链,阻止恶意的全表更新删除
+        List<ISqlParser> sqlParserList = new ArrayList<>();
+        sqlParserList.add(new BlockAttackSqlParser());
+        paginationInterceptor.setSqlParserList(sqlParserList);
+
+        return paginationInterceptor;
+    }
+
+
+    /**
+     * @description: SQL执行效率插件
+     *
+     * @author: gradual
+     * @date: 19-1-24 下午4:59
+     * @param: []
+     * @return: com.baomidou.mybatisplus.extension.plugins.PerformanceInterceptor
+     */
+//    @Bean
+//    @Profile({"dev","test"})// 设置 dev test 环境开启
+//    public PerformanceInterceptor performanceInterceptor() {
+//        PerformanceInterceptor performanceInterceptor = new PerformanceInterceptor();
+//        performanceInterceptor.setFormat(true);
+//        performanceInterceptor.setMaxTime(5000);
+//        return performanceInterceptor;
+//    }
+
+    /**
+     * 逻辑删除用，3.1.1之后的版本可不需要配置该bean，但项目这里用的是3.1.0的
+     *
+     * @author David Hong
+     *
+     * @return com.baomidou.mybatisplus.core.injector.ISqlInjector
+     */
+    @Bean
+    public ISqlInjector sqlInjector() {
+        return new LogicSqlInjector();
+    }
+}

src/main/java/com/zfire/mall/manager/config/MySecurityConfig.java

@@ -0,0 +1,43 @@
+//package com.zfire.mall.manager.config;
+//
+//import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+//import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+//import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+//import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+//
+///**
+// * 接口安全访问名单
+// * @Author: duke
+// * @Date: 2018/9/27 10:00 AM
+// */
+//@EnableWebSecurity
+//public class MySecurityConfig extends WebSecurityConfigurerAdapter {
+//    @Override
+//    protected void configure(HttpSecurity http) throws Exception {
+//        http.headers().frameOptions().disable();
+//        http.csrf().disable() //HTTP with Disable CSRF
+//                .authorizeRequests() //Authorize Request Configuration
+//                .antMatchers(
+//                        "/v2/api-docs",
+//                        "/swagger-resources/**",
+//                        "/swagger-ui.html**",
+//                        "/doc.html**",
+//                        "/webjars/**",
+//                        "favicon.ico"
+//                )
+//                .authenticated()
+//                .and()
+//                .authorizeRequests()
+//                .antMatchers("/**").permitAll()
+//                .and()
+//                .cors()
+//                .and()
+//                .formLogin();
+//
+//    }
+//
+//    @Override
+//    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+//        super.configure(auth);
+//    }
+//}

src/main/java/com/zfire/mall/manager/config/RedisConfig.java

@@ -0,0 +1,111 @@
+package com.zfire.mall.manager.config;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
+import com.zfire.mall.manager.utils.RedisUtil;
+import com.zfire.mall.manager.utils.RedisUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cache.interceptor.KeyGenerator;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.cache.RedisCacheManager;
+import org.springframework.data.redis.cache.RedisCacheWriter;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.data.redis.core.RedisOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.listener.RedisMessageListenerContainer;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+import java.lang.reflect.Method;
+import java.time.Duration;
+
+
+@Configuration
+@EnableCaching
+@ConditionalOnClass(RedisOperations.class)
+@EnableConfigurationProperties(RedisProperties.class)
+@Slf4j
+public class RedisConfig {
+
+    @Bean
+    public RedisTemplate<String, Object> redisTemplate(LettuceConnectionFactory factory) {
+        Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer(Object.class);
+        ObjectMapper om = new ObjectMapper();
+        om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
+        //om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
+        om.activateDefaultTyping(LaissezFaireSubTypeValidator.instance ,
+                ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.PROPERTY);
+        jackson2JsonRedisSerializer.setObjectMapper(om);
+
+        StringRedisSerializer stringRedisSerializer = new StringRedisSerializer();
+        RedisTemplate template = new RedisTemplate();
+        template.setConnectionFactory(factory);
+        template.setValueSerializer(jackson2JsonRedisSerializer);
+        template.setKeySerializer(stringRedisSerializer);
+        template.setHashKeySerializer(stringRedisSerializer);
+        template.setHashValueSerializer(jackson2JsonRedisSerializer);
+        template.afterPropertiesSet();
+        return template;
+    }
+
+    @Bean
+    public CacheManager cacheManager(RedisConnectionFactory connectionFactory) {
+        RedisCacheWriter redisCacheWriter = RedisCacheWriter.nonLockingRedisCacheWriter(connectionFactory);
+        RedisCacheConfiguration defaultCacheConfig = RedisCacheConfiguration.defaultCacheConfig();
+        //设置默认超过期时间是30秒
+        defaultCacheConfig.entryTtl(Duration.ofSeconds(30));
+        //初始化RedisCacheManager
+        RedisCacheManager cacheManager = new RedisCacheManager(redisCacheWriter, defaultCacheConfig);
+        return cacheManager;
+    }
+
+    @Bean
+    RedisMessageListenerContainer container(RedisConnectionFactory connectionFactory) {
+        RedisMessageListenerContainer container = new RedisMessageListenerContainer();
+        container.setConnectionFactory(connectionFactory);
+       // container.addMessageListener(listenerAdapter, new PatternTopic("__keyevent@0__:expired"));
+        return container;
+    }
+
+
+    /**
+     * 注入封装RedisTemplate
+     * @Title: redisUtil
+     * @return RedisUtil
+     * @throws
+     */
+    @Bean(name = "redisUtil")
+    public RedisUtil redisUtilSingle(RedisTemplate<String, Object> redisTemplate) {
+        RedisUtil redisUtil = new RedisUtil();
+        redisUtil.setRedisTemplate(redisTemplate);
+        return redisUtil;
+    }
+
+    @Bean
+    public KeyGenerator keyGenerator() {
+        return new KeyGenerator() {
+            @Override
+            public Object generate(Object target, Method method, Object... params) {
+                StringBuilder sb = new StringBuilder();
+                sb.append(target.getClass().getName());
+                sb.append(":" + method.getName());
+                for (Object obj : params) {
+                    sb.append(":" + obj.toString());
+                }
+                return sb.toString();
+            }
+        };
+    }
+
+}

src/main/java/com/zfire/mall/manager/config/RedisLockConfiguration.java

@@ -0,0 +1,17 @@
+package com.zfire.mall.manager.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.integration.redis.util.RedisLockRegistry;
+
+
+@Configuration
+public class RedisLockConfiguration {
+
+    @Bean
+    public RedisLockRegistry redisLockRegistry(RedisConnectionFactory redisConnectionFactory) {
+        return new RedisLockRegistry(redisConnectionFactory, "splock");
+    }
+
+}

src/main/java/com/zfire/mall/manager/config/RespondeBodyConfig.java

@@ -0,0 +1,57 @@
+//package com.zfire.mall.manager.config;
+//
+//
+//import com.alibaba.fastjson.JSONObject;
+//import com.fasterxml.jackson.databind.ObjectMapper;
+//import com.zfire.mall.manager.helper.ResponseHelper;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.core.MethodParameter;
+//import org.springframework.http.MediaType;
+//import org.springframework.http.ResponseEntity;
+//import org.springframework.http.server.ServerHttpRequest;
+//import org.springframework.http.server.ServerHttpResponse;
+//import org.springframework.web.bind.annotation.ControllerAdvice;
+//import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
+//
+//import java.text.SimpleDateFormat;
+//import java.util.Map;
+//
+///**
+// * 解决小程序不兼容datetime类型，格式化返回值
+// * created by lijh
+// *  2019-07-13
+// *
+// */
+//@ControllerAdvice
+//@Slf4j
+//public class RespondeBodyConfig implements ResponseBodyAdvice {
+//
+//
+//    @Override
+//    public Object beforeBodyWrite(Object resBody, MethodParameter arg1, MediaType arg2, Class arg3, ServerHttpRequest req,
+//                                  ServerHttpResponse res) {
+//        //resBody就是controller方法中返回的值，对其进行修改后再return就可以了
+//
+//        ObjectMapper mapper = new ObjectMapper();
+//        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//        mapper.setDateFormat(format);
+//
+//        try {
+//            if(resBody instanceof ResponseHelper) {
+//                String json = mapper.writeValueAsString(resBody);
+//                return JSONObject.parseObject(json, ResponseHelper.class);
+//            }
+//        } catch (Exception e) {
+//            log.error("【全局返回值处理失败】",e);
+//        }
+//        return resBody;
+//    }
+//
+//    @Override
+//    public boolean supports(MethodParameter arg0, Class arg1) {
+//        //这里直接返回true,表示对任何handler的responsebody都调用beforeBodyWrite方法
+//        return true;
+//    }
+//
+//
+//}

src/main/java/com/zfire/mall/manager/config/ScheduleConfig.java

@@ -0,0 +1,21 @@
+package com.zfire.mall.manager.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.SchedulingConfigurer;
+import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+
+import java.util.concurrent.Executors;
+
+/**
+ * schedule定时任务多线程
+ * 2019-02-21
+ */
+
+@Configuration
+public class ScheduleConfig implements SchedulingConfigurer {
+
+    @Override
+    public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) {
+        scheduledTaskRegistrar.setScheduler(Executors.newScheduledThreadPool(10));
+    }
+}

src/main/java/com/zfire/mall/manager/config/TheaderPoolConfig.java

@@ -0,0 +1,66 @@
+package com.zfire.mall.manager.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadPoolExecutor;
+
+@Configuration
+@EnableAsync
+public class TheaderPoolConfig {
+
+
+    /**
+     *   默认情况下，在创建了线程池后，线程池中的线程数为0，当有任务来之后，就会创建一个线程去执行任务，
+     *	当线程池中的线程数目达到corePoolSize后，就会把到达的任务放到缓存队列当中；
+     *  当队列满了，就继续创建线程，当线程数量大于等于maxPoolSize后，开始使用拒绝策略拒绝
+     */
+
+    /** 核心线程数（默认线程数） */
+    private static final int corePoolSize = 4;
+    /** 最大线程数 */
+    private static final int maxPoolSize = 8;
+    /** 允许线程空闲时间（单位：默认为秒） */
+    private static final int keepAliveTime = 5;
+    /** 缓冲队列大小 */
+    private static final int queueCapacity = 200;
+    /** 线程池名前缀 */
+    private static final String threadNamePrefix = "Async-ManagerService-";
+
+    @Bean("taskExecutor") // bean的名称，默认为首字母小写的方法名
+    public ThreadPoolTaskExecutor taskExecutor(){
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        executor.setCorePoolSize(corePoolSize);
+        executor.setMaxPoolSize(maxPoolSize);
+        executor.setQueueCapacity(queueCapacity);
+        executor.setKeepAliveSeconds(keepAliveTime);
+        executor.setThreadNamePrefix(threadNamePrefix);
+
+        // 线程池对拒绝任务的处理策略
+        // CallerRunsPolicy：由调用线程（提交任务的线程）处理该任务
+        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+        // 初始化
+        executor.initialize();
+        return executor;
+    }
+    @Bean("singleTaskExecutor") // bean的名称，默认为首字母小写的方法名
+    public ThreadPoolTaskExecutor singleTaskExecutor(){
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        executor.setCorePoolSize(1);
+        executor.setMaxPoolSize(1);
+        executor.setQueueCapacity(1);
+        executor.setKeepAliveSeconds(0);
+        executor.setThreadNamePrefix(threadNamePrefix);
+        // 线程池对拒绝任务的处理策略
+        // CallerRunsPolicy：由调用线程（提交任务的线程）处理该任务
+        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+        // 初始化
+        executor.initialize();
+        return executor;
+    }
+
+}

src/main/java/com/zfire/mall/manager/config/k3/K3Config.java

@@ -0,0 +1,30 @@
+package com.zfire.mall.manager.config.k3;
+
+import com.zfire.mall.manager.constant.KingDeeCons;
+import com.zfire.mall.manager.helper.KingDeeInvokeHelper;
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+import javax.annotation.PostConstruct;
+
+@Configuration
+@Data
+public class K3Config {
+    @Value("${k3.cloud.url}")
+    private String k3CloudURL;
+    @Value("${k3.cloud.db}")
+    private String k3CloudDB;
+    @Value("${k3.cloud.account}")
+    private String k3CloudAccount;
+    @Value("${k3.cloud.password}")
+    private String k3CloudPassword;
+    @Value("${k3.cloud.lang}")
+    private String k3CloudLang;
+
+    @PostConstruct
+    public void init() {
+        KingDeeInvokeHelper.setConfigInfo(this);
+        KingDeeUser.setConfigInfo(this);
+    }
+}

src/main/java/com/zfire/mall/manager/config/k3/KingDeeUser.java

@@ -0,0 +1,32 @@
+package com.zfire.mall.manager.config.k3;
+
+public class KingDeeUser {
+
+    private static String DB;
+    private static String ACCOUNT;
+    private static String PASSWORD;
+    private static int LANG;
+
+    static void setConfigInfo(K3Config k3Config) {
+        KingDeeUser.DB = k3Config.getK3CloudDB();
+        KingDeeUser.ACCOUNT = k3Config.getK3CloudAccount();
+        KingDeeUser.PASSWORD = k3Config.getK3CloudPassword();
+        KingDeeUser.LANG = Integer.parseInt(k3Config.getK3CloudLang());
+    }
+
+    public static String getDB() {
+        return DB;
+    }
+
+    public static String getACCOUNT() {
+        return ACCOUNT;
+    }
+
+    public static String getPASSWORD() {
+        return PASSWORD;
+    }
+
+    public static int getLANG() {
+        return LANG;
+    }
+}

src/main/java/com/zfire/mall/manager/constant/Constant.java

@@ -0,0 +1,190 @@
+package com.zfire.mall.manager.constant;
+
+public class Constant {
+
+    //校验的token
+    public static final String TOKEN_NAME = "x-token";
+    //不可删除的角色
+    public static final String NOT_DEL_ROLE_NAME = "经销商";
+    //业务员
+    public static final String NOT_DEL_ROLE_NAME2 = "财务";
+    //商用
+    public static final String MAIN_SY = "商用";
+    //收款单
+    public static final String BILL_TYPE_SKD = "收款单";
+    //退款单
+    public static final String BILL_TYPE_TKD = "退款单";
+    public static final String BILL_TYPE_FKD = "付款单";
+    //收款单反审
+    public static final String BILL_TYPE_SKDFS = "收款单";
+    //退款单反审
+    public static final String BILL_TYPE_TKDFS = "退款单";
+    public static final String BILL_TYPE_FKDFS = "付款单";
+    public static final String BILL_TYPE_OFKD = "其他收款单";
+    //单据类型
+    public static final String BILLTYPE_FLD_ZR = "返利单(折让)";
+    //钱包其他(不接受这个钱包的任何信息)
+    public static final String WALLET_OTHER = "钱包-其他";
+
+    //经销商
+    public static final String REDIS_ROLE_DEALERS = "dealers";
+    //业务端
+    public static final String REDIS_ROLE_BUSINESS = "business";
+
+    //押金状态
+    public static final String STATUS_NOT_START = "未开始";
+
+    public static final String STATUS_EFFECT = "生效中";
+
+    public static final String STATUS_END = "已结束";
+
+    //币别
+    public static final String K3_AMOUNT_TYPE_RMB = "PRE001";
+
+
+    //其他入库出库方向
+    public static final String OTHER_STOCK_IN = "GENERAL";
+    public static final String OTHER_STOCK_OUT = "RETURN";
+
+
+
+    public class Ali {
+        public final static String ACCESS_KEY_ID = "LTAI5tN5RSgMtdGDrNDAqMLT";
+        public final static String ACCESS_KEY_SECERT = "mvWc8VtBFOj10DIa9E1eKiw3F0NRxf";
+        public final static String OSS_BUCKET_NAME="zfire-supply";
+        public final static String OSS_ENDPOINT_WW = "oss-cn-guangzhou.aliyuncs.com/";
+        public final static String OSS_ENDPOINT = "oss-cn-guangzhou-internal.aliyuncs.com/";
+        public final static String OSS_TYPE_PIC = "uploadfile/";
+    }
+
+    public class Ali_DEV {
+        public final static String ACCESS_KEY_ID = "LTAI4GK1q4mnpCFbonMd1pji";
+        public final static String ACCESS_KEY_SECERT = "E5LW0V1H8HBxqjKkExIxaXUgSyex6C";
+        public final static String OSS_BUCKET_NAME="zfiresupply";
+        public final static String OSS_ENDPOINT_WW = "oss-cn-hangzhou.aliyuncs.com/";
+        public final static String OSS_ENDPOINT = "oss-cn-hangzhou-internal.aliyuncs.com/";
+        public final static String OSS_TYPE_PIC = "uploadfile/";
+    }
+
+    public class File {
+        //系统通告附件
+        public final static String NOTICE = "notice_file";
+    }
+
+    public class RedisPrefix {
+
+        //工单token
+        public final static String TOKEN_GONGDAN = "SETTLE:TOKEN_GONGDAN:TOKEN";
+
+        //验证码
+        public final static String VERIFICATION = "supply:verification:";
+        //管理后台登录会话
+        public final static String TOKEN_MGR = "supply:token:mgr:";
+        //库存锁
+        public final static String LOCK_STOCK = "supply:lock:stock:";
+        //金蝶任务同步锁
+        public final static String LOCK_K3_TASK = "supply:lock:k3:task:";
+        // 发送短信
+        public final static String VALIDA_PHONE_SMS = "supply:lock:valida:phone:sms:";
+
+        // 登录验证码
+        public final static String LOGIN_MOBILE_SMS = "supply:login:mobile:sms:";
+
+        // 库存redis锁
+        public final static String STOCK_RESERVE = "supply:stock_reserve";
+
+        // 提货管理redis锁
+        public final static String PICK_MANAGER = "supply:pick:manager";
+
+        // 提货管理验证码
+        public final static String VALIDA_PICK_MANAGER = "supply:valida:pick:manager";
+
+        // 提货管理redis锁
+        public final static String PRINT_PICK_MANAGER = "supply:print:pick:manager";
+
+        public final static String GEN_BILL_ID = "supply:material:bill:";
+
+        // 计划单redis锁
+        public final static String PLAN_ORDER = "supply:plan:order";
+
+        // 申请单redis锁
+        public final static String INVOICE_APPLICATION = "supply:invoice:application";
+
+        //经销商钱包锁
+        public final static String LOCK_WALLET = "supply:lock:wallet2:";
+
+        public final static String LOCK_CUSTOMER = "supply:lock:customer:";
+
+        // 工程订单添加锁
+        public final static String ENGIN_ORDER_ADD = "supply:engin:order:add:";
+
+        // 工程订单锁
+        public final static String ENGIN_ORDER = "supply:engin:order:";
+
+        // 产品小类添加锁
+        public final static String PRODUCT_SUB_CATEGORY = "supply:product:sub:category:";
+
+        // 工程信息单
+        public final static String ENGIN_INFO_ORDER = "supply:engin:info:order:";
+
+        //直调单锁
+        public final static String LOCK_DIRECT_TRANSFER = "supply:lock:direct:transfer:";
+
+        //零售单锁
+        public final static String LOCK_RETAIL = "supply:lock:retail:";
+
+
+        // 退单redis锁
+        public final static String RETREAT_APPLICATION = "supply:retreat:application:";
+
+        // 预留单redis锁
+        public final static String RESERVED_APPLICATION = "supply:reserved:application";
+
+        // 押金管理锁
+        public final static String DEPOSIT_MANAGE = "supply:deposit:manage:";
+        // 押金管理锁
+        public final static String LOCK_DEPOSIT_MANAGE = "supply:lock:deposit:manage:";
+
+        // 直接调拨单redis锁
+        public final static String REQUISITION_APPLICATION = "supply:requisition:application";
+
+        // 置换单添加锁
+        public final static String DISPLACE_ORDER_ADD = "supply:displace:order:add:";
+
+        // 置换单锁
+        public final static String DISPLACE_ORDER = "supply:displace:order:";
+
+        //返利弹框key
+        public final static String REBATE_NOTICE = "supply::window::notice::";
+
+        //订单号每日流水
+        public final static String ORDER_NUM = "supply:orderNo:";
+
+
+        // 申请单redis锁
+        public final static String INVOICE_APPLICATION_KUCUN = "supply:invoice:application:KUCUN";
+
+    }
+
+
+    //嘉贤同步返回
+    //toC 物流订单轨迹
+    public static final String JIAXIAN_BRANCH_ORDER_TRACK = "BRANCH_ORDER_TRACK";
+    //派车单扫码条码头
+    public static final String JIAXIAN_SCAN_BAR_CODE = "SCAN_BAR_CODE";
+    //仓储出库物料条码
+    public static final String JIAXIAN_OUT_SCAN_BAR_CODE = "OUT_SCAN_BAR_CODE";
+    //商家结算费用账单
+    public static final String JIAXIAN_COST_BILL = "COST_BILL";
+
+    //商家对账单
+    public static final String JIAXIAN_COST_MERCHANT = "COST_MERCHANT";
+
+    //销司对账单
+    public static final String JIAXIAN_COST_SALES = "COST_SALES";
+
+
+    //工单
+    public static final String JIAXIAN_COST_TICKET = "COST_TICKET";
+
+}

src/main/java/com/zfire/mall/manager/constant/DingURLConstant.java

@@ -0,0 +1,64 @@
+package com.zfire.mall.manager.constant;
+
+public class DingURLConstant {
+    /**
+     * 钉钉网关gettoken地址
+     */
+    public static final String URL_GET_TOKKEN = "https://oapi.dingtalk.com/gettoken";
+
+    /**
+     *获取用户在企业内userId的接口URL
+     */
+    public static final String URL_GET_USER_INFO = "https://oapi.dingtalk.com/user/getuserinfo";
+
+    /**
+     *获取用户姓名的接口url
+     */
+    public static final String URL_USER_GET = "https://oapi.dingtalk.com/user/get";
+
+    /**
+     * 发起审批实例的接口url
+     */
+    public static final String URL_PROCESSINSTANCE_START = "https://oapi.dingtalk.com/topapi/processinstance/create";
+
+    /**
+     * 获取审批实例的接口url
+     */
+    public static final String URL_PROCESSINSTANCE_GET = "https://oapi.dingtalk.com/topapi/processinstance/get";
+
+    /**
+     * 发送企业通知消息的接口url
+     */
+    public static final String MESSAGE_ASYNCSEND = "https://oapi.dingtalk.com/topapi/message/corpconversation/asyncsend_v2";
+
+    /**
+     * 删除企业回调接口url
+     */
+    public static final String DELETE_CALLBACK = "https://oapi.dingtalk.com/call_back/delete_call_back";
+
+    /**
+     * 注册企业回调接口url
+     */
+    public static final String REGISTER_CALLBACK = "https://oapi.dingtalk.com/call_back/register_call_back";
+
+    /**
+     * 获取部门列表
+     */
+    public static final String URL_GET_DEPARTMENT = "https://oapi.dingtalk.com/topapi/v2/department/listsub";
+
+    /**
+     * 获取部门下成员userId
+     */
+    public static final String URL_GET_DEPARTMENT_USER = "https://oapi.dingtalk.com/topapi/user/listid";
+
+    /**
+     * 获取成员详情
+     */
+    public static final String URL_GET_DEPARTMENT_USER_DATEILS = "https://oapi.dingtalk.com/topapi/v2/user/get";
+
+    /**
+     * 获取成员详情
+     */
+    public static final String URL_GET_DEPARTMENT_CSPACE_INFO = "https://oapi.dingtalk.com/topapi/processinstance/cspace/info";
+
+}

src/main/java/com/zfire/mall/manager/constant/KingDeeCons.java

@@ -0,0 +1,184 @@
+package com.zfire.mall.manager.constant;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class KingDeeCons {
+
+    public final static String PREFIX_BILL_NO = "GYL";
+    public final static String NUMBER = "FNUMBER";
+    public final static String FPLAN_DATE = "FPlanDate";
+    // TODO 固定金蝶销售员 服务器启动的时候会赋值
+    public  static String SALERID = "test001_GW000001_1";
+    public final static String SALERID_TEST = "test001_GW000001_1";
+    public final static String SALERID_PRD = "yewu01_GW000001_1";
+
+    /**
+     * 组织机构
+     */
+    public final static String ORG_INFO = "ORG_Organizations";
+
+    /**
+     * 客户
+     */
+    public final static String CUSTOMER_INFO = "BD_Customer";
+
+    /**
+     * 供应商
+     */
+    public final static String SUPPLIER_INFO = "BD_Supplier";
+
+    /**
+     * 部门
+     */
+    public final static String DEPT_INFO = "BD_Department";
+
+    /**
+     * 物料
+     */
+    public final static String MATERIAL_INFO = "BD_MATERIAL";
+
+    /**
+     * 存货类别
+     */
+    public final static String CATEGORY_INFO = "BD_MATERIALCATEGORY";
+
+    /**
+     * 仓库
+     */
+    public final static String STOCK_INFO = "BD_STOCK";
+
+    /**
+     * 采购订单
+     */
+    public final static String PURCHASE_ORDER = "PUR_PurchaseOrder";
+
+    /**
+     * 采购退料订单
+     */
+    public final static String PURCHASE_RET_BILL = "PUR_MRB";
+
+    /**
+     * 销售退货单更新
+     */
+    public final static String SALE_RET_UPDATE = "SALE_RET_UPDATE";
+    /**
+     * 采购入库单更新
+     */
+    public final static String PURCHASE_IN_STOCK_UPDATE = "PURCHASE_IN_STOCK_UPDATE";
+    /**
+     * 销售出库单更新
+     */
+    public final static String SALE_OUT_STOCK_UPDATE = "SALE_OUT_STOCK_UPDATE";
+
+    /**
+     * 采购入库单
+     */
+    public final static String PURCHASE_IN_STOCK = "STK_InStock";
+
+    /**
+     * 销售订单
+     */
+    public final static String SALE_ORDER = "SAL_SaleOrder";
+
+    /**
+     * 销售退货单
+     */
+    public final static String SALE_RET_BILL = "SAL_RETURNSTOCK";
+
+    /**
+     * 销售出库单
+     */
+    public final static String SALE_OUT_STOCK = "SAL_OUTSTOCK";
+
+    /**
+     * 其他出库单
+     */
+    public final static String OTHER_OUT_STOCK = "STK_MisDelivery";
+
+    /**
+     * 其他入库单
+     */
+    public final static String OTHER_IN_STOCK = "STK_MISCELLANEOUS";
+
+    /**
+     * 直接调拨单
+     */
+    public final static String STOCK_TRANSFER = "STK_TransferDirect";
+
+    /**
+     * 盘亏单
+     */
+    public final static String STOCK_LOSS = "STK_StockCountLoss";
+
+    /**
+     * 盘盈单
+     */
+    public final static String STOCK_GAIN = "STK_StockCountGain";
+
+    /**
+     * 销售新变更单
+     */
+    public final static String SALE_CHANGE = "SAL_XORDER";
+
+    /**
+     * 下推采购订单到采购入库单
+     */
+    public final static String PUSH_PURCHASE_IN_STOCK = "PUR_PurchaseOrder-STK_InStock";
+
+    /**
+     * 下推销售订单到销售出库单
+     */
+    public final static String PUSH_SALE_OUT_STOCK = "SaleOrder-OutStock";
+
+    /**
+     * 下推销售出库单到销售退货单
+     */
+    public final static String PUSH_SALE_RET_STOCK = "OutStock-SalReturnStock";
+    /**
+     * 下推销售出库单到直接调拨单
+     */
+    public final static String PUSH_SALE_TRANSFER = "SaleOrder-StkTransferDirect";
+
+    /**
+     * 即时库存
+     */
+    public final static String STOCK_AMOUNT = "STK_Inventory";
+
+    /**
+     * 辅助资料-钱包
+     */
+    public final static String WALLET = "BOS_ASSISTANTDATA_DETAIL";
+
+    /**
+     * 收款单-计算钱包余额
+     */
+    public final static String WALLET_SKD= "AR_RECEIVEBILL";
+
+    /**
+     * 退款单-计算钱包余额
+     */
+    public final static String WALLET_TKD= "AR_REFUNDBILL";
+
+    /**
+     * 付款单-计算钱包余额
+     */
+    public final static String WALLET_FKD= "AP_PAYBILL";
+    /**
+
+    /**
+     * 应收款管理-其他应收单
+     */
+    public final static String AR_OTHER_REC_ABLE = "AR_OtherRecAble";
+
+    /**
+     * 发票管理-销售增值发票
+     */
+    public final static String IV_SALESIC = "IV_SALESIC";
+
+    /**
+     * 发票管理-销售普通发票
+     */
+    public final static String IV_SALESOC = "IV_SALESOC";
+
+}

src/main/java/com/zfire/mall/manager/constant/SysDictConstant.java

@@ -0,0 +1,15 @@
+package com.zfire.mall.manager.constant;
+
+public class SysDictConstant {
+
+    //机型类别
+    public final static String PRODUCT_TYPE = "PRODUCT_TYPE";
+    //经销商押金比例
+    public final static String DEPOSIT_RATE = "DEPOSIT_RATE";
+
+    // 单据执行状态
+    public final static String EDIT = "edit";
+    public final static String SUBMIT = "submit";
+    public final static String EXAMINE = "examine";
+
+}

src/main/java/com/zfire/mall/manager/enums/CommonFileTypeEnum.java

@@ -0,0 +1,13 @@
+package com.zfire.mall.manager.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum CommonFileTypeEnum {
+    TAKER_RECORD("提货人档案");
+
+    CommonFileTypeEnum(String name)  {
+        this.name = name;
+    }
+    private final String name;
+}

src/main/java/com/zfire/mall/manager/enums/EnginOrderTypeEnum.java

@@ -0,0 +1,14 @@
+package com.zfire.mall.manager.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum EnginOrderTypeEnum {
+    HOME("家用"),
+    TRADE("商用");
+
+    EnginOrderTypeEnum(String name)  {
+        this.name = name;
+    }
+    private final String name;
+}

src/main/java/com/zfire/mall/manager/enums/ExamineStatusEnum.java

@@ -0,0 +1,22 @@
+package com.zfire.mall.manager.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum ExamineStatusEnum {
+    SAVE("保存"),
+    WAIT("待审核"),
+    OK_ONE("初审通过"),
+    FAIL_ONE("初审不通过"),
+    OK("审核通过"),
+    FAIL("审核不通过"),
+    ABANDON("弃审"),
+    CLOSE("关闭");
+
+    private String msg;
+
+    ExamineStatusEnum( String msg){
+        this.msg=msg;
+    }
+
+}

src/main/java/com/zfire/mall/manager/enums/K3SyncStatusEnum.java

@@ -0,0 +1,13 @@
+package com.zfire.mall.manager.enums;
+
+public enum K3SyncStatusEnum {
+    NOT("未同步"),
+    SALES("销售订单"),
+    OUTSTOCK("销售出库单"),
+    TRANSFER("直接调拨单");
+
+    K3SyncStatusEnum(String name)  {
+        this.name = name;
+    }
+    private final String name;
+}

src/main/java/com/zfire/mall/manager/enums/MachineConfigureTypeEnum.java

@@ -0,0 +1,17 @@
+package com.zfire.mall.manager.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum MachineConfigureTypeEnum {
+    INNER("内机"),
+    OUTSIDE("外机"),
+    PARTS("配件"),
+    ;
+
+    private final String msg;
+
+    MachineConfigureTypeEnum( String msg){
+        this.msg=msg;
+    }
+}

src/main/java/com/zfire/mall/manager/enums/OrderTypeEnum.java

@@ -0,0 +1,16 @@
+package com.zfire.mall.manager.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum OrderTypeEnum {
+    HOME("家用"),
+    TRADE("商用"),
+    RETAIL("零售"),
+    RETAIL_POLICY("销售政策单");
+
+    OrderTypeEnum(String name)  {
+        this.name = name;
+    }
+    private final String name;
+}

src/main/java/com/zfire/mall/manager/enums/PickStatusEnum.java

@@ -0,0 +1,24 @@
+package com.zfire.mall.manager.enums;
+
+import lombok.Getter;
+
+/**
+ * @author xiaomj
+ */
+@Getter
+public enum PickStatusEnum {
+    WAIT_PRINT(0,"未打单"),
+    HAS_PRINT(1,"已打单"),
+    HAS_SHIPMENT(2,"已出货"),
+    GIVE_UP_ORDER(3,"弃单");
+
+    private Integer code;
+    private String msg;
+
+    PickStatusEnum(Integer code, String msg){
+        this.code = code;
+        this.msg = msg;
+    }
+
+
+}

src/main/java/com/zfire/mall/manager/enums/PolicyTypeEnum.java

@@ -0,0 +1,17 @@
+package com.zfire.mall.manager.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum PolicyTypeEnum {
+
+    PROVISION("配提"),
+    LIMIT("限量");
+
+
+    private String value;
+
+    PolicyTypeEnum(String value){
+        this.value=value;
+    }
+}

src/main/java/com/zfire/mall/manager/enums/RoleTypeEnum.java

@@ -0,0 +1,22 @@
+package com.zfire.mall.manager.enums;
+
+
+import lombok.Getter;
+
+@Getter
+public enum RoleTypeEnum {
+    WEBSIT(0,"部门"),
+    COMPANY(1,"企业"),
+    ADMIN(2,"平台"),
+    ;
+
+    private Integer code;
+    private String msg;
+
+    RoleTypeEnum(Integer code, String msg){
+        this.code=code;
+        this.msg=msg;
+    }
+
+
+}

src/main/java/com/zfire/mall/manager/enums/SMSTypeEnum.java

@@ -0,0 +1,15 @@
+package com.zfire.mall.manager.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum SMSTypeEnum {
+    VALIDA_PHONE_SMS("验证提货人手机号"),
+    LOGIN_MOBILE_SMS("登录验证码");
+
+    private final String type;
+
+    SMSTypeEnum(String type){
+        this.type = type;
+    }
+}

src/main/java/com/zfire/mall/manager/enums/SysDictEnum.java

@@ -0,0 +1,26 @@
+package com.zfire.mall.manager.enums;
+
+
+import lombok.Getter;
+
+@Getter
+public enum SysDictEnum {
+    PRODUCT_TYPE("机型品类"),
+    DEPOSIT_RATE("押金"),
+    PICK("提货方式"),
+    MACHINE_CONFIGURE("机器配置类型"),
+    TAKER_RECORD("提货人档案状态"),
+    STOCK_ORDER("库存判断"),
+    ORDER_TIME_LIMIT("订单日期设置"),
+    ENGIN_TWO_PWD("工程第二次引用的密码"),
+    RESERVED_DAY("自动预留单生成"),
+    PRINT_PASSWORD("打印出库单密码")
+    ;
+
+    private String name;
+    SysDictEnum(String name){
+        this.name = name;
+    }
+
+
+}

src/main/java/com/zfire/mall/manager/enums/WalletTypeEnum.java

@@ -0,0 +1,19 @@
+package com.zfire.mall.manager.enums;
+
+
+import lombok.Getter;
+
+@Getter
+public enum WalletTypeEnum {
+    COMMONLY("现金钱包"),
+    REBATE("返利钱包");
+
+
+    private String msg;
+
+    WalletTypeEnum(String msg){
+        this.msg=msg;
+    }
+
+
+}

src/main/java/com/zfire/mall/manager/exception/FeignServiceException.java

@@ -0,0 +1,23 @@
+package com.zfire.mall.manager.exception;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @author wy
+ */
+@Getter
+@Setter
+public class FeignServiceException extends RemoteServiceException {
+
+    private String serviceName;
+    private String requestUrl;
+    private List<String> serviceStackTrace;
+
+    public FeignServiceException(int status, String message) {
+        super(status, message);
+    }
+
+}

src/main/java/com/zfire/mall/manager/exception/RemoteServiceException.java

@@ -0,0 +1,40 @@
+package com.zfire.mall.manager.exception;
+
+
+import com.zfire.mall.manager.helper.ResponseHelper;
+import com.zfire.mall.manager.helper.ResponseHelper;
+import org.springframework.http.ResponseEntity;
+
+public class RemoteServiceException extends RuntimeException {
+    private int status;
+    private String message;
+
+    public RemoteServiceException(String message){
+        this.status = ResponseHelper.ResponseCode_COMMON;
+        this.message = message;
+    }
+
+    public RemoteServiceException(int status, String message) {
+
+        this.status = status;
+        this.message = message;
+
+    }
+
+    @Override
+    public String getMessage() {
+        return this.message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public int getCode() {
+        return this.status;
+    }
+
+    public ResponseHelper toResponse(){
+        return ResponseHelper.error(this.status,this.message);
+    }
+}

src/main/java/com/zfire/mall/manager/helper/FeignResponseObject.java

@@ -0,0 +1,34 @@
+package com.zfire.mall.manager.helper;
+
+
+import com.zfire.mall.manager.exception.FeignServiceException;
+import com.zfire.mall.manager.exception.RemoteServiceException;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Arrays;
+import java.util.List;
+
+
+@Data
+@Slf4j
+public class FeignResponseObject<T> {
+
+    public List<Integer> responseSuccessCodes = Arrays.asList(1,200);
+
+    private int code;
+    private T data;
+    private String msg;
+    private String serviceName;
+    private String requestUrl;
+    private List<String> stackTrace;
+
+    public T checkOutData()throws RemoteServiceException {
+        if (responseSuccessCodes.contains(code)) {
+            return this.data;
+        }
+        throw new RemoteServiceException(this.code,this.msg);
+    }
+
+
+}

src/main/java/com/zfire/mall/manager/helper/KingDeeInvokeHelper.java

@@ -0,0 +1,283 @@
+package com.zfire.mall.manager.helper;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.zfire.mall.manager.config.k3.K3Config;
+import lombok.extern.slf4j.Slf4j;
+import java.io.BufferedReader;
+import java.io.DataOutputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+@Slf4j
+public class KingDeeInvokeHelper {
+
+	private static String POST_K3CloudURL;
+
+	// Cookie 值
+	private static String CookieVal = null;
+
+	private static Map map = new HashMap();
+	static {
+		map.put("Draft",
+				"Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Draft.common.kdsvc");
+		map.put("Save",
+				"Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save.common.kdsvc");
+		map.put("View",
+				"Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.View.common.kdsvc");
+		map.put("Submit",
+				"Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit.common.kdsvc");
+		map.put("Audit",
+				"Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit.common.kdsvc");
+		map.put("UnAudit",
+				"Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.UnAudit.common.kdsvc");
+		map.put("StatusConvert",
+				"Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.StatusConvert.common.kdsvc");
+		map.put("ExecuteBillQuery",
+				"Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.ExecuteBillQuery.common.kdsvc");
+		map.put("Delete",
+				"Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Delete.common.kdsvc");
+		map.put("Push",
+				"Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Push.common.kdsvc");
+		map.put("CancelAssign",
+				"Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.CancelAssign.common.kdsvc");
+		map.put("SaveXSaleOrder",
+				"Kingdee.K3.SCM.WebApi.ServicesStub.SaveXSaleOrderWebApi.SaveXSaleOrder.common.kdsvc");
+		map.put("ExcuteOperation",
+				"Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.ExcuteOperation.common.kdsvc");
+	}
+
+	public static void setConfigInfo(K3Config k3Config) {
+		KingDeeInvokeHelper.POST_K3CloudURL = k3Config.getK3CloudURL();
+	}
+
+	// HttpURLConnection
+	private static HttpURLConnection initUrlConn(String url, JSONArray paras)
+			throws Exception {
+		URL postUrl = new URL(POST_K3CloudURL.concat(url));
+		HttpURLConnection connection = (HttpURLConnection) postUrl
+				.openConnection();
+		if (CookieVal != null) {
+			connection.setRequestProperty("Cookie", CookieVal);
+		}
+		if (!connection.getDoOutput()) {
+			connection.setDoOutput(true);
+		}
+		connection.setRequestMethod("POST");
+		connection.setUseCaches(false);
+		connection.setInstanceFollowRedirects(true);
+		connection.setRequestProperty("Content-Type", "application/json");
+		DataOutputStream out = new DataOutputStream(
+				connection.getOutputStream());
+
+		UUID uuid = UUID.randomUUID();
+		int hashCode = uuid.toString().hashCode();
+
+		if (paras.size() > 1) {
+			String content = paras.getString(1);
+			if (content.contains("TakeEffect")) {
+				out.writeBytes(paras.getString(1));
+				out.flush();
+				out.close();
+
+				return connection;
+			}
+		}
+
+		JSONObject jObj = new JSONObject();
+
+		jObj.put("format", 1);
+		jObj.put("useragent", "ApiClient");
+		jObj.put("rid", hashCode);
+		jObj.put("parameters", chinaToUnicode(paras.toString()));
+		jObj.put("timestamp", new Date().toString());
+		jObj.put("v", "1.0");
+
+		out.writeBytes(jObj.toString());
+		out.flush();
+		out.close();
+
+		return connection;
+	}
+
+	// Login
+	public static boolean Login(String dbId, String user, String pwd, int lang)
+			throws Exception {
+
+
+
+		boolean bResult = false;
+
+		String sUrl = "Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc";
+
+		JSONArray jParas = new JSONArray();
+		jParas.add(dbId);// 帐套Id
+		jParas.add(user);// 用户名
+		jParas.add(pwd);// 密码
+		jParas.add(lang);// 语言
+
+		HttpURLConnection connection = initUrlConn(sUrl, jParas);
+		// 获取Cookie
+		String key = null;
+		for (int i = 1; (key = connection.getHeaderFieldKey(i)) != null; i++) {
+			if (key.equalsIgnoreCase("Set-Cookie")) {
+				String tempCookieVal = connection.getHeaderField(i);
+				if (tempCookieVal.startsWith("kdservice-sessionid")) {
+					CookieVal = tempCookieVal;
+					break;
+				}
+			}
+		}
+
+		BufferedReader reader = new BufferedReader(new InputStreamReader(
+				connection.getInputStream()));
+		String line;
+		log.info(" ============================= ");
+		log.info(" Contents of post request ");
+		log.info(" ============================= ");
+		while ((line = reader.readLine()) != null) {
+			String sResult = new String(line.getBytes(), "utf-8");
+			log.info(sResult);
+			bResult = line.contains("\"LoginResultType\":1");
+			if (!bResult) {throw new RuntimeException("登录失败: " + line);}
+		}
+		log.info(" ============================= ");
+		log.info(" Contents of post request ends ");
+		log.info(" ============================= ");
+		reader.close();
+
+		connection.disconnect();
+
+		return bResult;
+	}
+
+	// Save 保存
+	public static String Draft(String formId, String content) throws Exception {
+		return Invoke("Draft", formId, content);
+	}
+
+	// Save 保存
+	public static String Save(String formId, String content) throws Exception {
+		return Invoke("Save", formId, content);
+	}
+
+	// View 查看
+	public static void View(String formId, String content) throws Exception {
+		Invoke("View", formId, content);
+	}
+
+	// Submit 提交
+	public static void Submit(String formId, String content) throws Exception {
+		Invoke("Submit", formId, content);
+	}
+
+	// Audit 审核
+	public static void Audit(String formId, String content) throws Exception {
+		Invoke("Audit", formId, content);
+	}
+
+	// CancelAssign 撤消
+	public static String Cancel(String formId, String content) throws Exception {
+		return Invoke("CancelAssign", formId, content);
+	}
+
+	// UnAudit 反审核
+	public static String UnAudit(String formId, String content) throws Exception {
+		return Invoke("UnAudit", formId, content);
+	}
+
+	// StatusConvert
+	public static void StatusConvert(String formId, String content)
+			throws Exception {
+		Invoke("StatusConvert", formId, content);
+	}
+
+	// ExecuteBillQuery 表单数据查询
+	public static String ExecuteBillQuery(String formId, String content)
+			throws Exception {
+		return Invoke("ExecuteBillQuery", formId, content);
+	}
+
+	// Delete 删除
+	public static String Delete(String formId, String content)
+			throws Exception {
+		return Invoke("Delete", formId, content);
+	}
+
+	// Push 下推
+	public static String Push(String formId, String content)
+			throws Exception {
+		return Invoke("Push", formId, content);
+	}
+
+	// 销售订单新变更单
+	public static String SaveXSaleOrder(String formId, String content)
+			throws Exception {
+		return Invoke("SaveXSaleOrder", formId, content);
+	}
+
+	public static String ExcuteOperation(String formId, String content)
+			throws Exception {
+		return Invoke("ExcuteOperation", formId, content);
+	}
+
+
+	private static String Invoke(String deal, String formId, String content)
+			throws Exception {
+		log.info(deal + " Invoke content: " + content);
+		String sUrl = map.get(deal).toString();
+		JSONArray jParas = new JSONArray();
+		if (StringUtils.isNotEmpty(formId)) {
+			jParas.add(formId);
+		}
+		jParas.add(content);
+
+		HttpURLConnection connectionInvoke = initUrlConn(sUrl, jParas);
+
+		BufferedReader reader = new BufferedReader(new InputStreamReader(
+				connectionInvoke.getInputStream()));
+
+		String line;
+		log.info(" ============================= ");
+		log.info(" Contents of post request ");
+		log.info(" ============================= ");
+		String sResult = "";
+		while ((line = reader.readLine()) != null) {
+			sResult = new String(line.getBytes(), StandardCharsets.UTF_8);
+			log.info("formId:{},data:{}",formId,sResult);
+		}
+		log.info(" ============================= ");
+		log.info(" Contents of post request ends ");
+		log.info(" ============================= ");
+		reader.close();
+
+		connectionInvoke.disconnect();
+		return sResult;
+	}
+
+	/**
+	 * 把中文转成Unicode码
+	 * 
+	 * @param str
+	 * @return
+	 */
+	public static String chinaToUnicode(String str) {
+		String result = "";
+		for (int i = 0; i < str.length(); i++) {
+			int chr1 = (char) str.charAt(i);
+			if (chr1 >= 19968 && chr1 <= 171941) {// 汉字范围 \u4e00-\u9fa5 (中文)
+				result += "\\u" + Integer.toHexString(chr1);
+			} else {
+				result += str.charAt(i);
+			}
+		}
+		return result;
+	}
+}

src/main/java/com/zfire/mall/manager/helper/ResponseHelper.java

@@ -0,0 +1,78 @@
+package com.zfire.mall.manager.helper;
+
+import io.swagger.annotations.ApiModel;
+
+@ApiModel
+public class ResponseHelper<T> {
+
+
+    public static int ResponseCode_Success = 200;
+    public static int ResponseCode_COMMON = 501;//通用拦截提示
+    public static int ResponseCode_AUTH_ERROR = 1001;//非法请求
+    public static int ResponseCode_VALIDATION_ERROR = 4005;// 校验拦截提示
+
+    private T data;
+    private String message;
+    private int code;
+
+
+    public static ResponseHelper success() {
+        ResponseHelper object = new ResponseHelper(ResponseCode_Success, "success");
+        return object;
+    }
+
+    public static ResponseHelper success(Object data) {
+        ResponseHelper object = new ResponseHelper(ResponseCode_Success, "success");
+        object.setData(data);
+        return object;
+    }
+
+    public static ResponseHelper success(int code,Object data,String message) {
+        ResponseHelper object = new ResponseHelper(ResponseCode_Success, "success");
+        object.setData(data);
+        object.setCode(code);
+        object.setMessage(message);
+        return object;
+    }
+
+    public static ResponseHelper error(String msg) {
+        ResponseHelper object = new ResponseHelper(ResponseCode_COMMON, msg);
+        return object;
+    }
+
+    public static ResponseHelper error(int code, String msg) {
+        ResponseHelper object = new ResponseHelper(code, msg);
+        return object;
+    }
+
+
+    public T getData() {
+        return data;
+    }
+
+    public void setData(Object data) {
+        this.data = (T)data;
+    }
+
+    public ResponseHelper(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int status) {
+        this.code = status;
+    }
+
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+}

src/main/java/com/zfire/mall/manager/logic/k3/K3CategoryLogic.java

@@ -0,0 +1,43 @@
+package com.zfire.mall.manager.logic.k3;
+
+import com.zfire.mall.manager.bean.k3.RequestApiBean;
+import com.zfire.mall.manager.constant.KingDeeCons;
+import com.zfire.mall.manager.plus.entity.KingDeeCategory;
+import com.zfire.mall.manager.plus.service.KingDeeCategoryService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+@Slf4j
+public class K3CategoryLogic {
+
+    @Resource
+    KingDeeCategoryService kingDeeCategoryService;
+    @Resource
+    K3Logic k3Logic;
+
+    @Transactional
+    public void allSync(String orgId, String orgNumber, String startTime, String endTime) throws Exception {
+        // 调用存货类别接口
+        RequestApiBean request = k3Logic.getInstance(orgId, orgNumber, KingDeeCons.CATEGORY_INFO, startTime, endTime);
+        String filterStr = "FDocumentStatus = 'C' AND FUseOrgId.FNUMBER = %s "+ k3Logic.supplySql(request.getStartTime(), request.getEndTime());
+        request.setFieldKeys("FCATEGORYID,FNUMBER,FNAME,FUseOrgId,FUseOrgId.FNUMBER,FUseOrgId.FName");
+        //request.setFieldKeys("FNUMBER,FNUMBER,FNAME,FUseOrgId,FUseOrgId.FNUMBER,FUseOrgId.FName");
+        request.setFilterString(String.format(filterStr, orgNumber));
+
+        String[] fields = new String[]{"id","number","name","useOrgId","useOrgNumber","useOrgName"};
+        List<KingDeeCategory> objects = k3Logic.allSync(request, fields, KingDeeCategory.class);
+        if (!org.springframework.util.CollectionUtils.isEmpty(objects)) {
+
+            List<String> numbers = objects.stream().map(KingDeeCategory::getNumber).collect(Collectors.toList());
+            kingDeeCategoryService.lambdaUpdate().in(KingDeeCategory::getNumber,numbers).remove();
+
+            kingDeeCategoryService.saveOrUpdateBatch(objects);
+        }
+    }
+}

src/main/java/com/zfire/mall/manager/logic/k3/K3CustomerLogic.java

@@ -0,0 +1,62 @@
+package com.zfire.mall.manager.logic.k3;
+
+import com.zfire.mall.manager.bean.k3.RequestApiBean;
+import com.zfire.mall.manager.constant.KingDeeCons;
+import com.zfire.mall.manager.logic.wallet.WalletLogic;
+import com.zfire.mall.manager.plus.entity.KingDeeCustomer;
+import com.zfire.mall.manager.plus.service.KingDeeCustomerService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Slf4j
+@Service
+public class K3CustomerLogic {
+
+
+    @Autowired
+    KingDeeCustomerService kingDeeCustomerService;
+    @Autowired
+    K3Logic k3Logic;
+    @Autowired
+    WalletLogic walletLogic;
+
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    public void allSync(String orgId, String orgNumber, String startTime, String endTime) throws Exception {
+        //String filterStr = "FDocumentStatus = 'C' AND FApproveDate > '%s' AND FApproveDate <= '%s'";
+
+        // 登录成功调客户接口
+        RequestApiBean request = k3Logic.getInstance(orgId, orgNumber, KingDeeCons.CUSTOMER_INFO, startTime, endTime);
+        String filterStr = "FDocumentStatus = 'C' AND FUseOrgId.FNUMBER = %s " + k3Logic.supplySql(request.getStartTime(), request.getEndTime());
+        request.setFieldKeys("FCUSTID,FNUMBER,FNAME,FUseOrgId,FUseOrgId.FNUMBER,FUseOrgId.FName,FTEL,FSALDEPTID.FNumber,FSALDEPTID.FName," +
+                "FINVOICETITLE,FTAXREGISTERCODE,FINVOICEBANKNAME,FINVOICEBANKACCOUNT,FINVOICETEL,FINVOICEADDRESS,FEMail,FPROVINCE,FCITY,FPROVINCIAL,F_kls_Text");
+//        request.setFieldKeys("FNUMBER,FNUMBER,FNAME,FUseOrgId,FUseOrgId.FNUMBER,FUseOrgId.FName,FTEL,FSALDEPTID.FNumber,FSALDEPTID.FName," +
+//                "FINVOICETITLE,FTAXREGISTERCODE,FINVOICEBANKNAME,FINVOICEBANKACCOUNT,FINVOICETEL,FINVOICEADDRESS,FEMail,FPROVINCE,FCITY,FPROVINCIAL,F_kls_Text");
+        request.setFilterString(String.format(filterStr, orgNumber));
+        request.setOrderString("FCUSTID ASC");
+
+
+        String[] fields = new String[]{"id","number","name","useOrgId","useOrgNumber","useOrgName","mobile","saleDeptNumber","saleDeptName",
+        "invoiceTitle","taxNo","bank","bankAccount","invoicePhone","invoiceAddress","email","province","city","region","secondCustomerNumber"};
+        List<KingDeeCustomer> objects = k3Logic.allSync(request, fields, KingDeeCustomer.class);
+        if (!org.springframework.util.CollectionUtils.isEmpty(objects)) {
+            kingDeeCustomerService.saveOrUpdateBatch(objects);
+
+//            //初始化钱包
+//            for(KingDeeCustomer kingDeeCustomer :objects){
+//                    walletLogic.initByK3Customer(kingDeeCustomer.getId());
+//            }
+            walletLogic.initByK3Customer(null);
+
+        }
+    }
+
+    public List<KingDeeCustomer> allList(){
+        return kingDeeCustomerService.list();
+    }
+
+}

src/main/java/com/zfire/mall/manager/logic/k3/K3DepartmentLogic.java

@@ -0,0 +1,39 @@
+package com.zfire.mall.manager.logic.k3;
+
+import com.zfire.mall.manager.bean.k3.RequestApiBean;
+import com.zfire.mall.manager.constant.KingDeeCons;
+import com.zfire.mall.manager.plus.entity.KingDeeDepartment;
+import com.zfire.mall.manager.plus.service.KingDeeDepartmentService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Objects;
+
+@Service
+@Slf4j
+public class K3DepartmentLogic {
+
+    @Resource
+    KingDeeDepartmentService kingDeeDepartmentService;
+    @Resource
+    K3Logic k3Logic;
+
+    public void allSync(String orgId, String orgNumber, String startTime, String endTime) throws Exception {
+        // 调用部门接口
+        RequestApiBean request = k3Logic.getInstance(orgId, orgNumber, KingDeeCons.DEPT_INFO, startTime, endTime);
+        String filterStr = "FDocumentStatus = 'C' AND FUseOrgId.FNUMBER = %s "+ k3Logic.supplySql("FAuditDate", request.getStartTime(), request.getEndTime());
+        request.setFieldKeys("FDEPTID,FNUMBER,FNAME,FUseOrgId,FUseOrgId.FNUMBER,FUseOrgId.FName");
+        //request.setFieldKeys("FNUMBER,FNUMBER,FNAME,FUseOrgId,FUseOrgId.FNUMBER,FUseOrgId.FName");
+        request.setFilterString(String.format(filterStr, orgNumber));
+        request.setOrderString("FDEPTID ASC");
+
+        String[] fields = new String[]{"id","number","name","useOrgId","useOrgNumber","useOrgName"};
+        List<KingDeeDepartment> objects = k3Logic.allSync(request, fields, KingDeeDepartment.class);
+        if (!CollectionUtils.isEmpty(objects)) {
+            kingDeeDepartmentService.saveOrUpdateBatch(objects);
+        }
+    }
+}

src/main/java/com/zfire/mall/manager/logic/k3/K3Logic.java

@@ -0,0 +1,408 @@
+package com.zfire.mall.manager.logic.k3;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ReUtil;
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.zfire.mall.manager.bean.k3.RequestApiBean;
+import com.zfire.mall.manager.config.k3.KingDeeUser;
+import com.zfire.mall.manager.constant.KingDeeCons;
+import com.zfire.mall.manager.exception.RemoteServiceException;
+import com.zfire.mall.manager.helper.KingDeeInvokeHelper;
+import com.zfire.mall.manager.plus.entity.KingDeeInterface;
+import com.zfire.mall.manager.plus.entity.KingDeeSyncTask;
+import com.zfire.mall.manager.plus.service.KingDeeInterfaceService;
+import com.zfire.mall.manager.plus.service.KingDeeSyncTaskService;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.integration.redis.util.RedisLockRegistry;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.lang.reflect.Field;
+import java.math.BigDecimal;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+@Slf4j
+@Service
+public class K3Logic {
+
+    @Autowired
+    RedisLockRegistry redisLockRegistry;
+    @Autowired
+    KingDeeSyncTaskService kingDeeSyncTaskService;
+    @Resource
+    KingDeeInterfaceService kingDeeInterfaceService;
+
+    public <T> List<T> allSync(RequestApiBean requestApiBean, String[] objFields, Class cls) throws Exception {
+        // 结果集
+        List<T> list = new ArrayList<>();
+
+        //多拿1个审核时间作为结束时间,此字段会比实际反射的实体类要多，所以最后一个字段在反射的时候不处理
+        //即时库存没审核时间
+        if(!requestApiBean.getFormId().equals(KingDeeCons.STOCK_AMOUNT)) {
+            if (requestApiBean.getFormId().equals(KingDeeCons.DEPT_INFO)
+                    || requestApiBean.getFormId().equals(KingDeeCons.ORG_INFO)
+                    || requestApiBean.getFormId().equals(KingDeeCons.SUPPLIER_INFO)
+                    || requestApiBean.getFormId().equals(KingDeeCons.STOCK_INFO)) {
+                requestApiBean.setFieldKeys(requestApiBean.getFieldKeys() + ",FAuditDate");
+            } else if (requestApiBean.getFormId().equals(KingDeeCons.CUSTOMER_INFO)
+                    || requestApiBean.getFormId().equals(KingDeeCons.OTHER_IN_STOCK)
+                    || requestApiBean.getFormId().equals(KingDeeCons.WALLET_FKD)) {
+                requestApiBean.setFieldKeys(requestApiBean.getFieldKeys() + ",FAPPROVEDATE");
+            } else {
+                requestApiBean.setFieldKeys(requestApiBean.getFieldKeys() + ",FApproveDate");
+            }
+        }
+
+
+
+        //最后更新时间
+        Date lastTime = null;
+
+        String taskId = null;
+        try {
+            //检查是否允许同步
+            taskId = this.checkDistExec(requestApiBean);
+            if (taskId == null) {
+                throw new RemoteServiceException(requestApiBean.getFormId()+"目前存在同步中的任务，请稍后再试");
+            }
+            // 登录金蝶
+            if (!KingDeeInvokeHelper.Login(KingDeeUser.getDB(), KingDeeUser.getACCOUNT(), KingDeeUser.getPASSWORD(), KingDeeUser.getLANG())) {
+                return null;
+            }
+            final int pageSize = 1000;
+            boolean exists = true;
+            while (exists) {
+                // 返回结果
+                log.info("【对接金蝶】request：{}", requestApiBean);
+                String result = KingDeeInvokeHelper.ExecuteBillQuery(null, JSONUtil.toJsonStr(requestApiBean));
+                if (result.equals("[]")) {
+                    exists = false;
+                    continue;
+                }
+//            log.info("【对接金蝶】response：{}", requestApiBean);
+                Object[] resultList = JSON.parseArray(result).toArray();
+//            this.setKingDeeValue(objFields, resultList, KingDeeMaterial.class);
+                for (Object o : resultList) {
+                    JSONArray oo = (JSONArray) o;
+
+                    if(oo.size() != objFields.length) {
+                        if(oo != null && oo.size() > 0 && oo.get(oo.size()-1) != null){
+                            //将本次数据的最大的审核时间作为下次拉数据的起始时间
+                            String examineTimeStr = oo.get(oo.size()-1).toString();
+                            Date examineTime = this.k3TimeConvert(examineTimeStr);
+                            if(examineTime != null && lastTime == null)
+                                lastTime = examineTime;
+                            if(examineTime != null && lastTime != null && examineTime.getTime() > lastTime.getTime())
+                                lastTime = examineTime;
+                        }
+                        //删除最后的元素(审核时间)
+                        oo.remove(oo.size() - 1);
+                    }
+
+                    T tObj = this.setKingDeeValue(objFields, oo.toArray(), cls);
+                    if (tObj != null)
+                        list.add(tObj);
+                }
+                //判断是否需要多次请求，金蝶默认1次只能拿1000条数据
+                if (resultList.length == (requestApiBean.getTopRowCount() - requestApiBean.getStartRow())) {
+                    requestApiBean.setTopRowCount(requestApiBean.getTopRowCount() + pageSize);
+                    requestApiBean.setStartRow(requestApiBean.getStartRow() + pageSize);
+                } else {
+                    exists = false;
+                }
+            }
+            //notTime = 不需要更新时间，lastTime=金蝶的本次同步数据里的最新审核时间
+            if(!requestApiBean.getNotTime() && lastTime != null) {
+                // 记录最后一同步时间
+                kingDeeInterfaceService.lambdaUpdate()
+                        .eq(KingDeeInterface::getOrgId, requestApiBean.getOrgId())
+                        .eq(KingDeeInterface::getOrgNumber, requestApiBean.getOrgNumber())
+                        .eq(KingDeeInterface::getFormId, requestApiBean.getFormId())
+                        //.set(KingDeeInterface::getSyncLastTime, requestApiBean.getEndTime())
+                        .set(KingDeeInterface::getSyncLastTime,lastTime)
+                        .update();
+            }
+        } finally {
+            //不管报错否，都要完成本次任务，不能阻塞后面的运行
+            this.updateSyncTask(taskId,requestApiBean.getNotTime());
+        }
+        return list;
+    }
+
+    private void updateSyncTask(String taskId,Boolean notTime) {
+        if(StringUtils.isEmpty(taskId)){
+            return;
+        }
+        kingDeeSyncTaskService.lambdaUpdate()
+                .set(KingDeeSyncTask::getStatus, 1)
+                .set(!notTime,KingDeeSyncTask::getSyncTime, DateUtil.formatDateTime(new Date()))
+                .eq(KingDeeSyncTask::getId,taskId)
+                .update();
+    }
+
+
+    /**
+     * 检查是否重复执行
+     */
+    public String checkDistExec(RequestApiBean requestApiBean){
+   //     Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.LOCK_K3_TASK + requestApiBean.getFormId());
+        try {
+            //if (obtain.tryLock(5, TimeUnit.SECONDS)) {
+
+                KingDeeInterface kingDeeInterface = kingDeeInterfaceService.lambdaQuery()
+                        .eq(KingDeeInterface::getFormId, requestApiBean.getFormId()).one();
+
+                KingDeeSyncTask kingDeeSyncTask = new KingDeeSyncTask();
+                kingDeeSyncTask.setOrgId(requestApiBean.getOrgId());
+                kingDeeSyncTask.setOrgNumber(requestApiBean.getOrgNumber());
+                kingDeeSyncTask.setFormId(requestApiBean.getFormId());
+                kingDeeSyncTask.setTaskId(IdWorker.getIdStr());
+                if (kingDeeInterface != null) {
+                    kingDeeSyncTask.setName(kingDeeInterface.getName());
+                }
+                if (Objects.nonNull(requestApiBean.getStartTime())) {
+                    kingDeeSyncTask.setStartTime(DateUtil.parseDateTime(requestApiBean.getStartTime()));
+                }
+                if (Objects.nonNull(requestApiBean.getEndTime())) {
+                    kingDeeSyncTask.setEndTime(DateUtil.parseDateTime(requestApiBean.getEndTime()));
+                }
+                kingDeeSyncTask.setType(requestApiBean.getFormType());
+                kingDeeSyncTask.insert();
+
+                return kingDeeSyncTask.getId();
+
+                //return count == 0;
+        //    }
+        } catch (Exception e) {
+            log.error("【金蝶】检查是否重复执行失败", e);
+        } finally {
+    //        obtain.unlock();
+        }
+        return null;
+    }
+
+    /**
+     * 检查是否重复执行
+     */
+    public String checkDistNoLockExec(RequestApiBean requestApiBean, String type) {
+        KingDeeInterface kingDeeInterface = kingDeeInterfaceService.lambdaQuery().eq(KingDeeInterface::getFormId, requestApiBean.getFormId()).one();
+
+        Integer count = kingDeeSyncTaskService.lambdaQuery()
+                .eq(KingDeeSyncTask::getFormId, requestApiBean.getFormId())
+                .eq(KingDeeSyncTask::getStatus, 0).count();
+        if (count == 0) {
+            KingDeeSyncTask kingDeeSyncTask = new KingDeeSyncTask();
+            kingDeeSyncTask.setOrgId(requestApiBean.getOrgId());
+            kingDeeSyncTask.setOrgNumber(requestApiBean.getOrgNumber());
+            kingDeeSyncTask.setFormId(requestApiBean.getFormId());
+            kingDeeSyncTask.setTaskId(IdUtil.simpleUUID());
+            kingDeeSyncTask.setName(kingDeeInterface.getName());
+            if (Objects.nonNull(requestApiBean.getStartTime())) {
+                kingDeeSyncTask.setStartTime(DateUtil.parseDateTime(requestApiBean.getStartTime()));
+            }
+            if (Objects.nonNull(requestApiBean.getEndTime())) {
+                kingDeeSyncTask.setEndTime(DateUtil.parseDateTime(requestApiBean.getEndTime()));
+            }
+            kingDeeSyncTask.setType(requestApiBean.getFormType());
+            kingDeeSyncTask.insert();
+            return kingDeeSyncTask.getId();
+        }
+
+        return null;
+    }
+
+    /**
+     * 通过java反射机制赋值
+     *
+     * @param fileds
+     * @param attrs
+     * @param cls
+     * @param <T>
+     * @return
+     */
+    public <T> T setKingDeeValue(String[] fileds, Object attrs[], Class cls) {
+        if (fileds.length == 0 || fileds.length != attrs.length) {
+            return null;
+        }
+        try {
+            Object obj = cls.newInstance();
+            for (int i = 0; i < fileds.length; i++) {
+                Field declaredField = cls.getDeclaredField(fileds[i]);
+                declaredField.setAccessible(true);
+                if (attrs[i] == null) {
+                    declaredField.set(obj, null);
+                    continue;
+                }
+                if (attrs[i] instanceof Date) {
+                    declaredField.set(obj, attrs[i]);
+                } else if (ReUtil.contains("^([0-9]{3}[1-9]|[0-9]{2}[1-9][0-9]|[0-9][1-9][0-9]{2}|[1-9][0-9]{3})-(((0[13578]|1[02])-(0[1-9]|[12][0-9]|3[01]))|((0[469]|11)-(0[1-9]|[12][0-9]|30))|(02-(0[1-9]|[1][0-9]|2[0-8])))T", attrs[i].toString())) {
+                    // UTC时间(世界协调时间,UTC + 00:00)转北京(北京,UTC + 8:00)时间
+                    Date date = this.k3TimeConvert(attrs[i].toString());
+                    declaredField.set(obj, date);
+                } else if (attrs[i] instanceof BigDecimal) {
+                    declaredField.set(obj, attrs[i]);
+                } else if (attrs[i] instanceof Boolean) {
+                    declaredField.set(obj, attrs[i]);
+                } else {
+                    if (attrs[i] == null)
+                        declaredField.set(obj, attrs[i]);
+                    else
+                        declaredField.set(obj, attrs[i].toString());
+                }
+            }
+            //同步时间 sync_time
+            Field declaredField = cls.getDeclaredField("syncTime");
+            declaredField.setAccessible(true);
+            declaredField.set(obj, new Date());
+
+            return (T) obj;
+        } catch (Exception e) {
+            log.error("set field error", e);
+            return null;
+        }
+    }
+
+    public RequestApiBean getInstance(String orgId, String orgNumber, String formId, String startTime, String
+            endTime) {
+
+        RequestApiBean request = new RequestApiBean();
+        request.setOrgId(orgId);
+        request.setOrgNumber(orgNumber);
+        request.setFormId(formId);
+        if (StringUtils.isEmpty(startTime)) {
+
+            KingDeeInterface kingDeeInterface = kingDeeInterfaceService.lambdaQuery()
+                    .eq(StringUtils.isNotEmpty(orgNumber), KingDeeInterface::getOrgNumber, orgNumber)
+                    .eq(KingDeeInterface::getFormId, formId)
+                    .one();
+            if (kingDeeInterface != null) {
+                startTime = kingDeeInterface.getSyncLastTime().trim();
+            }
+
+            if (StringUtils.isEmpty(startTime)) {
+                startTime = "1990-01-01 00:00:00";
+            }
+        }
+        if (StringUtils.isEmpty(endTime)) {
+            endTime = DateUtil.formatDateTime(new Date());
+        }
+        request.setStartTime(startTime);
+        request.setEndTime(endTime);
+        return request;
+    }
+
+
+    public String supplySql(String startTime, String endTime) {
+        return this.supplySql("FApproveDate", startTime, endTime);
+    }
+
+
+    public String supplySql(String commonQueryDateStr, String startTime, String endTime) {
+        return this.supplySql(commonQueryDateStr, startTime, endTime, true);
+    }
+
+    public String supplySql(String commonQueryDateStr, String sTime, String eTime, Boolean joinWhere) {
+        String and = "";
+        if (joinWhere) {
+            and = " AND ";
+        }
+        //开始时间和结束时间都延迟10秒，防止金蝶那边存在 取了当前时间 然后10秒后才存储成功
+//        String startTime = this.offsetSecond(sTime,-10);
+//        String endTime = this.offsetSecond(eTime,-10);
+        String startTime = sTime;
+        String endTime = eTime;
+        if (StringUtils.isNotEmpty(startTime) && StringUtils.isNotEmpty(endTime)) {
+            return String.format(and + commonQueryDateStr + " > '%s' AND " + commonQueryDateStr + " <= '%s'", startTime, endTime);
+        }
+        if (StringUtils.isNotEmpty(endTime)) {
+            return String.format(and + commonQueryDateStr + " <= '%s'", endTime);
+        }
+        return "";
+    }
+
+
+    public String offsetSecond(String time,Integer second){
+        if(StringUtils.isEmpty(time)){
+            return null;
+        }
+        DateTime dateTime = DateUtil.parseDateTime(time);
+        DateTime dateTime1 = DateUtil.offsetSecond(dateTime, second);
+        String s = DateUtil.formatDateTime(dateTime1);
+        return s;
+    }
+
+
+    public <T> List<T> allNoLockSync(RequestApiBean requestApiBean, String type, String[] objFields, Class cls) throws
+            Exception {
+        //检查是否允许同步
+        String taskId = this.checkDistNoLockExec(requestApiBean, type);
+
+        // 登录金蝶
+        if (!KingDeeInvokeHelper.Login(KingDeeUser.getDB(), KingDeeUser.getACCOUNT(), KingDeeUser.getPASSWORD(), KingDeeUser.getLANG())) {
+            return null;
+        }
+        // 结果集
+        List<T> list = new ArrayList<>();
+
+        final int pageSize = 1000;
+        boolean exists = true;
+        while (exists) {
+            // 返回结果
+            log.info("【对接金蝶】request：{}", requestApiBean);
+            String result = KingDeeInvokeHelper.ExecuteBillQuery(null, JSONObject.toJSONString(requestApiBean));
+            if (result.equals("[]")) {
+                this.updateSyncTask(taskId,requestApiBean.getNotTime());
+                return null;
+            }
+//            log.info("【对接金蝶】response：{}", requestApiBean);
+            Object[] resultList = JSON.parseArray(result).toArray();
+//            this.setKingDeeValue(objFields, resultList, KingDeeMaterial.class);
+            for (Object o : resultList) {
+                JSONArray oo = (JSONArray) o;
+                T tObj = this.setKingDeeValue(objFields, oo.toArray(), cls);
+                list.add(tObj);
+            }
+            //判断是否需要多次请求，金蝶默认1次只能拿1000条数据
+            if (resultList.length == (requestApiBean.getTopRowCount() - requestApiBean.getStartRow())) {
+                requestApiBean.setTopRowCount(requestApiBean.getTopRowCount() + pageSize);
+                requestApiBean.setStartRow(requestApiBean.getStartRow() + pageSize);
+            } else {
+                exists = false;
+            }
+        }
+
+        return list;
+    }
+
+    private Date k3TimeConvert(String timeStr){
+        if(StringUtils.isEmpty(timeStr)){
+            return null;
+        }
+        LocalDateTime localDateTime = LocalDateTime.parse(timeStr);
+        ZonedDateTime zonedDateTime = localDateTime.atZone(ZoneId.systemDefault());
+        // 本地时间线LocalDateTime到即时时间线Instant时间戳
+        Instant instant = zonedDateTime.toInstant();
+        // UTC时间(世界协调时间,UTC + 00:00)转北京(北京,UTC + 8:00)时间
+        Date date = Date.from(instant);
+        return date;
+    }
+
+
+
+}

src/main/java/com/zfire/mall/manager/logic/k3/K3MaterialLogic.java

@@ -0,0 +1,79 @@
+package com.zfire.mall.manager.logic.k3;
+
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.zfire.mall.manager.bean.k3.RequestApiBean;
+import com.zfire.mall.manager.commonmapper.K3Mapper;
+import com.zfire.mall.manager.constant.KingDeeCons;
+import com.zfire.mall.manager.plus.entity.KingDeeCategory;
+import com.zfire.mall.manager.plus.entity.KingDeeMaterial;
+import com.zfire.mall.manager.plus.entity.ProductUpdPriceBillItem;
+import com.zfire.mall.manager.plus.service.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+@Slf4j
+public class K3MaterialLogic {
+
+
+    @Autowired
+    K3Logic k3Logic;
+    @Resource
+    KingDeeMaterialService kingDeeMaterialService;
+    @Autowired
+    KingDeeWalletService kingDeeWalletService;
+    @Autowired
+    SaleTypeService saleTypeService;
+    @Autowired
+    K3Mapper k3Mapper;
+
+    @Transactional
+    public void allSync(String orgId, String orgNumber, String startTime, String endTime) throws Exception {
+        // 调用物料接口
+        RequestApiBean request = k3Logic.getInstance(orgId, orgNumber, KingDeeCons.MATERIAL_INFO, startTime, endTime);
+        String filterStr = "FDocumentStatus = 'C' AND FUseOrgId.FNUMBER = %s "+ k3Logic.supplySql(request.getStartTime(), request.getEndTime());
+        request.setFieldKeys("FMATERIALID,FNumber,FName,FUseOrgId,FUseOrgId.FNUMBER,FUseOrgId.FName, FCategoryID, FCategoryID.FNUMBER,FCategoryID.FName, FSpecification,"
+                + "FBaseUnitId.FNumber,FBaseUnitId.FName,FStoreUnitID.FNumber,FStoreUnitID.FName,FSalePriceUnitId.FNumber,FSalePriceUnitId.FName,FPurchasePriceUnitId.FNumber,FPurchasePriceUnitId.FName,FTaxRateId.FTaxRate,"
+                + "FMaterialGroup.FNumber,FIsInventory,FIsSale,FIsPurchase,FLENGTH,FVOLUME,FWIDTH,FHEIGHT,FOldNumber,F_tmt_Text,F_njdm_Text,F_njxh_Text,F_wjdm_Text,F_wjxh_Text,"
+                + "F_pjdm_Text,F_pjxh1_Text,F_pjcspdm_Text,F_pjxh2_Text,FMaterialGroup.FName");
+//        request.setFieldKeys("FNumber,FNumber,FName,FUseOrgId,FUseOrgId.FNUMBER,FUseOrgId.FName, FCategoryID, FCategoryID.FNUMBER,FCategoryID.FName, FSpecification,"
+//                + "FBaseUnitId.FNumber,FBaseUnitId.FName,FStoreUnitID.FNumber,FStoreUnitID.FName,FSalePriceUnitId.FNumber,FSalePriceUnitId.FName,FPurchasePriceUnitId.FNumber,FPurchasePriceUnitId.FName,FTaxRateId.FTaxRate,"
+//                + "FMaterialGroup.FNumber,FIsInventory,FIsSale,FIsPurchase,FLENGTH,FVOLUME,FWIDTH,FHEIGHT,FOldNumber,F_tmt_Text,F_njdm_Text,F_njxh_Text,F_wjdm_Text,F_wjxh_Text,"
+//                + "F_pjdm_Text,F_pjxh1_Text,F_pjcspdm_Text,F_pjxh2_Text");
+        request.setFilterString(String.format(filterStr, orgNumber));
+        request.setOrderString("FMATERIALID ASC");
+
+        String[] fields = new String[]{"id","number","name","useOrgId","useOrgNumber","useOrgName","categoryId","categoryNumber","categoryName","specification"
+                ,"baseUnitCode","baseUnitId","storeUnitCode","storeUnitId","salePriceUnitCode","salePriceUnitId","purchasePriceUnitCode","purchasePriceUnitId",
+                "taxRateId","materialGroupNumber","isInventory","isSale","isPurchase"
+                ,"length","volume","width","height","oldNumber","tmtText","njdmText","njxhText","wjdmText","wjxhText","pjdmText","pjxh1Text"
+                ,"pjcspdmText","pjxh2Text","materialGroupName"};
+        List<KingDeeMaterial> objects = k3Logic.allSync(request, fields, KingDeeMaterial.class);
+        if(CollectionUtils.isEmpty(objects)){
+            return;
+        }
+        for(KingDeeMaterial kingDeeMaterial : objects){
+            kingDeeMaterial.setTaxRateId(kingDeeMaterial.getTaxRateId().divide(BigDecimal.valueOf(100)));
+        }
+        if (!org.springframework.util.CollectionUtils.isEmpty(objects)) {
+
+            //1.先删掉已存在的
+            List<String> numbers = objects.stream().map(KingDeeMaterial::getNumber).collect(Collectors.toList());
+            kingDeeMaterialService.lambdaUpdate().in(KingDeeMaterial::getNumber,numbers).remove();
+            //2.新增新的物料
+            kingDeeMaterialService.saveOrUpdateBatch(objects);
+            //3.//更新调价单/价格表的商品名称
+            List<String> materialIds = objects.stream().map(KingDeeMaterial::getId).collect(Collectors.toList());
+            k3Mapper.updateProductBillItem(materialIds);
+            k3Mapper.updateProductPrice(materialIds);
+        }
+    }
+
+}

src/main/java/com/zfire/mall/manager/logic/k3/K3OrgLogic.java

@@ -0,0 +1,39 @@
+package com.zfire.mall.manager.logic.k3;
+
+import com.zfire.mall.manager.bean.k3.RequestApiBean;
+import com.zfire.mall.manager.constant.KingDeeCons;
+import com.zfire.mall.manager.plus.entity.KingDeeOrganization;
+import com.zfire.mall.manager.plus.service.KingDeeOrganizationService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+@Slf4j
+public class K3OrgLogic {
+
+    @Resource
+    K3Logic k3Logic;
+    @Resource
+    KingDeeOrganizationService kingDeeOrganizationService;
+
+    public void allSync() throws Exception {
+        RequestApiBean request = k3Logic.getInstance("","", KingDeeCons.ORG_INFO, null, null);
+        String filterStr = "FDocumentStatus = 'C'";
+        request.setFieldKeys("FOrgID,FName,FNumber");
+        //request.setFieldKeys("FNumber,FName,FNumber");
+        request.setFilterString(filterStr);
+        //request.setOrderString("FCUSTID ASC");
+
+        String[] fields = new String[]{"orgId","name","number"};
+        List<KingDeeOrganization> objects = k3Logic.allSync(request, fields, KingDeeOrganization.class);
+        if (!CollectionUtils.isEmpty(objects)) {
+            kingDeeOrganizationService.saveOrUpdateBatch(objects);
+        }
+    }
+
+
+}

src/main/java/com/zfire/mall/manager/logic/k3/K3PurchaseOrderLogic.java

@@ -0,0 +1,70 @@
+package com.zfire.mall.manager.logic.k3;
+
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.zfire.mall.manager.bean.k3.RequestApiBean;
+import com.zfire.mall.manager.constant.KingDeeCons;
+import com.zfire.mall.manager.plus.entity.KingDeePurchaseOrder;
+import com.zfire.mall.manager.plus.entity.KingDeePurchaseOrderItem;
+import com.zfire.mall.manager.plus.service.KingDeePurchaseOrderItemService;
+import com.zfire.mall.manager.plus.service.KingDeePurchaseOrderService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+import java.util.Objects;
+
+@Service
+@Slf4j
+public class K3PurchaseOrderLogic {
+
+    @Autowired
+    K3Logic k3Logic;
+
+    @Autowired
+    KingDeePurchaseOrderService kingDeePurchaseOrderService;
+
+    @Autowired
+    KingDeePurchaseOrderItemService kingDeePurchaseOrderItemService;
+
+
+    public void allSync(String orgId, String orgNumber, String startTime, String endTime) throws Exception {
+        // 调用采购订单接口
+        RequestApiBean request = k3Logic.getInstance(orgId, orgNumber, KingDeeCons.PURCHASE_ORDER, startTime, endTime);
+        String filterStr = "FDocumentStatus = 'C' "+ k3Logic.supplySql("FApproveDate", request.getStartTime(), request.getEndTime());
+        request.setFieldKeys("FID,FBillNo,FBusinessType,FDate,FBillTypeID,FAssignSupplierId.FName,FPurchaseDeptId.FName,FPurchaserId.FName,FPayConditionId.FName,FApproverId.FName,FCreatorId.FName," +
+                "FChangerId.FName,FBillAllAmount,FBillAmount,FBillTaxAmount,FSettleCurrId.FName");
+        request.setFilterString(String.format(filterStr, orgNumber));
+        request.setOrderString("FID ASC");
+
+        String[] fields = new String[]{"id","billNo","businessType","fDate","billType","assignSupplierId","purchaseDeptId","purchaserId","payConditionId","approverName","creatorName",
+                "changerName","billAllAmount","billAmount","billTaxAmount","settleCurr"};
+        List<KingDeePurchaseOrder> objects = k3Logic.allSync(request, fields, KingDeePurchaseOrder.class);
+        if (!CollectionUtils.isEmpty(objects)) {
+            kingDeePurchaseOrderService.saveOrUpdateBatch(objects);
+        }
+        allSyncOrder(orgId,orgNumber,startTime,endTime);
+    }
+
+
+    public void allSyncOrder(String orgId, String orgNumber, String startTime, String endTime) throws Exception {
+        // 调用采购订单接口
+        RequestApiBean request = k3Logic.getInstance(orgId, orgNumber, KingDeeCons.PURCHASE_ORDER, startTime, endTime);
+        String filterStr = "FDocumentStatus = 'C' "+ k3Logic.supplySql("FApproveDate", request.getStartTime(), request.getEndTime());
+        request.setFieldKeys("FPOOrderEntry_FEntryID,FID,FMaterialId,FMaterialId.FName,FMaterialId.FNumber,FUnitId.FName,FQty,FPrice,FEntryAmount,FEntryNote,FAllAmount ," +
+                "FInvoiceQty,FInvoiceAmount,FModel,FEntryTaxAmount,FTaxPrice");
+        request.setFilterString(String.format(filterStr, orgNumber));
+        request.setOrderString("FID ASC");
+
+        String[] fields = new String[]{"id","fId","materialId","materialName","materialNumber","unit","qty","price","entryAmount","entryNote","allAmount","invoiceQty",
+                "invoiceAmount","model","entryTaxAmount","taxPrice"};
+        List<KingDeePurchaseOrderItem> objects = k3Logic.allSync(request, fields, KingDeePurchaseOrderItem.class);
+        if (CollectionUtil.isNotEmpty(objects)) {
+            kingDeePurchaseOrderItemService.saveOrUpdateBatch(objects);
+        }
+    }
+
+
+}

src/main/java/com/zfire/mall/manager/logic/k3/K3PurchaseStockInLogic.java

@@ -0,0 +1,72 @@
+package com.zfire.mall.manager.logic.k3;
+
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.zfire.mall.manager.bean.k3.RequestApiBean;
+import com.zfire.mall.manager.constant.KingDeeCons;
+import com.zfire.mall.manager.plus.entity.KingDeePurchaseStockIn;
+import com.zfire.mall.manager.plus.entity.KingDeePurchaseStockInItem;
+import com.zfire.mall.manager.plus.service.KingDeePurchaseStockInItemService;
+import com.zfire.mall.manager.plus.service.KingDeePurchaseStockInService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+import java.util.Objects;
+
+@Service
+@Slf4j
+public class K3PurchaseStockInLogic {
+
+    @Autowired
+    K3Logic k3Logic;
+
+    @Autowired
+    KingDeePurchaseStockInService kingDeePurchaseStockInService;
+
+    @Autowired
+    KingDeePurchaseStockInItemService kingDeePurchaseStockInItemService;
+
+    public List<KingDeePurchaseStockInItem> allSync(String orgId, String orgNumber, String startTime, String endTime) throws Exception {
+        // 调用入库单接口
+        RequestApiBean request = k3Logic.getInstance(orgId, orgNumber, KingDeeCons.PURCHASE_IN_STOCK, startTime, endTime);
+        String filterStr = "FDocumentStatus = 'C' "+ k3Logic.supplySql("FApproveDate", request.getStartTime(), request.getEndTime());
+        request.setFieldKeys("FID,FBillNo,FDate,FStockOrgId,FDemandOrgId,FPurchaseOrgId,FSupplierId,FStockDeptId,FApproverId.FName,FApproveDate,FCancellerId,FCancelDate," +
+                "FSupplyId.FName,FDocumentStatus");
+        request.setFilterString(String.format(filterStr, orgNumber));
+        request.setOrderString("FID ASC");
+
+        String[] fields = new String[]{"id","billNo","fDate","stockOrgId","demandOrgId","purchaseOrgId","supplierId","stockDeptId","approverId","approveDate","cancellerId","cancelDate",
+                "supplyName,fdDocumentStatus"};
+        request.setNotTime(true);
+        List<KingDeePurchaseStockIn> objects = k3Logic.allSync(request, fields, KingDeePurchaseStockIn.class);
+        if (!CollectionUtils.isEmpty(objects)) {
+            kingDeePurchaseStockInService.saveOrUpdateBatch(objects);
+        }
+
+        return allSyncOrder(orgId,orgNumber,startTime,endTime);
+    }
+
+
+    public List<KingDeePurchaseStockInItem> allSyncOrder(String orgId, String orgNumber, String startTime, String endTime) throws Exception {
+        // 调用入库单接口
+        RequestApiBean request = k3Logic.getInstance(orgId, orgNumber, KingDeeCons.PURCHASE_IN_STOCK, startTime, endTime);
+        String filterStr = "FDocumentStatus = 'C' "+ k3Logic.supplySql("FApproveDate", request.getStartTime(), request.getEndTime());
+        request.setFieldKeys("FInStockEntry_FEntryID,FID,FBillNo,FMaterialId,FMaterialId.FNumber,FMaterialId.FName,FStockId,FNote,FMustQty,FRealQty,FUnitId.FName,FAuxUnitQty,FPrice,FEntryTaxRate" +
+                ",FAmount,FTaxPrice,FEntryTaxAmount,FAllAmount,FUOM,FStockId.FName,F_cddh_Text");
+        request.setFilterString(String.format(filterStr, orgNumber));
+        request.setOrderString("FID ASC");
+
+        String[] fields = new String[]{"id","fId","billNo","materialId","materialNumber","materialName","stockId","note","mustQty","realQty","unit","auxUnitQty","price","entryTaxRate",
+                "amount","taxPrice","entryTaxAmount","allAmount","uom","stockName","cddhText"};
+        List<KingDeePurchaseStockInItem> objects = k3Logic.allSync(request, fields, KingDeePurchaseStockInItem.class);
+/*        if (CollectionUtil.isNotEmpty(objects)) {
+            kingDeePurchaseStockInItemService.saveOrUpdateBatch(objects);
+        }*/
+        return objects;
+    }
+
+
+}