diff --git a/mallinkAdmin/src/main/java/com/iformall/UserApplication.java b/mallinkAdmin/src/main/java/com/iformall/UserApplication.java index 3fa1a472a..b5270e236 100644 --- a/mallinkAdmin/src/main/java/com/iformall/UserApplication.java +++ b/mallinkAdmin/src/main/java/com/iformall/UserApplication.java @@ -9,7 +9,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.scheduling.annotation.EnableAsync; - import springfox.documentation.swagger2.annotations.EnableSwagger2; /** diff --git a/mallinkAdmin/src/main/java/com/iformall/config/RestFilter.java b/mallinkAdmin/src/main/java/com/iformall/config/RestFilter.java index 4f9298433..b5d331492 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/RestFilter.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/RestFilter.java @@ -1,16 +1,10 @@ package com.iformall.config; -import java.io.IOException; -import java.util.Optional; - -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import javax.servlet.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.Optional; /** * 前后端分离RESTful接口过滤器 diff --git a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java index 94b91dc14..c11cee65d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java @@ -1,6 +1,5 @@ package com.iformall.config; -import com.iformall.service.MallPermissionService; import com.iformall.shiro.MyRetryLimitCredentialsMatcher; import com.iformall.shiro.MyShiroRealm; import org.apache.shiro.mgt.SecurityManager; @@ -13,8 +12,6 @@ import org.apache.shiro.web.session.mgt.DefaultWebSessionManager; import org.crazycake.shiro.RedisCacheManager; import org.crazycake.shiro.RedisManager; import org.crazycake.shiro.RedisSessionDAO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/mallinkAdmin/src/main/java/com/iformall/config/ShiroLoginFilter.java b/mallinkAdmin/src/main/java/com/iformall/config/ShiroLoginFilter.java index 67c07385e..b3cb49d5a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/ShiroLoginFilter.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/ShiroLoginFilter.java @@ -1,13 +1,12 @@ package com.iformall.config; +import com.alibaba.fastjson.JSON; +import com.iformall.common.ResultData; +import org.apache.shiro.web.filter.authc.FormAuthenticationFilter; + import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; - -import org.apache.shiro.web.filter.authc.FormAuthenticationFilter; - -import com.alibaba.fastjson.JSON; -import com.iformall.common.ResultData; public class ShiroLoginFilter extends FormAuthenticationFilter { @Override diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java index fa484aa5a..32630d729 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java @@ -8,10 +8,7 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.po.WxMerchant; -import com.iformall.domain.po.WxPayAccount; import com.iformall.enums.EnumAppPlat; -import com.iformall.enums.EnumPayVersion; -import com.iformall.enums.EnumPayWay; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxCouponChannelMapper; import com.iformall.mapper.WxCouponMapper; @@ -26,10 +23,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; + import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.*; +import java.io.IOException; import java.util.List; import java.util.Map; import java.util.concurrent.ExecutorService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxPayAccountController.java b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxPayAccountController.java index ad0d2f280..f36efa86f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxPayAccountController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxPayAccountController.java @@ -3,21 +3,18 @@ package com.iformall.controller.app; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxPayAccount; import com.iformall.enums.EnumAppPlat; -import com.iformall.enums.EnumEnableType; import com.iformall.service.WxAppinfoService; import com.iformall.service.WxPayAccountService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * @author gongbiao diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java index fddbb2568..27baef7c0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java @@ -1,16 +1,9 @@ package com.iformall.controller.base; -import java.beans.PropertyEditorSupport; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; - import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.base.TenantEntity; import com.iformall.shiro.UserSession; -import com.iformall.utils.Constant; import com.iformall.utils.IPUtil; -import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.session.Session; import org.springframework.web.bind.WebDataBinder; @@ -20,6 +13,10 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; +import java.beans.PropertyEditorSupport; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; @RestController public class BaseController { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/base/DouyinBaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/base/DouyinBaseController.java index 37d98fc42..9465cf409 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/base/DouyinBaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/base/DouyinBaseController.java @@ -1,12 +1,9 @@ package com.iformall.controller.base; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RestController; -import com.iformall.common.ErrorCode; -import com.iformall.domain.po.WxMallVersion; import com.iformall.enums.EnumDouyinApplicationVersion; -import com.iformall.exception.MallinkException; import com.iformall.service.WxMallService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RestController; @RestController public class DouyinBaseController extends BaseController{ diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/EnumController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/EnumController.java index 9f92ae5b8..99ce9906c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/EnumController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/EnumController.java @@ -8,10 +8,16 @@ import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.lang.reflect.Method; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @RestController @RequestMapping("enum") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/MallSaleTypeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/MallSaleTypeController.java index 17f7bed81..7a9a74aad 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/MallSaleTypeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/MallSaleTypeController.java @@ -1,12 +1,9 @@ package com.iformall.controller.basic; import com.iformall.annotation.SystemControllerLog; -import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.MallSaleType; -import com.iformall.service.WxCUserTagsService; -import com.iformall.service.WxTagsService; import com.iformall.service.sys.MallSaleTypeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -17,8 +14,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.Arrays; - @RestController @RequestMapping("mallSaleType") @Api(description="销售类型") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtGoodsCategoryController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtGoodsCategoryController.java index ba972ce7f..48a3a5a54 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtGoodsCategoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtGoodsCategoryController.java @@ -6,28 +6,19 @@ import com.iformall.annotation.TenantIgnore; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.controller.base.BaseController; import com.iformall.controller.base.DouyinBaseController; import com.iformall.domain.po.TtGoodsCategory; -import com.iformall.domain.po.TtGoodsCategoryNew; -import com.iformall.enums.EnumDouyinApplicationVersion; -import com.iformall.exception.MallinkException; import com.iformall.service.TtGoodsCategoryService; -import com.iformall.utils.DateUtils; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; - -import java.lang.reflect.InvocationTargetException; -import java.util.HashMap; -import java.util.Map; - -import org.apache.commons.beanutils.BeanUtils; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.HashMap; +import java.util.Map; + /** * @author gongbiao diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMallGoodsCategoryController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMallGoodsCategoryController.java index 0934bdb22..1dcbb3ea9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMallGoodsCategoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMallGoodsCategoryController.java @@ -6,10 +6,8 @@ import com.iformall.annotation.TenantIgnore; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.TtGoodsCategory; import com.iformall.domain.po.WxMall; import com.iformall.domain.vo.TtMallGoodsCategoryVo; -import com.iformall.service.TtGoodsCategoryService; import com.iformall.service.TtMallGoodsCategoryService; import com.iformall.service.WxMallService; import io.swagger.annotations.ApiImplicitParams; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMallImController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMallImController.java index 28ff06a82..dc277a5c1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMallImController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMallImController.java @@ -2,22 +2,13 @@ package com.iformall.controller.basic; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; -import com.iformall.annotation.TenantIgnore; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.controller.base.DouyinBaseController; -import com.iformall.controller.mem.AsyncTask; -import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.TtMallIm; -import com.iformall.domain.po.TtMerchantPoi; import com.iformall.domain.po.base.BaseEntity; -import com.iformall.enums.EnumSupplierMathStatus; -import com.iformall.exception.MallinkException; import com.iformall.service.TtMallImService; -import com.iformall.service.TtMerchantPoiService; -import com.iformall.utils.Constant; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -25,19 +16,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; /** * @author gongbiao diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java index ec0ec3252..47ef1ecca 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java @@ -7,15 +7,14 @@ import com.iformall.annotation.TenantIgnore; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.controller.base.BaseController; import com.iformall.controller.base.DouyinBaseController; import com.iformall.controller.mem.AsyncTask; -import com.iformall.domain.po.*; +import com.iformall.domain.po.MallUserInfo; +import com.iformall.domain.po.TtMerchantPoi; import com.iformall.domain.po.base.BaseEntity; -import com.iformall.domain.po.base.TenantEntity; -import com.iformall.enums.*; +import com.iformall.enums.EnumSupplierMathStatus; import com.iformall.exception.MallinkException; -import com.iformall.service.*; +import com.iformall.service.TtMerchantPoiService; import com.iformall.utils.Constant; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,19 +26,15 @@ import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.io.BufferedInputStream; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; /** * @author gongbiao diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtPoiPlanController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtPoiPlanController.java index 85d1b89cb..762964a07 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtPoiPlanController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtPoiPlanController.java @@ -6,7 +6,6 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.controller.base.BaseController; import com.iformall.controller.base.DouyinBaseController; import com.iformall.domain.po.TtPoiTakeRate; import com.iformall.domain.po.WxCoupon; @@ -25,7 +24,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java index 26adf825e..c6951638f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java @@ -7,9 +7,9 @@ import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.WxBrand; import com.iformall.domain.po.WxMerchant; +import com.iformall.domain.po.base.BaseEntity; import com.iformall.enums.EnumDelFlag; import com.iformall.enums.EnumMerchantAdmin; import com.iformall.enums.EnumYesOrNo; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java index b02c8bbf1..34ab054f8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java @@ -1,31 +1,18 @@ package com.iformall.controller.basic; -import com.google.code.kaptcha.Constants; import com.iformall.annotation.SystemControllerLog; -import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.TtMallIm; import com.iformall.domain.po.WxMall; import com.iformall.domain.po.WxMallNoticeContact; -import com.iformall.enums.EnumGroupSupport; import com.iformall.service.WxMallService; -import com.iformall.utils.ShiroUtils; import io.swagger.annotations.ApiOperation; -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.imageio.ImageIO; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletResponse; -import java.awt.image.BufferedImage; -import java.io.IOException; import java.util.List; @RestController diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallDisposeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallDisposeController.java index 374435afc..27585b947 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallDisposeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallDisposeController.java @@ -5,13 +5,9 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxMallDispose; -import com.iformall.domain.po.WxPropertyContract; import com.iformall.domain.vo.WxMallDisposeVo; -import com.iformall.enums.EnumContractType; import com.iformall.enums.EnumMallDispose; -import com.iformall.enums.EnumRentStartType; import com.iformall.service.WxMallDisposeService; import com.iformall.service.WxMallService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMapController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMapController.java index 9b3755db3..6d6eac5a4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMapController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMapController.java @@ -15,7 +15,9 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.Date; import java.util.HashMap; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantBUserController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantBUserController.java index e7f619258..01997f267 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantBUserController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantBUserController.java @@ -5,7 +5,6 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.base.BaseEntity; import com.iformall.service.WxMerchantBUserService; @@ -15,7 +14,10 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("wxMerchantBUser") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index 4a71a303c..c7eb15796 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -8,19 +8,23 @@ import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.*; +import com.iformall.domain.po.WxAppinfo; +import com.iformall.domain.po.WxMerchant; +import com.iformall.domain.po.WxMerchantRelation; +import com.iformall.domain.po.WxPayAccount; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.vo.WxMerchantTradeDetailVo; import com.iformall.domain.vo.WxMerchantTradeVo; import com.iformall.domain.vo.WxMerchantVo; import com.iformall.douyin.pay.enums.AppAddSubMerchantUrlType; -import com.iformall.enums.*; +import com.iformall.enums.EnumAppPlat; +import com.iformall.enums.EnumMerchantAdmin; +import com.iformall.enums.EnumMerchantStatus; +import com.iformall.enums.EnumYesOrNo; import com.iformall.service.*; -import com.iformall.utils.Constant; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -29,7 +33,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.List; -import java.util.Map; /** * @author gongbiao diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantScoreRulesController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantScoreRulesController.java index d5ef41e08..ffd30146c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantScoreRulesController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantScoreRulesController.java @@ -4,10 +4,10 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchantScoreRules; -import com.iformall.enums.*; -import com.iformall.service.*; +import com.iformall.enums.EnumScoreRules; +import com.iformall.enums.EnumYesOrNo; +import com.iformall.service.WxMerchantScoreRulesService; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantShopController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantShopController.java index 49a23b3f6..7cccc547d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantShopController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantShopController.java @@ -13,7 +13,10 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("wxMerchantShop") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMiniappThemeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMiniappThemeController.java index a2e214f7e..bfb47dc72 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMiniappThemeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMiniappThemeController.java @@ -7,9 +7,13 @@ import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.*; -import com.iformall.enums.*; -import com.iformall.service.*; +import com.iformall.domain.po.WxAppinfo; +import com.iformall.domain.po.WxMiniappTheme; +import com.iformall.domain.po.WxThemeMall; +import com.iformall.enums.EnumAppPlat; +import com.iformall.enums.EnumThemeType; +import com.iformall.service.WxAppinfoService; +import com.iformall.service.WxMiniappThemeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProfitSharingReceiverApplyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProfitSharingReceiverApplyController.java index 939192067..d269afb9d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProfitSharingReceiverApplyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProfitSharingReceiverApplyController.java @@ -1,21 +1,14 @@ package com.iformall.controller.basic; -import com.alibaba.fastjson.JSON; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.annotation.TenantIgnore; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.WxMerchant; -import com.iformall.domain.po.WxProfitSharingReceiver; import com.iformall.domain.po.WxProfitSharingReceiverApply; -import com.iformall.domain.po.base.BaseEntity; -import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxMerchantReceiverApplyVo; -import com.iformall.douyin.pay.enums.MerchantImportStatus; -import com.iformall.enums.*; -import com.iformall.exception.MallinkException; +import com.iformall.enums.EnumSharingReceiverApplymentState; import com.iformall.file.aliyun.AliyunOSS; import com.iformall.service.WxMerchantService; import com.iformall.service.WxProfitSharingReceiverApplyService; @@ -25,8 +18,6 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.codec.binary.Base64; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -34,10 +25,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.ByteArrayInputStream; -import java.io.UnsupportedEncodingException; -import java.util.HashMap; -import java.util.Map; @RestController @RequestMapping("sharingReceiverApply") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java index da0f0b38d..ca1a77435 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java @@ -6,8 +6,8 @@ import com.iformall.annotation.TenantIgnore; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.WxShop; +import com.iformall.domain.po.base.BaseEntity; import com.iformall.service.WxShopService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxTagsController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxTagsController.java index 82ec87fd4..b68217c39 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxTagsController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxTagsController.java @@ -1,9 +1,13 @@ package com.iformall.controller.basic; -import java.util.Arrays; - import com.iformall.annotation.SystemControllerLog; +import com.iformall.common.Result; +import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.service.WxCUserTagsService; +import com.iformall.service.WxTagsService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -11,13 +15,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.iformall.common.Result; -import com.iformall.common.ResultData; -import com.iformall.service.WxCUserTagsService; -import com.iformall.service.WxTagsService; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import java.util.Arrays; @RestController @RequestMapping("wxTags") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java b/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java index c6452995e..f0a01c34a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java @@ -6,7 +6,10 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.*; +import com.iformall.domain.po.WxCoupon; +import com.iformall.domain.po.WxCouponCar; +import com.iformall.domain.po.WxMerchant; +import com.iformall.domain.po.WxPark; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCouponCarVo; import com.iformall.enums.EnumCarVendor; @@ -18,8 +21,6 @@ import com.iformall.mapper.WxCouponMapper; import com.iformall.service.*; import com.iformall.service.park.impl.etcp.ETCPUtil; import com.iformall.service.park.impl.tjd.TJDUtil; -import com.iformall.utils.Constant; - import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java index aa7f5c513..ac012701c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java @@ -1,13 +1,5 @@ package com.iformall.controller.contract; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RestController; - import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxFlowModel; import com.iformall.domain.po.WxPropertyContract; @@ -18,6 +10,13 @@ import com.iformall.enums.EnumFlowContractType; import com.iformall.enums.EnumFlowKey; import com.iformall.enums.EnumRentShopType; import com.iformall.service.WxFlowService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RestController; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @RestController public class WxContractBaseController extends BaseController{ diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index 0b6c0c919..d95cae870 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -1,44 +1,23 @@ package com.iformall.controller.contract; import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.annotation.UserDataRuleAnnotation; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.controller.base.BaseController; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillProperty; -import com.iformall.domain.po.WxMallBuilding; -import com.iformall.domain.po.WxMallFloor; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxPropertyContract; -import com.iformall.domain.po.WxRentContract; -import com.iformall.domain.po.WxShop; import com.iformall.domain.po.base.BaseEntity.SortField; -import com.iformall.enums.EnumContractOperationType; -import com.iformall.enums.EnumContractType; -import com.iformall.enums.EnumFlowContractType; -import com.iformall.enums.EnumFlowKey; -import com.iformall.enums.EnumIsPreview; -import com.iformall.enums.EnumRentContractAppStatus; -import com.iformall.enums.EnumRentContractStatus; -import com.iformall.enums.EnumRentShopType; -import com.iformall.enums.EnumRentStartType; +import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxPropertyContractMapper; -import com.iformall.service.WxBillPropertyService; -import com.iformall.service.WxMallBuildingService; -import com.iformall.service.WxMallFloorService; -import com.iformall.service.WxPropertyContractService; -import com.iformall.service.WxRentPropertyContractService; -import com.iformall.service.WxShopService; - +import com.iformall.service.*; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; - import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,8 +26,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - -import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 3a38e25b0..d84823ecd 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -1,29 +1,6 @@ package com.iformall.controller.contract; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.iformall.enums.*; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.annotation.TenantIgnore; @@ -31,34 +8,28 @@ import com.iformall.annotation.UserDataRuleAnnotation; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.domain.po.MallUserInfo; -import com.iformall.domain.po.WxBillRent; -import com.iformall.domain.po.WxMallBuilding; -import com.iformall.domain.po.WxMallFloor; -import com.iformall.domain.po.WxMerchant; -import com.iformall.domain.po.WxPayAccountBill; -import com.iformall.domain.po.WxPropertyContract; -import com.iformall.domain.po.WxRentContract; -import com.iformall.domain.po.WxShop; +import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.BaseEntity.SortField; +import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxBillPropertyMapper; import com.iformall.mapper.WxBillRentMapper; import com.iformall.mapper.WxRentContractMapper; -import com.iformall.service.WxBillRentService; -import com.iformall.service.WxMallBuildingService; -import com.iformall.service.WxMallFloorService; -import com.iformall.service.WxMerchantService; -import com.iformall.service.WxPayAccountBillService; -import com.iformall.service.WxPropertyContractService; -import com.iformall.service.WxRentContractService; -import com.iformall.service.WxRentPropertyContractService; -import com.iformall.service.WxShopService; +import com.iformall.service.*; import com.iformall.utils.DateUtils; - import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.text.SimpleDateFormat; +import java.util.*; /** * @author gongbiao diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java index 24761609e..0187ca5ab 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java @@ -1,36 +1,29 @@ package com.iformall.controller.contract; import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.annotation.UserDataRuleAnnotation; import com.iformall.common.ResultData; -import com.iformall.controller.base.BaseController; import com.iformall.domain.po.MallUserInfo; -import com.iformall.domain.po.WxMallBuilding; -import com.iformall.domain.po.WxMallFloor; import com.iformall.domain.po.WxRentContract; -import com.iformall.domain.po.WxShop; import com.iformall.domain.vo.WxRentPropertyContractVo; import com.iformall.service.WxMallBuildingService; import com.iformall.service.WxMallFloorService; import com.iformall.service.WxRentPropertyContractService; import com.iformall.service.WxShopService; - import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; - -import java.util.ArrayList; -import java.util.List; - import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; +import java.util.List; + /** * @author gongbiao */ diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxChartDataController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxChartDataController.java index cc2e287ba..79627d91c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxChartDataController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxChartDataController.java @@ -5,23 +5,21 @@ import com.iformall.annotation.TenantIgnore; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.dto.WxCUserBasicInfoDto; import com.iformall.domain.po.base.TenantEntity; -import com.iformall.enums.EnumAppPlat; import com.iformall.enums.EnumChartType; import com.iformall.service.WxChartDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; -import java.util.Calendar; -import java.util.HashMap; import java.util.Map; @Api(description = "图表") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java index fa668aa35..b9b7ad5ff 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java @@ -7,10 +7,10 @@ import com.iformall.annotation.UserDataRuleAnnotation; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.base.BaseEntity; -import com.iformall.domain.po.base.BaseEntity.SortField; import com.iformall.domain.po.WxMerchantTradeDaily; import com.iformall.domain.po.WxMerchantTradeDailyHistory; +import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.BaseEntity.SortField; import com.iformall.domain.vo.WxMerchantTradeDailyVo; import com.iformall.service.WxMerchantTradeDailyService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStatisticsController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStatisticsController.java index 4b1319f40..d2221b354 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStatisticsController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStatisticsController.java @@ -7,16 +7,19 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.dto.WxCUserBasicInfoDto; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.UserCountVo; -import com.iformall.enums.*; -import com.iformall.service.*; +import com.iformall.enums.EnumAppPlat; +import com.iformall.enums.EnumUserCountReportType; +import com.iformall.service.WxCUserBasicInfoService; +import com.iformall.service.WxMallService; import com.iformall.service.cuser.CUserServiceFactory; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.math.BigDecimal; import java.text.SimpleDateFormat; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java index 4515788ba..40b7e4aa6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java @@ -6,10 +6,12 @@ import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.*; +import com.iformall.domain.po.KwBox; +import com.iformall.domain.po.KwMerchantMeter; +import com.iformall.domain.po.KwMeter; +import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.*; -import com.iformall.exception.MallinkException; import com.iformall.service.ExcelService; import com.iformall.service.WxMerchantService; import com.iformall.service.kw.KwBoxService; @@ -20,14 +22,9 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.poi.hssf.usermodel.HSSFRow; -import org.apache.poi.hssf.usermodel.HSSFSheet; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.poifs.filesystem.POIFSFileSystem; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.xssf.usermodel.XSSFCell; import org.apache.poi.xssf.usermodel.XSSFRow; import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterDataController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterDataController.java index 2ed579d25..8f1818647 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterDataController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterDataController.java @@ -1,15 +1,11 @@ package com.iformall.controller.device; import com.iformall.annotation.SystemControllerLog; - import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.dto.KwMeterDataDto; - -import com.iformall.domain.po.KwMeterData; - import com.iformall.domain.vo.KwMeterDataVo; import com.iformall.enums.EnumMeterDataReportType; import com.iformall.service.kw.KwMeterDataService; @@ -20,7 +16,10 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.text.SimpleDateFormat; import java.time.LocalDate; @@ -28,7 +27,10 @@ import java.time.LocalDateTime; import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.time.temporal.TemporalAdjusters; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Optional; @RestController @RequestMapping("kwMeterData") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/device/WxDeviceController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/WxDeviceController.java index f94ef98ca..0aa2b5d18 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/WxDeviceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/WxDeviceController.java @@ -4,7 +4,6 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; - import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxDevice; import com.iformall.enums.EnumDeviceOnlineStatus; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestController.java index 013470a95..60599deb9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestController.java @@ -9,7 +9,6 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestCustomerController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestCustomerController.java index 671453f30..a5d5ef683 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestCustomerController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestCustomerController.java @@ -10,10 +10,11 @@ import com.iformall.domain.vo.invest.InvestDemandVo; import com.iformall.domain.vo.invest.InvestPageResult; import com.iformall.service.invest.InvestBizService; import com.iformall.service.invest.InvestCustomerService; -import io.swagger.annotations.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestDemandController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestDemandController.java index 6f110cd3e..f077a01d4 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestDemandController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestDemandController.java @@ -5,7 +5,9 @@ import com.iformall.service.invest.InvestCustomerService; import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.Arrays; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java index f70554495..dd5324c63 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java @@ -13,7 +13,10 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.Arrays; import java.util.Collection; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java index 8987ac499..65c4545ea 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java @@ -3,7 +3,6 @@ package com.iformall.controller.invest; import com.iformall.annotation.SystemServiceLog; import com.iformall.common.InvestResultData; import com.iformall.domain.po.invest.InvestRemindEntity; -import com.iformall.domain.vo.invest.InvestPageQuery; import com.iformall.domain.vo.invest.InvestPageResult; import com.iformall.domain.vo.invest.InvestRemindQuery; import com.iformall.domain.vo.invest.InvestRemindVo; @@ -12,7 +11,6 @@ import com.iformall.service.invest.InvestRemindService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java index 2430b7366..703062d56 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java @@ -3,13 +3,14 @@ package com.iformall.controller.invest; import com.iformall.annotation.SystemServiceLog; import com.iformall.common.InvestResultData; import com.iformall.domain.po.invest.InvestTaskEntity; -import com.iformall.domain.vo.invest.*; +import com.iformall.domain.vo.invest.InvestPageResult; +import com.iformall.domain.vo.invest.InvestTaskQuery; +import com.iformall.domain.vo.invest.InvestTaskVo; import com.iformall.service.invest.InvestBizService; import com.iformall.service.invest.InvestTaskService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java index 581bb1e4c..697f74c34 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java @@ -6,7 +6,6 @@ import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.AliBusinessCircleOrder; -import com.iformall.domain.po.WxBusinessCircleOrder; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.vo.AlipayOrWxStatistics; import com.iformall.service.AliBusinessCircleOrderService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/FengNiaoMapController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/FengNiaoMapController.java index 47f3f08f1..7bfeb3817 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/FengNiaoMapController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/FengNiaoMapController.java @@ -7,12 +7,13 @@ import com.iformall.domain.po.FengNiaoMapConfig; import com.iformall.service.FengNiaoMapService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; - import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * @author gongbiao diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/MarkingDataReportController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/MarkingDataReportController.java index d91112e29..f3a90d5e1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/MarkingDataReportController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/MarkingDataReportController.java @@ -12,7 +12,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -23,7 +22,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.List; /** * Created by syf on 2018/8/29. diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/TtCouponGoodsController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/TtCouponGoodsController.java index 24b21bcb9..36c8a790a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/TtCouponGoodsController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/TtCouponGoodsController.java @@ -5,22 +5,19 @@ import com.iformall.annotation.TenantIgnore; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.controller.base.BaseController; import com.iformall.controller.base.DouyinBaseController; import com.iformall.domain.po.TtCouponChannelPoi; import com.iformall.domain.po.WxCoupon; -import com.iformall.domain.po.base.BaseEntity; -import com.iformall.domain.vo.TtCouponChannelVo; -import com.iformall.domain.vo.TtCouponVo; import com.iformall.douyin.web.bean.GoodsTemplateGet; -import com.iformall.enums.*; -import com.iformall.service.*; +import com.iformall.enums.EnumCouponStatus; +import com.iformall.enums.EnumSpuSyncStatus; +import com.iformall.service.TtCouponGoodsService; +import com.iformall.service.TtGoodsCategoryService; +import com.iformall.service.TtMerchantPoiService; +import com.iformall.service.WxCouponService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import me.chanjar.weixin.common.error.WxErrorException; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java index 48d7c913e..398166cb5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java @@ -3,11 +3,10 @@ package com.iformall.controller.market; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; -import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.WxActivity; +import com.iformall.domain.po.base.BaseEntity; import com.iformall.enums.EnumActivityStatus; import com.iformall.exception.MallinkException; import com.iformall.service.WxActivityService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java index a9bd6bb82..553b2cd0b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java @@ -5,8 +5,8 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.WxActivityJoin; +import com.iformall.domain.po.base.BaseEntity; import com.iformall.exception.MallinkException; import com.iformall.service.WxActivityJoinService; import io.swagger.annotations.Api; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java index c6a8649bd..eb23bc8fa 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java @@ -5,10 +5,10 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.*; +import com.iformall.domain.po.WxBusinessCircleOrder; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.vo.AlipayOrWxStatistics; -import com.iformall.service.*; +import com.iformall.service.WxBusinessCircleOrderService; import com.iformall.utils.Constant; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -18,7 +18,10 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java index 74b6bcdfe..de0a6f757 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java @@ -8,11 +8,10 @@ import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.WxCampaign; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponChannel; -import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.vo.WxCouponChannelVo; import com.iformall.enums.*; import com.iformall.exception.MallinkException; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCarPayOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCarPayOrderController.java index 0f06c3fc1..6432bcf5f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCarPayOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCarPayOrderController.java @@ -1,32 +1,25 @@ package com.iformall.controller.market; import com.github.pagehelper.PageInfo; -import com.iformall.annotation.SystemControllerLog; -import com.iformall.common.ErrorCode; -import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.base.BaseEntity; -import com.iformall.domain.vo.WxCouponOrderBVo; -import com.iformall.domain.po.WxActivity; import com.iformall.domain.po.WxCarPayOrder; -import com.iformall.enums.EnumActivityStatus; -import com.iformall.exception.MallinkException; -import com.iformall.service.WxActivityService; +import com.iformall.domain.po.base.BaseEntity; import com.iformall.service.park.pay.WxParkPayService; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; @RestController @RequestMapping("wxCarPayOrder") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardDailyLogController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardDailyLogController.java index 5cd069df6..911885ee1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardDailyLogController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardDailyLogController.java @@ -6,25 +6,22 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxCardDailyLog; -import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.base.BaseEntity; -import com.iformall.domain.vo.WxCardVo; import com.iformall.service.WxCardDailyLogService; -import com.iformall.service.WxCardSpendService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.List; /** diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardInfoController.java index 1bbf1f65e..c9ba317d6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardInfoController.java @@ -6,15 +6,14 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.*; +import com.iformall.domain.po.WxCardInfo; +import com.iformall.domain.po.WxCardSpend; +import com.iformall.domain.po.WxCardTransferInfo; import com.iformall.domain.po.base.BaseEntity.SortField; -import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCardSpendVo; import com.iformall.domain.vo.WxCardTransferVo; import com.iformall.domain.vo.WxCardVo; import com.iformall.enums.EnumMerchantSubsidySource; -import com.iformall.enums.EnumMerchantSubsidyType; -import com.iformall.exception.MallinkException; import com.iformall.service.WxCardInfoService; import com.iformall.service.WxCardSpendService; import com.iformall.service.WxMerchantService; @@ -33,7 +32,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; -import java.util.Map; /** * @author Stormeye Wu wuguoqiang@iformall.com diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java index 336872deb..1a498f1cc 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java @@ -6,13 +6,14 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.*; +import com.iformall.domain.po.WxCardInfo; import com.iformall.domain.po.base.BaseEntity; -import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCardSpendMerchantVo; import com.iformall.domain.vo.WxCardSpendVo; import com.iformall.domain.vo.WxCardVo; -import com.iformall.enums.*; +import com.iformall.enums.EnumCUserFrom; +import com.iformall.enums.EnumCouponPasswordPayCheck; +import com.iformall.enums.EnumMerchantSubsidySource; import com.iformall.exception.MallinkException; import com.iformall.service.WxCardInfoService; import com.iformall.service.WxCardSpendService; @@ -20,7 +21,6 @@ import com.iformall.service.WxMerchantService; import com.iformall.service.WxOrderService; import com.iformall.utils.Constant; import com.iformall.utils.DateUtils; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -33,13 +33,8 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @author Stormeye Wu wuguoqiang@iformall.com diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashOutController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashOutController.java index 67fac7bf0..3d31f9b85 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashOutController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashOutController.java @@ -1,29 +1,30 @@ package com.iformall.controller.market; import com.github.pagehelper.PageInfo; -import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.*; -import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.po.WxCashOut; import com.iformall.domain.po.base.BaseEntity.SortField; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumCashOutStatus; -import com.iformall.enums.EnumPayWay; -import com.iformall.service.*; +import com.iformall.service.WxCUserService; +import com.iformall.service.WxCashOutService; +import com.iformall.service.WxMallService; +import com.iformall.service.WxMerchantService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.ArrayList; +import java.util.List; /** * 提现。微信需要小程序开通“企业付款到零钱”功能。 diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponBatchController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponBatchController.java index 167af6f81..efff2a94f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponBatchController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponBatchController.java @@ -1,34 +1,17 @@ package com.iformall.controller.market; import com.github.pagehelper.PageInfo; -import com.iformall.annotation.SystemControllerLog; -import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.AliBusinessCircleOrder; -import com.iformall.domain.po.WxBusinessCircleOrder; -import com.iformall.domain.po.WxCoupon; -import com.iformall.domain.po.WxCouponBatch; -import com.iformall.domain.po.WxCouponBatchItem; -import com.iformall.domain.po.WxCouponChannel; -import com.iformall.domain.po.WxPressBatch; -import com.iformall.domain.po.WxPressBatchItem; +import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumCouponChannelStatus; -import com.iformall.enums.EnumCouponChannelType; -import com.iformall.enums.EnumCouponContentType; -import com.iformall.enums.EnumCouponSourceType; import com.iformall.enums.EnumCouponType; -import com.iformall.enums.EnumRentContractAppStatus; -import com.iformall.service.AliBusinessCircleOrderService; import com.iformall.service.WxCouponBatchService; import com.iformall.service.WxCouponChannelService; import com.iformall.service.WxCouponService; -import com.iformall.service.WxPressBatchService; -import com.iformall.utils.Constant; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -36,15 +19,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.HashMap; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java index 0caeb4d22..b1bcaec9e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java @@ -4,23 +4,21 @@ import com.alibaba.fastjson.JSON; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.annotation.TenantIgnore; -import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.dto.WxCouponChannelDto; -import com.iformall.domain.po.*; +import com.iformall.domain.po.WxCoupon; +import com.iformall.domain.po.WxCouponChannel; +import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.vo.WxCouponChannelVo; import com.iformall.enums.EnumCouponChannelStatus; import com.iformall.enums.EnumCouponSourceType; -import com.iformall.domain.po.base.BaseEntity; -import com.iformall.enums.EnumCouponStatus; import com.iformall.exception.MallinkException; import com.iformall.service.WxCouponChannelService; import com.iformall.service.WxCouponService; import com.iformall.service.util.CouponCacheUtils; import com.iformall.utils.RedisLock; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index 7458d1667..25833d143 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -7,7 +7,10 @@ import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.*; +import com.iformall.domain.po.WxCoupon; +import com.iformall.domain.po.WxCouponChannel; +import com.iformall.domain.po.WxCouponMall; +import com.iformall.domain.po.WxCouponPassword; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCouponStatisVo; import com.iformall.enums.*; @@ -16,7 +19,6 @@ import com.iformall.service.*; import com.iformall.service.util.CouponCacheUtils; import com.iformall.utils.DateUtils; import com.iformall.utils.RedisLock; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -32,7 +34,10 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.Map; @RestController @RequestMapping("wxCoupon") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponInjectController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponInjectController.java index 737f842e7..82ccbe9a8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponInjectController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponInjectController.java @@ -6,11 +6,11 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxCouponInject; -import com.iformall.service.WxCouponInjectService; +import com.iformall.domain.po.base.BaseEntity; import com.iformall.service.WxCUserTagsService; +import com.iformall.service.WxCouponInjectService; import com.iformall.service.WxMsgModelService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java index 47331a2e4..f6acd87c2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java @@ -1,19 +1,15 @@ package com.iformall.controller.market; -import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.annotation.TenantIgnore; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxCouponOrder; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCouponOrderBVo; -import com.iformall.enums.EnumAppType; import com.iformall.enums.EnumPayType; -import com.iformall.enums.EnumPayWay; import com.iformall.exception.MallinkException; import com.iformall.service.WxAppinfoService; import com.iformall.service.WxCouponOrderService; @@ -30,7 +26,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import java.io.IOException; import java.io.PrintWriter; import java.util.Map; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderReservationController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderReservationController.java index e93f9f48b..15d193b55 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderReservationController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderReservationController.java @@ -1,7 +1,6 @@ package com.iformall.controller.market; import com.github.pagehelper.PageInfo; -import com.iformall.annotation.TenantIgnore; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java index d3421ee7d..2fa95c906 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java @@ -1,6 +1,5 @@ package com.iformall.controller.market; -import com.alibaba.fastjson.JSONArray; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.annotation.TenantIgnore; @@ -9,38 +8,24 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.controller.mem.AsyncTask; -import com.iformall.domain.po.WxCardInfo; -import com.iformall.domain.po.base.BaseEntity; -import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.MallUserInfo; -import com.iformall.domain.po.WxCoupon; +import com.iformall.domain.po.WxCardInfo; import com.iformall.domain.po.WxCouponPassword; -import com.iformall.domain.vo.WxCardSpendVo; +import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.vo.WxCouponPasswordCountInfoVO; import com.iformall.domain.vo.WxCouponPasswordVo; -import com.iformall.enums.*; +import com.iformall.enums.EnumCUserFrom; +import com.iformall.enums.EnumCouponPasswordPayCheck; +import com.iformall.enums.EnumCouponPasswordStatus; +import com.iformall.enums.EnumYesOrNo; import com.iformall.exception.MallinkException; import com.iformall.service.WxCardInfoService; import com.iformall.service.WxCouponPasswordService; import com.iformall.utils.Constant; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; - -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,6 +34,15 @@ import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.Map; +import java.util.concurrent.TimeUnit; + /** * @author gongbiao */ diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPresentController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPresentController.java index 5149453f2..eab611d6b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPresentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPresentController.java @@ -5,7 +5,10 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.*; +import com.iformall.domain.po.MallUserInfo; +import com.iformall.domain.po.WxCoupon; +import com.iformall.domain.po.WxCouponPassword; +import com.iformall.domain.po.WxCouponPresent; import com.iformall.domain.po.base.BaseEntity; import com.iformall.enums.EnumCouponPasswordStatus; import com.iformall.enums.EnumCouponStatus; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFloatingLayerController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFloatingLayerController.java index 3a59ba99b..15dbb4095 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFloatingLayerController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFloatingLayerController.java @@ -6,8 +6,8 @@ import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.WxFloatingLayer; +import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.vo.WxFloatingLayerVO; import com.iformall.enums.EnumFloatingLayerStatus; import com.iformall.exception.MallinkException; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java index 1b4846b45..667eefec8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java @@ -7,8 +7,8 @@ import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.WxGame; +import com.iformall.domain.po.base.BaseEntity; import com.iformall.enums.EnumGameStatus; import com.iformall.exception.MallinkException; import com.iformall.service.WxGameService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java index 114bfb916..5c379e205 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java @@ -13,7 +13,6 @@ import com.iformall.enums.EnumOrderType; import com.iformall.service.MarkingDataReportService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantPowerBillConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantPowerBillConfigController.java index 9c58585d0..29ded6086 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantPowerBillConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantPowerBillConfigController.java @@ -5,8 +5,8 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.WxMerchantPowerBillConfig; +import com.iformall.domain.po.base.BaseEntity; import com.iformall.service.WxMerchantPowerBillConfigService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java index 1b2395c7f..877ea3586 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java @@ -7,25 +7,22 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.dto.OrderSaveDto; -import com.iformall.domain.po.*; +import com.iformall.domain.po.WxCUserBasicInfo; +import com.iformall.domain.po.WxCoupon; +import com.iformall.domain.po.WxCouponChannel; +import com.iformall.domain.po.WxOrder; import com.iformall.domain.po.base.BaseEntity; -import com.iformall.domain.vo.WxMerchantSubsidyVo; import com.iformall.domain.vo.WxOrderQueryVo; -import com.iformall.douyin.pay.TtPayService; -import com.iformall.douyin.pay.exception.TtPayException; -import com.iformall.douyin.payv2.result.TtSettleResult; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.service.*; import com.iformall.service.order.OrderFactory; import com.iformall.service.order.entity.WxComposeOrder; - import com.iformall.utils.MaUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -33,9 +30,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; import java.util.Date; -import java.util.List; import java.util.Map; @RestController diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java index 0fdfd1a38..1a8b1e339 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java @@ -8,7 +8,6 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxOrderGroupMarketing; -import com.iformall.enums.EnumYesOrNo; import com.iformall.service.WxCouponChannelService; import com.iformall.service.WxMallService; import com.iformall.service.WxOrderGroupService; @@ -24,10 +23,9 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.List; @RestController @RequestMapping("/orderGroup") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java index 0373d6bfc..588c81d59 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java @@ -6,10 +6,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.WxOrder; import com.iformall.domain.po.WxPayOrder; -import com.iformall.enums.EnumPayStatus; -import com.iformall.exception.MallinkException; import com.iformall.service.WxOrderService; import com.iformall.service.WxPayOrderService; import io.swagger.annotations.Api; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPowerBillAutoConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPowerBillAutoConfigController.java index 3e1d988a0..1596cc69d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPowerBillAutoConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPowerBillAutoConfigController.java @@ -5,8 +5,8 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.WxPowerBillAutoConfig; +import com.iformall.domain.po.base.BaseEntity; import com.iformall.service.WxPowerBillAutoConfigService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java index 2a5331cab..f9129d3a7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java @@ -1,13 +1,9 @@ package com.iformall.controller.market; import com.github.pagehelper.PageInfo; -import com.iformall.annotation.SystemControllerLog; -import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.AliBusinessCircleOrder; -import com.iformall.domain.po.WxBusinessCircleOrder; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.po.WxPressBatch; @@ -16,16 +12,10 @@ import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumCouponChannelStatus; import com.iformall.enums.EnumCouponChannelType; -import com.iformall.enums.EnumCouponContentType; -import com.iformall.enums.EnumCouponSourceType; import com.iformall.enums.EnumCouponType; -import com.iformall.enums.EnumRentContractAppStatus; -import com.iformall.service.AliBusinessCircleOrderService; import com.iformall.service.WxCouponChannelService; import com.iformall.service.WxCouponService; import com.iformall.service.WxPressBatchService; -import com.iformall.utils.Constant; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -33,15 +23,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.HashMap; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitPaymentController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitPaymentController.java index 80e77b803..321b22a27 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitPaymentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitPaymentController.java @@ -1,36 +1,22 @@ package com.iformall.controller.market; -import com.github.pagehelper.PageInfo; -import com.iformall.annotation.SystemControllerLog; -import com.iformall.annotation.TenantIgnore; -import com.iformall.annotation.UserDataRuleAnnotation; -import com.iformall.common.ErrorCode; -import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.*; -import com.iformall.domain.po.base.BaseEntity; -import com.iformall.domain.vo.WxMerchantTradeDetailVo; -import com.iformall.domain.vo.WxMerchantTradeVo; -import com.iformall.domain.vo.WxMerchantVo; -import com.iformall.douyin.pay.enums.AppAddSubMerchantUrlType; -import com.iformall.enums.*; -import com.iformall.service.*; +import com.iformall.domain.po.WxProfitPaymentReceiver; +import com.iformall.enums.EnumAppPlat; +import com.iformall.service.WxMerchantService; +import com.iformall.service.WxProfitPaymentReceiverService; import com.iformall.utils.Constant; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.HashMap; -import java.util.List; import java.util.Map; /** diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java index afe105179..a77cba3c2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java @@ -5,7 +5,6 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.annotation.TenantIgnore; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.WxCUserBasicInfo; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxProfitSharingOrderQueryVo; import com.iformall.domain.vo.WxProfitSharingOrderVo; @@ -14,17 +13,18 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; - import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.Map; /** * @author gongbiao diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxQuestionController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxQuestionController.java index b8d94ddd0..abcadeb9c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxQuestionController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxQuestionController.java @@ -9,7 +9,7 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxQuestion; import com.iformall.domain.po.WxQuestionConfig; import com.iformall.enums.EnumQuestionConfigStatus; -import com.iformall.service.*; +import com.iformall.service.WxQuestionService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRefundOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRefundOrderController.java index 08b241db4..b88b9ef00 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRefundOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRefundOrderController.java @@ -1,28 +1,26 @@ package com.iformall.controller.market; +import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; +import com.iformall.common.Result; +import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxCardSpend; import com.iformall.domain.po.WxMerchant; +import com.iformall.domain.po.WxRefundOrder; import com.iformall.service.WxCardSpendService; import com.iformall.service.WxMerchantService; +import com.iformall.service.WxRefundOrderService; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import com.github.pagehelper.PageInfo; -import com.iformall.common.Result; -import com.iformall.common.ResultData; - -import com.iformall.domain.po.WxRefundOrder; -import com.iformall.service.WxRefundOrderService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - import java.util.HashMap; import java.util.Map; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxSubsidyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxSubsidyController.java index cad230013..3029bfb6e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxSubsidyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxSubsidyController.java @@ -1,30 +1,20 @@ package com.iformall.controller.market; -import com.iformall.annotation.SystemControllerLog; -import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.MallUserInfo; -import com.iformall.exception.MallinkException; -import com.iformall.utils.PayUtil; -import io.swagger.annotations.Api; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - import com.github.pagehelper.PageInfo; +import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; - +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxSubsidy; import com.iformall.service.WxSubsidyService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; - -import javax.imageio.ImageIO; -import javax.servlet.http.HttpServletResponse; -import java.awt.image.BufferedImage; -import java.util.Map; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxSubsidy") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxTopicController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxTopicController.java index 5bae333ca..70d9ae60e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxTopicController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxTopicController.java @@ -5,11 +5,11 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.*; +import com.iformall.domain.po.WxTopic; import com.iformall.enums.EnumWxTopicStatus; import com.iformall.enums.EnumWxTopicType; import com.iformall.exception.MallinkException; -import com.iformall.service.*; +import com.iformall.service.WxTopicService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -18,6 +18,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; + import java.util.Date; @RestController diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java index c590d047c..e473a9620 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java @@ -8,31 +8,18 @@ import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult; import cn.afterturn.easypoi.handler.impl.ExcelDataHandlerDefaultImpl; import cn.afterturn.easypoi.handler.inter.IExcelDataHandler; - import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; import com.iformall.common.ErrorCode; -import com.iformall.common.ResultData; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.TtMerchantPoi; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxTags; import com.iformall.domain.po.base.TenantEntity; -import com.iformall.domain.vo.CUserBaseInfoT; -import com.iformall.domain.vo.GaoDePoiInfo; -import com.iformall.domain.vo.MerchantPoiT; -import com.iformall.domain.vo.MerchantPoiTNew; -import com.iformall.domain.vo.WxCardPriceTemplate; +import com.iformall.domain.vo.*; import com.iformall.enums.EnumMerchantCreateFrom; import com.iformall.exception.MallinkException; import com.iformall.file.aliyun.AliyunOSS; -import com.iformall.service.ExcelService; -import com.iformall.service.TtMerchantPoiService; -import com.iformall.service.WxCUserBasicInfoService; -import com.iformall.service.WxCouponPasswordService; -import com.iformall.service.WxMerchantService; -import com.iformall.service.WxTagsService; - -import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import com.iformall.service.*; import org.apache.poi.ss.usermodel.Workbook; import org.apache.shiro.session.UnknownSessionException; import org.slf4j.Logger; @@ -42,12 +29,9 @@ import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.ArrayList; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.*; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -55,9 +39,6 @@ import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - @Component public class AsyncTask { private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/BillDailyAsyncTask.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/BillDailyAsyncTask.java index 09016f584..d8a92d28e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/BillDailyAsyncTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/BillDailyAsyncTask.java @@ -8,7 +8,6 @@ import cn.afterturn.easypoi.handler.inter.IExcelDataHandler; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxShop; -import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxBillDailyVo; import com.iformall.enums.EnumDelStatus; import com.iformall.enums.EnumShopStatus; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java index ae2c77885..94498d73a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java @@ -5,12 +5,16 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.*; +import com.iformall.domain.po.MemCouponFromDsp; +import com.iformall.domain.po.WxCoupon; +import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.vo.WxCouponChannelVo; import com.iformall.enums.EnumCouponChannelStatus; import com.iformall.enums.EnumCouponChannelType; -import com.iformall.service.*; +import com.iformall.service.MemCouponFromDspService; +import com.iformall.service.WxCouponChannelService; +import com.iformall.service.WxCouponService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/UserBasicInfoAddressController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/UserBasicInfoAddressController.java index b03abb4c8..e961aa96a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/UserBasicInfoAddressController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/UserBasicInfoAddressController.java @@ -6,8 +6,8 @@ import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.*; -import com.iformall.service.*; +import com.iformall.domain.po.UserBasicInfoAddress; +import com.iformall.service.UserBasicInfoAddressService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserController.java index 92bb50b21..596179f5c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserController.java @@ -1,21 +1,19 @@ package com.iformall.controller.mem; -import com.iformall.annotation.SystemControllerLog; -import com.iformall.controller.base.BaseController; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - import com.github.pagehelper.PageInfo; +import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; - +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxCUser; import com.iformall.service.WxCUserService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxCUser") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java index ca068c0e3..658b7fa5c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java @@ -1,25 +1,25 @@ package com.iformall.controller.mem; -import java.text.DecimalFormat; -import java.text.NumberFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import com.iformall.annotation.SystemControllerLog; import com.iformall.annotation.TenantIgnore; +import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.dto.MarkingCouponDataReportDto; +import com.iformall.domain.dto.WxCUserBasicInfoDto; import com.iformall.domain.po.WxCouponOrder; import com.iformall.domain.po.WxUserVisit; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.vo.CUserDateAmountVo; +import com.iformall.domain.vo.TouchUsersReportVo; +import com.iformall.domain.vo.UserStructureVo; import com.iformall.enums.EnumAppPlat; -import com.iformall.service.*; +import com.iformall.service.WxCUserBasicInfoService; +import com.iformall.service.WxCouponOrderService; +import com.iformall.service.WxMallService; +import com.iformall.service.WxUserVisitService; import com.iformall.service.cuser.CUserServiceFactory; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,14 +28,10 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.iformall.common.ResultData; -import com.iformall.domain.dto.WxCUserBasicInfoDto; -import com.iformall.domain.vo.CUserDateAmountVo; -import com.iformall.domain.vo.TouchUsersReportVo; -import com.iformall.domain.vo.UserStructureVo; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import java.text.DecimalFormat; +import java.text.NumberFormat; +import java.text.SimpleDateFormat; +import java.util.*; @RestController @RequestMapping("wxCUserData") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserFromController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserFromController.java index d3de03d04..671e532f6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserFromController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserFromController.java @@ -14,7 +14,10 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java index a50bd2bc9..2b0b5aa53 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java @@ -13,7 +13,6 @@ import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.MerchantCreditRankingVo; import com.iformall.domain.vo.WxCreditHistoryVo; -import com.iformall.enums.EnumMerchantStatus; import com.iformall.enums.EnumScoreType; import com.iformall.enums.EnumUserType; import com.iformall.exception.MallinkException; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java index a5d35c1b1..11a99d610 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java @@ -1,31 +1,23 @@ package com.iformall.controller.mem; +import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; -import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.base.BaseEntity; -import com.iformall.domain.po.base.TenantEntity; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.github.pagehelper.PageInfo; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxLevelConfig; +import com.iformall.domain.po.base.BaseEntity; import com.iformall.service.WxLevelConfigService; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; import java.util.List; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java index fc0a3dd23..f0cf73708 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java @@ -5,11 +5,9 @@ import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.SysConfig; -import com.iformall.domain.po.WxMall; -import com.iformall.domain.po.WxMallDispose; import com.iformall.domain.po.WxScoreRules; -import com.iformall.domain.po.base.TenantEntity; -import com.iformall.enums.*; +import com.iformall.enums.EnumCreditLockedStatus; +import com.iformall.enums.EnumScoreRules; import com.iformall.service.WxMallDisposeService; import com.iformall.service.WxMallService; import com.iformall.service.WxScoreRulesService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java index 2a7770e4f..1f97252c6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java @@ -5,8 +5,8 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.WxMsgCallback; +import com.iformall.domain.po.base.BaseEntity; import com.iformall.service.WxMsgCallbackService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java index 29a745397..1531cf2a6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java @@ -9,7 +9,6 @@ import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxTemplateMsg; import com.iformall.domain.po.base.BaseEntity; -import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.WxMsg; import com.iformall.enums.EnumSendWay; import com.iformall.enums.EnumTemplateType; @@ -28,7 +27,9 @@ import org.springframework.web.multipart.MultipartFile; import java.io.File; import java.io.FileOutputStream; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; /** * @author gongbiao diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java index 2fc0cf38a..3e32546ec 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java @@ -5,8 +5,8 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.WxMsgModel; +import com.iformall.domain.po.base.BaseEntity; import com.iformall.enums.EnumMsgModelType; import com.iformall.service.WxMsgModelService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java index 5b8550da0..681540e5c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java @@ -5,7 +5,6 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.*; import com.iformall.enums.*; -import com.iformall.mapper.WxMsgMapper; import com.iformall.mq.MqBaseProducer; import com.iformall.service.WxMsgRecordService; import com.iformall.service.msg.impl.SendCallBackSmsServiceImpl; @@ -14,7 +13,10 @@ import io.swagger.annotations.Api; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + import java.util.List; @RestController diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java index 7e720295a..6368bf685 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java @@ -5,8 +5,8 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.WxMsgSignature; +import com.iformall.domain.po.base.BaseEntity; import com.iformall.service.WxMsgSignatureService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java index 52a7eb909..4820107dd 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java @@ -6,7 +6,6 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxMsgValidationcode; -import com.iformall.domain.po.base.TenantEntity; import com.iformall.service.WxMsgValidationcodeService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java index 399099897..64c35354b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java @@ -7,7 +7,6 @@ import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxMsgValidationcodeModel; import com.iformall.enums.EnumMsgModelReplace; -import com.iformall.enums.EnumMsgModelStatus; import com.iformall.enums.EnumMsgOpen; import com.iformall.service.WxMsgValidationcodeModelService; import io.swagger.annotations.ApiImplicitParam; @@ -16,7 +15,10 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("wxMsgValidationcodeModel") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/ocr/WxOcrController.java b/mallinkAdmin/src/main/java/com/iformall/controller/ocr/WxOcrController.java index 33e10eee1..1e3429f5f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/ocr/WxOcrController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/ocr/WxOcrController.java @@ -1,45 +1,27 @@ package com.iformall.controller.ocr; import com.github.pagehelper.PageInfo; -import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; -import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.MallUserInfo; -import com.iformall.domain.po.WxMall; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchantOcrModel; import com.iformall.domain.po.WxOcrModel; -import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.BaseEntity.SortField; -import com.iformall.enums.EnumFromType; -import com.iformall.enums.EnumRentStartType; import com.iformall.ocr.FormallTess4j; import com.iformall.ocr.FormallTess4jTrain; -import com.iformall.service.WxMallService; import com.iformall.service.WxMerchantService; import com.iformall.service.WxOcrService; - import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.Date; -import java.util.Map; - -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import java.io.*; + @RestController @RequestMapping("ocr") public class WxOcrController extends BaseController { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/pay/AlipayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/pay/AlipayController.java index af4358ef2..12056efab 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/pay/AlipayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/pay/AlipayController.java @@ -1,39 +1,27 @@ package com.iformall.controller.pay; -import com.iformall.annotation.SystemControllerLog; -import com.iformall.controller.base.BaseController; -import io.swagger.annotations.Api; - -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import java.util.Map; - -import javax.imageio.ImageIO; - -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxMall; -import com.iformall.domain.po.WxPayAccount; -import com.iformall.domain.po.base.TenantEntity; import com.iformall.service.WxMallService; -import com.iformall.service.WxPayAccountService; import com.iformall.service.pay.alipay.AliPayUtil; import com.iformall.utils.ImgUtil; - import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import java.util.Map; @RestController @RequestMapping("alipay") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java index fdc2603ae..5230883a9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java @@ -4,8 +4,8 @@ import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.*; -import com.iformall.service.*; +import com.iformall.domain.po.WxBillAction; +import com.iformall.service.WxBillActionService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java index fb0150f25..5a9d09be9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -5,7 +5,6 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxMerchant; -import com.iformall.domain.po.WxPayAccountBill; import com.iformall.domain.vo.WxBillAll; import com.iformall.domain.vo.WxBillExcelTemplate; import com.iformall.service.WxBillAllService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java index 5b5626559..758e73a57 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java @@ -7,7 +7,6 @@ import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillOther; -import com.iformall.domain.po.WxBillOtherDeposit; import com.iformall.service.WxBillOtherService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java index 2f499f786..aed21669f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java @@ -5,8 +5,8 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.WxBillProperty; +import com.iformall.domain.po.base.BaseEntity; import com.iformall.service.WxBillPropertyService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java index cfe7973e0..b04c80784 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java @@ -5,8 +5,8 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.WxBillRent; +import com.iformall.domain.po.base.BaseEntity; import com.iformall.service.WxBillRentService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentManageController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentManageController.java index 5f17fd590..a545fba4a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentManageController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentManageController.java @@ -5,12 +5,10 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.WxBillRentManage; import com.iformall.domain.po.base.BaseEntity; import com.iformall.enums.EnumRentContractManageFeeType; -import com.iformall.domain.po.WxBillRent; -import com.iformall.domain.po.WxBillRentManage; import com.iformall.service.WxBillRentManageService; -import com.iformall.service.WxBillRentService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillSettleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillSettleController.java index d59bc76f3..e068ee07f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillSettleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillSettleController.java @@ -5,9 +5,9 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.WxBillSettle; import com.iformall.domain.po.WxBillSettleRecord; +import com.iformall.domain.po.base.BaseEntity; import com.iformall.enums.EnumFilterSettle; import com.iformall.service.WxBillAllService; import com.iformall.service.WxBillSettleRecordService; @@ -19,6 +19,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxGooagooController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxGooagooController.java index 1a23a74d2..a790bed3e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxGooagooController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxGooagooController.java @@ -9,7 +9,10 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.Map; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java index 19b6c4f94..fe99a89d7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java @@ -2,16 +2,21 @@ package com.iformall.controller.sys; import com.google.code.kaptcha.Constants; import com.google.code.kaptcha.Producer; +import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.*; +import com.iformall.domain.po.MallUserInfo; +import com.iformall.domain.po.WxAppinfo; +import com.iformall.domain.po.WxMall; +import com.iformall.domain.po.WxMsgValidationcode; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.MallUserInfoVo; -import com.iformall.enums.*; +import com.iformall.enums.EnumMallUserAction; +import com.iformall.enums.EnumMallUserStatus; +import com.iformall.enums.EnumMsgModel; import com.iformall.exception.MallinkException; -import com.iformall.annotation.SystemControllerLog; import com.iformall.service.*; import com.iformall.shiro.UserSession; import com.iformall.shiro.UseriFormallToken; @@ -36,7 +41,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + import javax.imageio.ImageIO; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java index e6178e8a5..a3d92499f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java @@ -6,7 +6,10 @@ import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.*; +import com.iformall.domain.po.MallRole; +import com.iformall.domain.po.MallRolePermission; +import com.iformall.domain.po.MallUserInfo; +import com.iformall.domain.po.MallUserRole; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumUserAdmin; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserActionController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserActionController.java index ce9921d22..580a84c82 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserActionController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserActionController.java @@ -12,7 +12,10 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("mallUserAction") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java index fa222510c..0249b7e75 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java @@ -6,7 +6,10 @@ import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.*; +import com.iformall.domain.po.MallRole; +import com.iformall.domain.po.MallUserInfo; +import com.iformall.domain.po.MallUserRole; +import com.iformall.domain.po.WxMsgValidationcode; import com.iformall.domain.po.base.BaseEntity; import com.iformall.enums.EnumMallUserStatus; import com.iformall.enums.EnumUserAdmin; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysConfigController.java index 9922636c4..0ec6038ee 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysConfigController.java @@ -1,14 +1,11 @@ package com.iformall.controller.sys; import com.github.pagehelper.PageInfo; -import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.MallRole; -import com.iformall.domain.po.MallRolePermission; import com.iformall.domain.po.SysConfig; import com.iformall.domain.po.SysConfigValue; -import com.iformall.domain.po.base.BaseEntity; import com.iformall.enums.EnumYesOrNo; import com.iformall.service.SysConfigService; import io.swagger.annotations.ApiImplicitParam; @@ -18,7 +15,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.List; /** * @author gongbiao diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysGaodeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysGaodeController.java index d1de87ccd..0e1fa816b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysGaodeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysGaodeController.java @@ -6,7 +6,9 @@ import com.iformall.service.SysGaoDeService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * @author gongbiao diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java index 26fd86c06..c74da0005 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java @@ -1,40 +1,27 @@ package com.iformall.controller.sys; import com.iformall.annotation.SystemControllerLog; -import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.MallPermission; -import com.iformall.domain.po.MallRole; -import com.iformall.domain.po.MallRolePermission; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.base.TenantEntity; -import com.iformall.enums.EnumMenuType; -import com.iformall.enums.EnumPermissionType; -import com.iformall.exception.MallinkException; import com.iformall.service.MallPermissionService; -import com.iformall.service.MallRolePermissionService; -import com.iformall.service.MallRoleService; import com.iformall.service.MallUserInfoService; -import com.iformall.utils.Constant; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.apache.shiro.util.Assert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.method.HandlerMethod; -import org.springframework.web.servlet.mvc.condition.PatternsRequestCondition; -import org.springframework.web.servlet.mvc.method.RequestMappingInfo; -import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * @author Stormeye Wu diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysNoticeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysNoticeController.java index e3274b55a..a255b82e4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysNoticeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysNoticeController.java @@ -8,7 +8,10 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + import java.util.List; /** diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java index 496c8af0d..9b201e9a3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java @@ -13,12 +13,18 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import javax.imageio.ImageIO; import java.awt.image.BufferedImage; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @RestController @RequestMapping(value = "upload") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java index 6fa048cbf..aecfb58ea 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java @@ -10,7 +10,6 @@ import com.iformall.domain.po.MallUserAction; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxMall; import com.iformall.domain.vo.MallUserInfoVo; -import com.iformall.enums.EnumGroupSupport; import com.iformall.enums.EnumMallUserAction; import com.iformall.enums.EnumMallUserStatus; import com.iformall.enums.EnumUserAdmin; @@ -34,7 +33,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.DisabledAccountException; import org.apache.shiro.authc.UnknownAccountException; -import org.apache.shiro.session.Session; import org.apache.shiro.subject.Subject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -44,7 +42,9 @@ import org.springframework.data.redis.core.RedisCallback; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.serializer.RedisSerializer; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; import redis.clients.jedis.Protocol; import redis.clients.jedis.util.SafeEncoder; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java index 68e9ca110..ab6976369 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java @@ -8,7 +8,10 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("wxAdminLog") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java index 0599fdbcd..83b296642 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java @@ -4,16 +4,15 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxBusiness; -import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxMerchant; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxBusinessDataVo; -import com.iformall.enums.*; +import com.iformall.enums.EnumMerchantAdmin; +import com.iformall.enums.EnumYesOrNo; import com.iformall.service.ExcelService; import com.iformall.service.WxBusinessService; import com.iformall.service.WxMerchantService; -import com.iformall.utils.Constant; import com.iformall.utils.DateUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -23,10 +22,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; + import javax.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; @RestController @RequestMapping("wxBusiness") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/video/VideoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/video/VideoController.java index 72a284c40..bb2a10f93 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/video/VideoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/video/VideoController.java @@ -1,48 +1,13 @@ package com.iformall.controller.video; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageInfo; -import com.iformall.annotation.SystemControllerLog; -import com.iformall.annotation.UserDataRuleAnnotation; import com.iformall.common.ErrorCode; -import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.MallUserInfo; -import com.iformall.domain.po.WxBillProperty; -import com.iformall.domain.po.WxMallBuilding; -import com.iformall.domain.po.WxMallFloor; -import com.iformall.domain.po.WxMerchant; -import com.iformall.domain.po.WxPropertyContract; -import com.iformall.domain.po.WxRentContract; -import com.iformall.domain.po.WxShop; -import com.iformall.domain.po.base.TenantEntity; -import com.iformall.domain.po.base.BaseEntity.SortField; -import com.iformall.enums.EnumContractOperationType; -import com.iformall.enums.EnumContractType; -import com.iformall.enums.EnumFlowContractType; -import com.iformall.enums.EnumFlowKey; -import com.iformall.enums.EnumIsPreview; -import com.iformall.enums.EnumRentContractAppStatus; -import com.iformall.enums.EnumRentContractStatus; -import com.iformall.enums.EnumRentShopType; -import com.iformall.enums.EnumRentStartType; -import com.iformall.exception.MallinkException; -import com.iformall.mapper.WxPropertyContractMapper; -import com.iformall.service.WxBillPropertyService; -import com.iformall.service.WxMallBuildingService; -import com.iformall.service.WxMallFloorService; -import com.iformall.service.WxPropertyContractService; -import com.iformall.service.WxRentPropertyContractService; -import com.iformall.service.WxShopService; import com.iformall.video.VideoFactory; import com.iformall.video.entity.VideUploadResult; - import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; - import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -50,13 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; import java.util.Map; /** diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java index 266db19dc..0ee3eeb36 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java @@ -4,8 +4,10 @@ import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.*; -import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.po.MallUserInfo; +import com.iformall.domain.po.WxFlowConfig; +import com.iformall.domain.po.WxFlowModel; +import com.iformall.domain.po.WxFlowRecord; import com.iformall.enums.EnumFlowRecordStatus; import com.iformall.service.WxFlowService; import io.swagger.annotations.Api; @@ -18,7 +20,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.*; + +import java.util.List; +import java.util.Map; @RestController @Api(description = "工作流相关接口") diff --git a/mallinkAdmin/src/main/java/com/iformall/flowable/ContractTaskFinishHandler.java b/mallinkAdmin/src/main/java/com/iformall/flowable/ContractTaskFinishHandler.java index 39982396e..4ec15fe03 100644 --- a/mallinkAdmin/src/main/java/com/iformall/flowable/ContractTaskFinishHandler.java +++ b/mallinkAdmin/src/main/java/com/iformall/flowable/ContractTaskFinishHandler.java @@ -1,16 +1,11 @@ package com.iformall.flowable; -import com.iformall.enums.EnumRentContractAppStatus; import com.iformall.service.WxFlowService; import com.iformall.service.WxPropertyContractService; -import com.iformall.service.impl.WxFlowServiceImpl; -import org.apache.commons.lang3.StringUtils; import org.flowable.engine.delegate.TaskListener; import org.flowable.task.service.delegate.DelegateTask; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.List; -import java.util.Map; /** * 合同审批完成,修改状态 diff --git a/mallinkAdmin/src/main/java/com/iformall/interceptor/CurrentTenantInterceptor.java b/mallinkAdmin/src/main/java/com/iformall/interceptor/CurrentTenantInterceptor.java index ce83d98b0..cb4645796 100644 --- a/mallinkAdmin/src/main/java/com/iformall/interceptor/CurrentTenantInterceptor.java +++ b/mallinkAdmin/src/main/java/com/iformall/interceptor/CurrentTenantInterceptor.java @@ -1,20 +1,16 @@ package com.iformall.interceptor; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.alibaba.fastjson.JSONObject; -import com.iformall.domain.po.WxMall; +import com.iformall.annotation.TenantIgnore; +import com.iformall.common.TenantThreadLocal; import com.iformall.service.WxMallService; -import org.apache.commons.lang3.StringUtils; +import com.iformall.shiro.UserSession; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; -import com.iformall.annotation.TenantIgnore; -import com.iformall.common.TenantThreadLocal; -import com.iformall.shiro.UserSession; -import com.iformall.utils.Constant; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * 权限(Token)验证 diff --git a/mallinkAdmin/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java b/mallinkAdmin/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java index aebf7d874..a04274158 100644 --- a/mallinkAdmin/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java +++ b/mallinkAdmin/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java @@ -6,9 +6,7 @@ import org.slf4j.LoggerFactory; import javax.servlet.*; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.Arrays; public class HttpServletRequestWrapperFilter implements Filter { private static final Logger logger = LoggerFactory.getLogger(HttpServletRequestWrapperFilter.class); diff --git a/mallinkAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java b/mallinkAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java index d7b493d12..f9c9ff048 100644 --- a/mallinkAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java +++ b/mallinkAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java @@ -25,7 +25,6 @@ import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.nio.charset.Charset; import java.util.Enumeration; -import java.util.concurrent.TimeUnit; /** * 幂等检查 diff --git a/mallinkAdmin/src/main/java/com/iformall/log/SystemLogAspect.java b/mallinkAdmin/src/main/java/com/iformall/log/SystemLogAspect.java index 465889699..768de40a7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/log/SystemLogAspect.java +++ b/mallinkAdmin/src/main/java/com/iformall/log/SystemLogAspect.java @@ -9,7 +9,6 @@ import com.iformall.enums.EnumMallUserAction; import com.iformall.service.MallUserActionService; import com.iformall.shiro.UserSession; import com.iformall.utils.IPUtil; -import org.apache.shiro.SecurityUtils; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterThrowing; import org.aspectj.lang.annotation.Aspect; @@ -23,9 +22,7 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; import java.lang.reflect.Method; -import java.util.Arrays; import java.util.Date; @Aspect diff --git a/mallinkAdmin/src/main/java/com/iformall/log/UserDataRuleAspect.java b/mallinkAdmin/src/main/java/com/iformall/log/UserDataRuleAspect.java index acd100a64..8cf23e9bf 100644 --- a/mallinkAdmin/src/main/java/com/iformall/log/UserDataRuleAspect.java +++ b/mallinkAdmin/src/main/java/com/iformall/log/UserDataRuleAspect.java @@ -4,9 +4,9 @@ package com.iformall.log; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.iformall.annotation.UserDataRuleAnnotation; -import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxUserDataRule; +import com.iformall.domain.po.base.BaseEntity; import com.iformall.mapper.WxRentContractMapper; import com.iformall.service.WxUserDataRuleService; import com.iformall.shiro.UserSession; diff --git a/mallinkAdmin/src/main/java/com/iformall/shiro/MyShiroRealm.java b/mallinkAdmin/src/main/java/com/iformall/shiro/MyShiroRealm.java index 2689cc3c8..411f86fb9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/shiro/MyShiroRealm.java +++ b/mallinkAdmin/src/main/java/com/iformall/shiro/MyShiroRealm.java @@ -1,8 +1,7 @@ package com.iformall.shiro; -import javax.annotation.Resource; - import com.iformall.common.ErrorCode; +import com.iformall.domain.po.MallUserInfo; import com.iformall.enums.EnumMallUserStatus; import com.iformall.service.MallUserInfoService; import org.apache.commons.lang3.StringUtils; @@ -15,8 +14,7 @@ import org.apache.shiro.session.Session; import org.apache.shiro.subject.PrincipalCollection; import org.apache.shiro.util.ByteSource; -import com.iformall.domain.po.MallUserInfo; - +import javax.annotation.Resource; import java.util.Set; /** diff --git a/mallinkAdmin/src/main/java/com/iformall/shiro/ShiroService.java b/mallinkAdmin/src/main/java/com/iformall/shiro/ShiroService.java index 5c311ac54..a9621c7b7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/shiro/ShiroService.java +++ b/mallinkAdmin/src/main/java/com/iformall/shiro/ShiroService.java @@ -1,8 +1,6 @@ package com.iformall.shiro; -import java.util.LinkedHashMap; -import java.util.Map; - +import com.iformall.service.MallPermissionService; import org.apache.shiro.spring.web.ShiroFilterFactoryBean; import org.apache.shiro.web.filter.mgt.DefaultFilterChainManager; import org.apache.shiro.web.filter.mgt.PathMatchingFilterChainResolver; @@ -10,7 +8,8 @@ import org.apache.shiro.web.servlet.AbstractShiroFilter; import org.crazycake.shiro.RedisSessionDAO; import org.springframework.beans.factory.annotation.Autowired; -import com.iformall.service.MallPermissionService; +import java.util.LinkedHashMap; +import java.util.Map; /** * Created by yangqj on 2017/4/30. diff --git a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 1005fd838..c6f8cc983 100644 --- a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -2,17 +2,14 @@ package com.iformall.tenant; import com.iformall.common.TenantThreadLocal; import com.iformall.plugin.autoTenantId.TenantInfo; -import com.iformall.shiro.UserSession; - -import java.util.Arrays; -import java.util.List; - import org.apache.ibatis.mapping.MappedStatement; -import org.apache.shiro.SecurityUtils; import org.apache.shiro.session.InvalidSessionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.Arrays; +import java.util.List; + public class TenantInfoImpl implements TenantInfo { private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/mallinkBApi/src/main/java/com/iformall/config/MyBatisConfiguration.java b/mallinkBApi/src/main/java/com/iformall/config/MyBatisConfiguration.java index 850c5c826..4e15246a0 100644 --- a/mallinkBApi/src/main/java/com/iformall/config/MyBatisConfiguration.java +++ b/mallinkBApi/src/main/java/com/iformall/config/MyBatisConfiguration.java @@ -1,7 +1,6 @@ package com.iformall.config; import com.iformall.plugin.MyBatisItercepters; - import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/BankController.java b/mallinkBApi/src/main/java/com/iformall/controller/BankController.java index cd6e51774..410c84bf2 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/BankController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/BankController.java @@ -2,11 +2,7 @@ package com.iformall.controller; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; -import com.iformall.domain.po.WxCoupon; -import com.iformall.enums.EnumCouponSourceType; import com.iformall.enums.EnumSharingReceiverAccountType; -import com.iformall.enums.EnumSharingReceiverQualificationGth; -import com.iformall.enums.EnumSharingReceiverQualificationQy; import com.iformall.service.bank.WxBankUtilService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -16,13 +12,9 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/api/bank") diff --git a/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java index 6a3ec30b4..fda477aef 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java @@ -1,29 +1,24 @@ package com.iformall.controller; +import com.iformall.common.ErrorCode; +import com.iformall.common.SysConfigConstant; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseCUserEntity; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumAppPlat; -import com.iformall.enums.EnumPayVersion; import com.iformall.enums.EnumYesOrNo; -import com.iformall.service.CUserTokenService; -import com.iformall.service.SysConfigService; -import com.iformall.utils.RedisCacheUtils; -import lombok.extern.slf4j.Slf4j; - -import com.iformall.common.ErrorCode; -import com.iformall.common.SysConfigConstant; -import com.iformall.domain.po.base.TenantEntity; import com.iformall.exception.MallinkException; +import com.iformall.service.SysConfigService; import com.iformall.service.WxAppinfoService; import com.iformall.service.WxMerchantBUserService; import com.iformall.service.WxPayAccountService; import com.iformall.service.cuser.CUserServiceFactory; -import com.iformall.service.wechat.FmOpenService; import com.iformall.utils.Constant; import com.iformall.utils.IPUtil; import com.iformall.utils.MaUtil; - +import com.iformall.utils.RedisCacheUtils; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.WebDataBinder; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/EnumController.java b/mallinkBApi/src/main/java/com/iformall/controller/EnumController.java index 3bd2cfb5c..4b39333da 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/EnumController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/EnumController.java @@ -1,10 +1,7 @@ package com.iformall.controller; -import com.alibaba.fastjson.JSON; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; -import com.iformall.enums.EnumSharingReceiverQualificationGth; -import com.iformall.enums.EnumSharingReceiverQualificationQy; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/PosOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/PosOrderController.java index 8f45b5b74..e243b3428 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/PosOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/PosOrderController.java @@ -1,22 +1,20 @@ package com.iformall.controller; -import com.iformall.common.ErrorCode; -import com.iformall.domain.po.WxMerchantBUser; -import io.swagger.annotations.Api; -import lombok.AllArgsConstructor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.web.bind.annotation.*; - import com.github.pagehelper.PageInfo; +import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; - import com.iformall.domain.po.PosOrder; +import com.iformall.domain.po.WxMerchantBUser; import com.iformall.service.PosOrderService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.bind.annotation.*; @RestController diff --git a/mallinkBApi/src/main/java/com/iformall/controller/PosPayOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/PosPayOrderController.java index 58093e6aa..a21db8495 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/PosPayOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/PosPayOrderController.java @@ -1,20 +1,18 @@ package com.iformall.controller; -import io.swagger.annotations.Api; -import lombok.AllArgsConstructor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.web.bind.annotation.*; - import com.github.pagehelper.PageInfo; import com.iformall.common.Result; import com.iformall.common.ResultData; - import com.iformall.domain.po.PosPayOrder; import com.iformall.service.PosPayOrderService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api/posPayOrder") diff --git a/mallinkBApi/src/main/java/com/iformall/controller/SysConfigController.java b/mallinkBApi/src/main/java/com/iformall/controller/SysConfigController.java index 8458a4ce6..04cdb5bd9 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/SysConfigController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/SysConfigController.java @@ -1,8 +1,6 @@ package com.iformall.controller; -import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; -import com.iformall.common.SysConfigConstant; import com.iformall.domain.po.SysConfig; import com.iformall.service.SysConfigService; import io.swagger.annotations.ApiImplicitParam; @@ -12,7 +10,9 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * @author gongbiao diff --git a/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java b/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java index 17b9706df..12e460ef2 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java @@ -11,13 +11,18 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import javax.imageio.ImageIO; import java.awt.image.BufferedImage; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; @RestController @RequestMapping(value = "/api/upload") diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java index 9ec10b8f0..1c180b3a4 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java @@ -1,20 +1,16 @@ package com.iformall.controller; -import com.alibaba.fastjson.JSON; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxFlowModel; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchantBUser; -import com.iformall.domain.po.WxRentContract; import com.iformall.domain.vo.WxBillAll; import com.iformall.enums.EnumBillUpdateType; -import com.iformall.enums.EnumContractOperationType; import com.iformall.enums.EnumFilterSettle; import com.iformall.enums.EnumFlowKey; import com.iformall.enums.EnumMerchantStatus; -import com.iformall.enums.EnumRentShopType; import com.iformall.service.WxBillAllService; import com.iformall.service.WxBillSettleService; import com.iformall.service.WxFlowService; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java index 505e09d77..35805048a 100755 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java @@ -13,7 +13,6 @@ import com.iformall.enums.EnumAssignTagsTrigger; import com.iformall.enums.EnumScoreType; import com.iformall.enums.EnumUserType; import com.iformall.service.*; -import com.iformall.utils.Constant; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -24,9 +23,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.math.BigDecimal; import java.util.Date; -import java.util.List; /** * @author gongbiao diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCardInfoController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCardInfoController.java index 87b7e3d16..7a8886dfd 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCardInfoController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCardInfoController.java @@ -1,24 +1,17 @@ package com.iformall.controller; import com.iformall.common.ErrorCode; -import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.common.SysConfigConstant; -import com.iformall.domain.po.*; +import com.iformall.domain.po.WxCUserBasicInfo; +import com.iformall.domain.po.WxCardInfo; +import com.iformall.domain.po.WxCouponPassword; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.vo.WxCardCVo; -import com.iformall.domain.vo.WxCardSpendVo; import com.iformall.domain.vo.WxCouponOrderCVo; import com.iformall.enums.EnumCardInfoType; import com.iformall.enums.EnumCouponOrderStatus; -import com.iformall.enums.EnumYesOrNo; -import com.iformall.exception.MallinkException; -import com.iformall.pay.WxPayConstant; import com.iformall.service.*; import com.iformall.utils.Constant; -import com.iformall.utils.DateUtils; - -import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -26,9 +19,13 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; -import java.util.*; +import java.util.HashMap; +import java.util.Map; @RestController @RequestMapping("/api/cardInfo") diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java index 00dff1bb5..0869c2920 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -3,9 +3,7 @@ package com.iformall.controller; import com.alibaba.fastjson.JSON; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; -import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.common.SysConfigConstant; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.vo.WxCardSpendVo; @@ -15,7 +13,6 @@ import com.iformall.exception.MallinkException; import com.iformall.service.*; import com.iformall.utils.Constant; import com.iformall.utils.DateUtils; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -25,9 +22,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.math.BigDecimal; -import java.util.*; + import javax.servlet.http.HttpServletRequest; +import java.math.BigDecimal; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; /** * @author Stormeye Wu wuguoqiang@iformall.com diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java index 4569368b7..5f5cba777 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java @@ -1,34 +1,26 @@ package com.iformall.controller; -import com.alibaba.fastjson.JSON; import com.github.pagehelper.PageInfo; -import com.iformall.annotation.AuthIgnore; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseEntity.SortField; -import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumCashOutStatus; -import com.iformall.enums.EnumPayShare; import com.iformall.enums.EnumPayWay; import com.iformall.service.*; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; +import java.util.List; + /** * 提现。微信需要小程序开通“企业付款到零钱”功能。 * @author alascor diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index aa8fdf3c7..f943eaa0a 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -2,20 +2,16 @@ package com.iformall.controller; import com.alibaba.fastjson.JSON; import com.github.pagehelper.PageInfo; -import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.dto.WxCouponChannelDto; -import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.vo.WxCouponChannelVo; import com.iformall.enums.EnumCouponChannelStatus; -import com.iformall.enums.EnumCouponStatus; import com.iformall.service.WxCouponChannelService; import com.iformall.service.WxCouponService; import com.iformall.service.util.CouponCacheUtils; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java index 755489653..4e62a4504 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -5,12 +5,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.domain.po.WxCoupon; -import com.iformall.domain.po.WxCouponPassword; -import com.iformall.domain.po.WxFlowModel; -import com.iformall.domain.po.WxFlowRecord; -import com.iformall.domain.po.WxMerchant; -import com.iformall.domain.po.WxMerchantBUser; +import com.iformall.domain.po.*; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCouponStatisVo; import com.iformall.enums.*; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index a3ca88f73..500a0f96d 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -3,7 +3,6 @@ package com.iformall.controller; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; import com.iformall.annotation.AuthIgnore; -import com.iformall.annotation.RedisCache; import com.iformall.annotation.TenantIgnore; import com.iformall.common.ErrorCode; import com.iformall.common.Result; @@ -17,7 +16,6 @@ import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.service.*; import com.iformall.utils.DateUtils; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -33,7 +31,8 @@ import org.springframework.data.redis.core.ValueOperations; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.*; -import java.text.ParseException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -41,9 +40,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - @Slf4j @RestController @RequestMapping("/api/couponOrder") diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java index e923bb034..59cccbad8 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java @@ -1,30 +1,26 @@ package com.iformall.controller; import com.github.pagehelper.PageInfo; -import com.iformall.annotation.TenantIgnore; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseEntity; -import com.iformall.domain.po.base.TenantEntity; -import com.iformall.domain.vo.WxCouponOrderCVo; -import com.iformall.enums.*; +import com.iformall.enums.EnumCouponOrderReservationStatus; +import com.iformall.enums.EnumCouponVerifyType; +import com.iformall.enums.EnumCreditLockedStatus; +import com.iformall.enums.EnumMerchantAdmin; import com.iformall.exception.MallinkException; import com.iformall.service.*; -import com.iformall.utils.DateUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.Date; import java.util.List; -import java.util.Map; @RestController @RequestMapping("/api/wxCouponOrderReservation") diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java index 270ba8cdc..dd6468e7c 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java @@ -3,7 +3,7 @@ package com.iformall.controller; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; -import com.iformall.domain.po.*; +import com.iformall.domain.po.WxCouponSend; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCouponActionLogVo; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java index c23cb84a4..c7fa9594d 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -4,14 +4,16 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.domain.po.WxBuser; import com.iformall.domain.po.WxCUserBasicInfo; import com.iformall.domain.po.WxCreditHistory; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCreditHistoryVo; -import com.iformall.enums.*; +import com.iformall.enums.EnumMerchantAdmin; +import com.iformall.enums.EnumMerchantStatus; +import com.iformall.enums.EnumScoreType; +import com.iformall.enums.EnumUserType; import com.iformall.exception.MallinkException; import com.iformall.service.WxCUserBasicInfoService; import com.iformall.service.WxCUserTagsService; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxDateAmountRecordController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxDateAmountRecordController.java index 6b2b2a11a..c0b02bf23 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxDateAmountRecordController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxDateAmountRecordController.java @@ -3,9 +3,9 @@ package com.iformall.controller; import com.github.pagehelper.PageInfo; import com.iformall.annotation.RedisCache; import com.iformall.common.ResultData; -import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.WxDateAmountRecord; import com.iformall.domain.po.WxMerchantBUser; +import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.vo.AmountRecordVo; import com.iformall.enums.EnumDateAmtType; import com.iformall.service.WxDateAmountRecordService; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java index 9b27236ae..bf8df0ffc 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java @@ -2,7 +2,6 @@ package com.iformall.controller; import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.iformall.annotation.AuthIgnore; import com.iformall.annotation.TenantIgnore; @@ -17,7 +16,6 @@ import com.iformall.enums.EnumMallUserStatus; import com.iformall.exception.MallinkException; import com.iformall.service.*; import com.iformall.service.cuser.CUserServiceFactory; -import com.iformall.utils.Constant; import com.iformall.utils.IPUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java index 2efd20efe..88e541d3f 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java @@ -7,7 +7,6 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxMall; import com.iformall.domain.po.WxMerchantBUser; -import com.iformall.enums.EnumGroupSupport; import com.iformall.service.WxAppinfoService; import com.iformall.service.WxMallService; import io.swagger.annotations.Api; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMemController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMemController.java index 5471a9395..5be7e93f9 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMemController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMemController.java @@ -2,7 +2,10 @@ package com.iformall.controller; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; -import com.iformall.domain.po.*; +import com.iformall.domain.po.WxCUserBasicInfo; +import com.iformall.domain.po.WxLevelConfig; +import com.iformall.domain.po.WxLevelMerchant; +import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.vo.WxCUserVo; import com.iformall.domain.vo.WxCouponOrderCVo; import com.iformall.domain.vo.WxLevelMerchantCVo; @@ -13,7 +16,6 @@ import com.iformall.service.WxCUserService; import com.iformall.service.WxLevelConfigService; import com.iformall.service.WxMerchantService; import com.iformall.utils.DateUtils; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java index c802befc0..a5a80fd30 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java @@ -5,21 +5,14 @@ import com.iformall.annotation.AuthIgnore; import com.iformall.annotation.RedisCache; import com.iformall.annotation.TenantIgnore; import com.iformall.common.ErrorCode; -import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.common.SysConfigConstant; import com.iformall.domain.po.*; import com.iformall.domain.vo.WxMerchantBuInfoVo; import com.iformall.enums.EnumAppPlat; import com.iformall.enums.EnumCreditLockedStatus; import com.iformall.enums.EnumEnableType; import com.iformall.enums.EnumMerchantBUserStatus; -import com.iformall.enums.EnumMerchantStatus; -import com.iformall.enums.EnumYesOrNo; -import com.iformall.exception.MallinkException; import com.iformall.service.*; -import com.iformall.service.cuser.CUserServiceFactory; -import com.iformall.utils.Constant; import com.iformall.utils.HashUtil; import com.iformall.utils.IPUtil; import io.swagger.annotations.Api; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java index 2cd4bf9ab..5139b619b 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java @@ -7,8 +7,10 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.po.base.TenantEntity; import com.iformall.douyin.pay.enums.AppAddSubMerchantUrlType; -import com.iformall.enums.*; -import com.iformall.exception.MallinkException; +import com.iformall.enums.EnumAppPlat; +import com.iformall.enums.EnumMsgSend; +import com.iformall.enums.EnumPayMchType; +import com.iformall.enums.EnumYesOrNo; import com.iformall.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java index 4c567f7a7..ca6637fdb 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java @@ -8,7 +8,10 @@ import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.WxMsgValidationcode; import com.iformall.domain.po.base.TenantEntity; -import com.iformall.enums.*; +import com.iformall.enums.EnumEnableType; +import com.iformall.enums.EnumMerchantBUserStatus; +import com.iformall.enums.EnumMerchantStatus; +import com.iformall.enums.EnumMsgModel; import com.iformall.service.WxMallService; import com.iformall.service.WxMerchantBUserService; import com.iformall.service.WxMerchantService; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxPayAccountController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxPayAccountController.java index ab4034fbd..81041370e 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxPayAccountController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxPayAccountController.java @@ -14,7 +14,10 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.Map; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxProfitSharingReceiverApplyController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxProfitSharingReceiverApplyController.java index 19cc74c8a..a6e71476e 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxProfitSharingReceiverApplyController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxProfitSharingReceiverApplyController.java @@ -5,7 +5,6 @@ import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxProfitPaymentReceiver; -import com.iformall.domain.po.WxProfitSharingReceiver; import com.iformall.domain.po.WxProfitSharingReceiverApply; import com.iformall.domain.po.base.TenantEntity; import com.iformall.douyin.pay.enums.MerchantImportStatus; @@ -15,7 +14,6 @@ import com.iformall.file.aliyun.AliyunOSS; import com.iformall.service.WxMerchantService; import com.iformall.service.WxProfitPaymentReceiverService; import com.iformall.service.WxProfitSharingReceiverApplyService; -import com.iformall.service.WxProfitSharingReceiverService; import com.iformall.utils.ImgYwsqhUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -29,7 +27,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.ByteArrayInputStream; -import java.io.OutputStream; import java.io.UnsupportedEncodingException; import java.util.HashMap; import java.util.Map; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxRefundOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxRefundOrderController.java index 3df5a5a48..440ca5614 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxRefundOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxRefundOrderController.java @@ -4,12 +4,13 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.domain.po.*; -import com.iformall.enums.EnumAppType; +import com.iformall.domain.po.WxCouponOrder; +import com.iformall.domain.po.WxRefundOrder; import com.iformall.enums.EnumPayType; -import com.iformall.enums.EnumPayWay; import com.iformall.exception.MallinkException; -import com.iformall.service.*; +import com.iformall.service.WxAppinfoService; +import com.iformall.service.WxCouponOrderService; +import com.iformall.service.WxRefundOrderService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -20,7 +21,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.HashMap; import java.util.Map; @RestController diff --git a/mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java b/mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java index e40c09304..96ee54be7 100644 --- a/mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java +++ b/mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java @@ -5,13 +5,11 @@ import com.iformall.annotation.AuthIgnore; import com.iformall.annotation.TenantIgnore; import com.iformall.common.ErrorCode; import com.iformall.common.TenantThreadLocal; -import com.iformall.domain.po.WxBuser; import com.iformall.domain.po.WxMall; import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.base.BaseCUserEntity; import com.iformall.exception.MallinkException; import com.iformall.service.CUserTokenService; -import com.iformall.service.WxBuserTokenService; import com.iformall.service.WxMallService; import com.iformall.service.WxMerchantBUserService; import com.iformall.utils.Constant; diff --git a/mallinkBApi/src/main/java/com/iformall/interceptor/TestControllerReturnAspect.java b/mallinkBApi/src/main/java/com/iformall/interceptor/TestControllerReturnAspect.java index b57925393..f326c7ca4 100644 --- a/mallinkBApi/src/main/java/com/iformall/interceptor/TestControllerReturnAspect.java +++ b/mallinkBApi/src/main/java/com/iformall/interceptor/TestControllerReturnAspect.java @@ -3,10 +3,6 @@ package com.iformall.interceptor; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; -import org.aspectj.lang.annotation.Around; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Pointcut; -import org.springframework.context.annotation.Configuration; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; diff --git a/mallinkBApi/src/main/java/com/iformall/service/PosBrunService.java b/mallinkBApi/src/main/java/com/iformall/service/PosBrunService.java index ebe123113..f1c1c41f4 100644 --- a/mallinkBApi/src/main/java/com/iformall/service/PosBrunService.java +++ b/mallinkBApi/src/main/java/com/iformall/service/PosBrunService.java @@ -9,8 +9,10 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.PosOrder; import com.iformall.domain.po.PosPayOrder; import com.iformall.domain.po.WxMerchantBUser; -import com.iformall.domain.po.base.TenantEntity; -import com.iformall.enums.*; +import com.iformall.enums.EnumPayStatus; +import com.iformall.enums.EnumPosOrderStatus; +import com.iformall.enums.EnumPosOrderType; +import com.iformall.enums.EnumPosPayType; import com.iformall.exception.MallinkException; import com.iformall.pay.WxPayConstant; import com.iformall.pay.WxPayment; diff --git a/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 3ebc1d970..60557cbdc 100644 --- a/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -2,18 +2,13 @@ package com.iformall.tenant; import com.iformall.common.TenantThreadLocal; import com.iformall.plugin.autoTenantId.TenantInfo; -import com.iformall.utils.Constant; import org.apache.ibatis.mapping.MappedStatement; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; import java.util.Arrays; import java.util.List; -import javax.servlet.http.HttpServletRequest; - public class TenantInfoImpl implements TenantInfo { private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/mallinkBApi/src/main/java/com/iformall/utils/ImgYwsqhUtil.java b/mallinkBApi/src/main/java/com/iformall/utils/ImgYwsqhUtil.java index b31136cf2..43154da3a 100644 --- a/mallinkBApi/src/main/java/com/iformall/utils/ImgYwsqhUtil.java +++ b/mallinkBApi/src/main/java/com/iformall/utils/ImgYwsqhUtil.java @@ -1,12 +1,9 @@ package com.iformall.utils; -import com.iformall.common.ErrorCode; -import com.iformall.common.ResultData; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.io.ClassPathResource; -import org.springframework.util.ResourceUtils; import javax.imageio.ImageIO; import java.awt.*; @@ -15,10 +12,6 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.InputStream; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.Date; -import java.util.Locale; public class ImgYwsqhUtil { diff --git a/mallinkBApi/src/test/java/com/iformall/b/CouponsendTest.java b/mallinkBApi/src/test/java/com/iformall/b/CouponsendTest.java index 26af4c590..035a07e63 100644 --- a/mallinkBApi/src/test/java/com/iformall/b/CouponsendTest.java +++ b/mallinkBApi/src/test/java/com/iformall/b/CouponsendTest.java @@ -4,15 +4,10 @@ import com.alibaba.fastjson.JSON; import com.fasterxml.jackson.databind.ObjectMapper; import com.iformall.common.ErrorCode; import com.iformall.domain.po.WxCouponOrder; -import com.iformall.domain.po.WxCouponSend; -import com.iformall.domain.po.WxLevelConfig; -import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumCouponSendSendType; -import com.iformall.enums.EnumPayWay; import com.iformall.exception.MallinkException; import com.iformall.service.WxCouponOrderService; -import com.iformall.service.WxLevelConfigService; import com.iformall.service.WxOrderService; import lombok.extern.slf4j.Slf4j; import org.junit.FixMethodOrder; @@ -31,10 +26,8 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import org.springframework.test.web.servlet.result.MockMvcResultHandlers; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import java.io.PrintStream; import java.util.Arrays; import java.util.HashMap; -import java.util.List; import java.util.Map; @Slf4j diff --git a/mallinkCApi/src/main/java/com/iformall/CApplication.java b/mallinkCApi/src/main/java/com/iformall/CApplication.java index d916e1bf9..1b939db97 100644 --- a/mallinkCApi/src/main/java/com/iformall/CApplication.java +++ b/mallinkCApi/src/main/java/com/iformall/CApplication.java @@ -1,5 +1,6 @@ package com.iformall; +import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; import org.mybatis.spring.annotation.MapperScan; import org.rocketmq.starter.annotation.EnableRocketMQ; import org.springframework.beans.factory.annotation.Value; @@ -7,8 +8,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.EnableAspectJAutoProxy; - -import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; import org.springframework.scheduling.annotation.EnableAsync; /** diff --git a/mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java b/mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java index 1d54339c8..96bbd88e0 100644 --- a/mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java +++ b/mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java @@ -3,10 +3,7 @@ package com.iformall.aop; import com.alibaba.fastjson.JSONObject; import com.iformall.annotation.RedisCache; -import com.iformall.common.ErrorCode; -import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.base.BaseCUserEntity; -import com.iformall.exception.MallinkException; import com.iformall.interceptor.BodyReaderHttpServletRequestWrapper; import com.iformall.service.CUserTokenService; import com.iformall.utils.HashUtil; diff --git a/mallinkCApi/src/main/java/com/iformall/config/RedisConfig.java b/mallinkCApi/src/main/java/com/iformall/config/RedisConfig.java index 02e61114a..3266ae294 100644 --- a/mallinkCApi/src/main/java/com/iformall/config/RedisConfig.java +++ b/mallinkCApi/src/main/java/com/iformall/config/RedisConfig.java @@ -27,7 +27,6 @@ import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer; import org.springframework.data.redis.serializer.StringRedisSerializer; import java.time.Duration; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java index f7ea3acaa..9e929a669 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java @@ -3,8 +3,6 @@ package com.iformall.controller; import cn.binarywang.wx.miniapp.api.WxMaService; import com.alibaba.fastjson.JSONObject; import com.iformall.common.ErrorCode; -import com.iformall.common.IdWorker; -import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseCUserEntity; import com.iformall.domain.po.base.TenantEntity; @@ -12,7 +10,6 @@ import com.iformall.domain.po.tt.TtCUser; import com.iformall.enums.EnumAppPlat; import com.iformall.enums.EnumPayVersion; import com.iformall.enums.EnumPayWay; -import com.iformall.enums.EnumScoreType; import com.iformall.exception.MallinkException; import com.iformall.service.*; import com.iformall.service.wechat.FmOpenService; @@ -20,7 +17,6 @@ import com.iformall.utils.Constant; import com.iformall.utils.IPUtil; import com.iformall.utils.MaUtil; import com.iformall.utils.RedisCacheUtils; - import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,7 +34,6 @@ import java.beans.PropertyEditorSupport; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; -import java.util.List; import java.util.Map; @RestController diff --git a/mallinkCApi/src/main/java/com/iformall/controller/FengNiaoMapController.java b/mallinkCApi/src/main/java/com/iformall/controller/FengNiaoMapController.java index dcc47aec2..41afb5397 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/FengNiaoMapController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/FengNiaoMapController.java @@ -7,14 +7,15 @@ import com.iformall.domain.po.FengNiaoMapConfig; import com.iformall.service.FengNiaoMapService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; - -import java.util.concurrent.TimeUnit; - import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.concurrent.TimeUnit; /** * @author gongbiao diff --git a/mallinkCApi/src/main/java/com/iformall/controller/SysConfigController.java b/mallinkCApi/src/main/java/com/iformall/controller/SysConfigController.java index 8458a4ce6..04cdb5bd9 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/SysConfigController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/SysConfigController.java @@ -1,8 +1,6 @@ package com.iformall.controller; -import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; -import com.iformall.common.SysConfigConstant; import com.iformall.domain.po.SysConfig; import com.iformall.service.SysConfigService; import io.swagger.annotations.ApiImplicitParam; @@ -12,7 +10,9 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * @author gongbiao diff --git a/mallinkCApi/src/main/java/com/iformall/controller/SysGaodeController.java b/mallinkCApi/src/main/java/com/iformall/controller/SysGaodeController.java index 0f337d590..c951163f5 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/SysGaodeController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/SysGaodeController.java @@ -5,7 +5,9 @@ import com.iformall.service.SysGaoDeService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * @author gongbiao diff --git a/mallinkCApi/src/main/java/com/iformall/controller/TtMallImController.java b/mallinkCApi/src/main/java/com/iformall/controller/TtMallImController.java index 1cf8d5095..65707ec35 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/TtMallImController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/TtMallImController.java @@ -8,7 +8,9 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; import java.util.Random; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/UploadController.java b/mallinkCApi/src/main/java/com/iformall/controller/UploadController.java index 26499de18..a19e3289b 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/UploadController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/UploadController.java @@ -11,13 +11,18 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import javax.imageio.ImageIO; import java.awt.image.BufferedImage; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; @RestController @RequestMapping(value = "/api/upload") diff --git a/mallinkCApi/src/main/java/com/iformall/controller/UserBasicInfoChildController.java b/mallinkCApi/src/main/java/com/iformall/controller/UserBasicInfoChildController.java index f12959bd6..7cb0bf663 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/UserBasicInfoChildController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/UserBasicInfoChildController.java @@ -4,9 +4,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.domain.po.UserBasicInfoAddress; import com.iformall.domain.po.WxCUserBasicChild; -import com.iformall.service.UserBasicInfoAddressService; import com.iformall.service.WxCUserBasicChildService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java index c7c86f6e2..c67ea7b37 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java @@ -5,10 +5,10 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.domain.po.WxCUserBasicInfo; -import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.WxActivity; import com.iformall.domain.po.WxActivityJoin; +import com.iformall.domain.po.WxCUserBasicInfo; +import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.vo.WxActivityJoinQuestionAnswer; import com.iformall.exception.MallinkException; import com.iformall.service.WxActivityJoinService; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessCircleController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessCircleController.java index 1c7515761..9caaab9c6 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessCircleController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessCircleController.java @@ -1,25 +1,24 @@ package com.iformall.controller; -import com.iformall.annotation.RedisCache; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.domain.po.*; -import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.po.CUser; import com.iformall.enums.EnumAppPlat; import com.iformall.enums.EnumBusinessCircleAuthorizeState; -import com.iformall.service.*; +import com.iformall.service.WxBusinessCircleOrderService; import com.iformall.utils.Constant; import com.iformall.utils.RedisCacheUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @RestController diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java index f9f309e4c..beee53ec6 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java @@ -9,7 +9,9 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @RestController diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCUserBasicSignController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCUserBasicSignController.java index f813852c3..f43046437 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCUserBasicSignController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCUserBasicSignController.java @@ -20,7 +20,6 @@ import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.Date; -import java.util.HashMap; import java.util.Map; @RestController diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java index 277d1c831..4d5969c03 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java @@ -4,15 +4,14 @@ import com.github.pagehelper.PageInfo; import com.iformall.annotation.RedisCache; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.WxCampaign; import com.iformall.domain.po.WxCouponChannel; +import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.vo.WxCouponChannelVo; import com.iformall.enums.*; import com.iformall.service.WxCampaignService; import com.iformall.service.WxCouponChannelService; import com.iformall.utils.RedisCacheUtils; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java index bcc843fba..b6c9d38c8 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java @@ -1,18 +1,15 @@ package com.iformall.controller; -import com.alibaba.fastjson.JSON; import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseEntity; -import com.iformall.domain.po.base.BaseEntity.SortField; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCouponOrderCarCVo; import com.iformall.enums.*; import com.iformall.exception.MallinkException; -import com.iformall.pay.WxPayV3; import com.iformall.service.*; import com.iformall.service.park.ParkFactory; import com.iformall.service.park.entity.ParkCreatePayOrder; @@ -22,10 +19,7 @@ import com.iformall.service.park.impl.util.ParkHelper; import com.iformall.service.park.pay.WxParkPayService; import com.iformall.service.park.utils.ParkCacheUtils; import com.iformall.service.pay.service.pay.entity.PayAdapterResult; -import com.iformall.utils.AesUtil; -import com.iformall.utils.Base64Util; import com.iformall.utils.Constant; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java index 6dd5081a0..d167d87c3 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -1,52 +1,33 @@ package com.iformall.controller; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - -import com.iformall.enums.*; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.domain.po.WxCUser; -import com.iformall.domain.po.WxCUserBasicInfo; -import com.iformall.domain.po.WxCardInfo; -import com.iformall.domain.po.WxCardSpend; -import com.iformall.domain.po.WxCouponMerchant; -import com.iformall.domain.po.WxCouponOrder; -import com.iformall.domain.po.WxMerchant; -import com.iformall.domain.po.WxOrder; +import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseEntity.SortField; import com.iformall.domain.vo.WxCardSpendVo; +import com.iformall.enums.EnumCardInfoStatus; +import com.iformall.enums.EnumCreditLockedStatus; +import com.iformall.enums.EnumMerchantStatus; +import com.iformall.enums.EnumYesOrNo; import com.iformall.exception.MallinkException; -import com.iformall.service.WxCUserBasicInfoService; -import com.iformall.service.WxCardInfoService; -import com.iformall.service.WxCardSpendService; -import com.iformall.service.WxCouponOrderService; -import com.iformall.service.WxMerchantService; -import com.iformall.service.WxOrderService; +import com.iformall.service.*; import com.iformall.utils.Constant; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import java.math.BigDecimal; +import java.util.Map; /** * @author Stormeye Wu wuguoqiang@iformall.com diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index 8bf0fe8a9..669e40319 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -1,42 +1,36 @@ package com.iformall.controller; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; - -import com.github.pagehelper.PageHelper; -import com.iformall.common.ErrorCode; -import com.iformall.domain.po.WxCampaign; -import com.iformall.domain.po.WxCoupon; -import com.iformall.enums.*; -import org.apache.commons.collections.map.HashedMap; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.core.ValueOperations; -import org.springframework.web.bind.annotation.*; - import com.github.pagehelper.PageInfo; import com.iformall.annotation.RedisCache; +import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; +import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.vo.WxCouponChannelVo; +import com.iformall.enums.*; import com.iformall.service.WxCouponChannelService; import com.iformall.service.WxMerchantService; import com.iformall.service.util.CouponCacheUtils; import com.iformall.utils.RedisCacheUtils; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.commons.collections.map.HashedMap; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; @RestController @RequestMapping("/api/wxCouponChannel") diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java index 41f39d70b..2c4fba50c 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -1,33 +1,5 @@ package com.iformall.controller; -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - -import com.iformall.domain.po.WxMerchant; -import com.iformall.domain.po.WxMiniappThemeValue; -import com.iformall.domain.po.base.TenantEntity; -import com.iformall.enums.EnumCouponType; -import com.iformall.enums.EnumMerchantStatus; -import com.iformall.utils.*; -import org.apache.commons.beanutils.BeanUtils; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.core.ValueOperations; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - import com.alibaba.fastjson.JSON; import com.iformall.annotation.TenantIgnore; import com.iformall.common.ErrorCode; @@ -36,23 +8,32 @@ import com.iformall.common.SysConfigConstant; import com.iformall.domain.po.SysConfig; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponChannel; -import com.iformall.domain.po.WxMall; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCouponCVo; import com.iformall.domain.vo.WxMerchantVo; import com.iformall.enums.EnumCouponChannelActivityStatus; -import com.iformall.enums.EnumCouponChannelType; -import com.iformall.service.SysConfigService; -import com.iformall.service.SysGaoDeService; -import com.iformall.service.WxCouponChannelService; -import com.iformall.service.WxCouponService; -import com.iformall.service.WxMerchantService; +import com.iformall.enums.EnumCouponType; +import com.iformall.service.*; import com.iformall.service.util.CouponCacheUtils; -import com.iformall.utils.RedisCacheUtils; - +import com.iformall.utils.Constant; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.ValueOperations; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.lang.reflect.InvocationTargetException; +import java.util.*; +import java.util.concurrent.TimeUnit; @RestController @RequestMapping("/api/wxCoupon") diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index 922143e93..bd5484f9c 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -1,6 +1,5 @@ package com.iformall.controller; -import com.alibaba.fastjson.JSON; import com.github.pagehelper.PageInfo; import com.iformall.annotation.RedisCache; import com.iformall.common.ErrorCode; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java index ed7b4e930..c4ffcca93 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java @@ -15,8 +15,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.List; - @RestController @RequestMapping("/api/wxCouponOrderReservation") @Api(description = "查询预约接口") diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java index 445f6c121..75e5e1c63 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -4,7 +4,9 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.domain.po.*; +import com.iformall.domain.po.CUser; +import com.iformall.domain.po.WxCreditHistory; +import com.iformall.domain.po.WxScoreRules; import com.iformall.domain.po.base.BaseEntity; import com.iformall.enums.EnumScoreType; import com.iformall.enums.EnumUserType; @@ -16,7 +18,6 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCuserFloatingLayerController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCuserFloatingLayerController.java index 2a88f7d89..f762b4e07 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCuserFloatingLayerController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCuserFloatingLayerController.java @@ -1,6 +1,5 @@ package com.iformall.controller; -import com.iformall.annotation.AuthIgnore; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxFloatingLayer; @@ -9,8 +8,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; - -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCustomizeModuleController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCustomizeModuleController.java index 1cf742de2..745c7d291 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCustomizeModuleController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCustomizeModuleController.java @@ -14,7 +14,9 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java index e9b39062d..8216ac978 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java @@ -3,7 +3,7 @@ package com.iformall.controller; import com.iformall.annotation.RedisCache; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; -import com.iformall.domain.po.*; +import com.iformall.domain.po.WxGame; import com.iformall.enums.EnumGameStatus; import com.iformall.exception.MallinkException; import com.iformall.service.WxCouponOrderService; @@ -15,10 +15,8 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; -import java.util.List; import java.util.Map; @RestController diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxLiveController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxLiveController.java index 4839c74a5..21806382d 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxLiveController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxLiveController.java @@ -5,7 +5,6 @@ import com.iformall.annotation.RedisCache; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.domain.po.CUser; -import com.iformall.domain.po.WxCUser; import com.iformall.exception.MallinkException; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMallBuildingController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMallBuildingController.java index a59c0b72e..8421da521 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMallBuildingController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMallBuildingController.java @@ -6,7 +6,9 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/api/wxMallBuilding") diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java index 9adef5b4d..98e854851 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java @@ -5,10 +5,12 @@ import com.iformall.annotation.RedisCache; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.domain.po.*; +import com.iformall.domain.po.WxAppinfo; +import com.iformall.domain.po.WxLevelConfig; +import com.iformall.domain.po.WxMall; +import com.iformall.domain.po.WxScoreRules; import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumGroupSupport; -import com.iformall.enums.EnumYesOrNo; import com.iformall.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java index e7f84647b..409ebf17b 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java @@ -1,6 +1,5 @@ package com.iformall.controller; -import com.iformall.annotation.TenantIgnore; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.domain.dto.WxMerchantDto; @@ -19,7 +18,10 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.HashMap; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java index 43763c785..4b02496a6 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java @@ -18,7 +18,9 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.HashMap; import java.util.List; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMsgController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMsgController.java index 14d98aae4..04c425101 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMsgController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMsgController.java @@ -1,18 +1,19 @@ package com.iformall.controller; -import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.WxTemplateMsg; import com.iformall.enums.EnumTemplateType; import com.iformall.enums.EnumYesOrNo; import com.iformall.service.WxTemplateMsgService; -import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.HashMap; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java index eae21c8f2..2bb65484d 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java @@ -5,15 +5,11 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.CUser; import com.iformall.domain.po.WxAppinfo; -import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.WxMsgValidationcode; -import com.iformall.enums.EnumAppPlat; -import com.iformall.enums.EnumAssignTagsTrigger; -import com.iformall.enums.EnumPayWay; import com.iformall.exception.MallinkException; -import com.iformall.service.*; +import com.iformall.service.WxAppinfoService; +import com.iformall.service.WxMsgValidationcodeService; import com.iformall.service.cuser.CUserServiceFactory; -import com.iformall.utils.Constant; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -25,8 +21,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.Date; - @RestController @RequestMapping("/api/wxMsgValidationcode") @Api(description = "短信验证相关接口") diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java index b9ce752c6..cd259ff91 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java @@ -1,9 +1,7 @@ package com.iformall.controller; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.binarywang.wxpay.bean.ecommerce.SignatureHeader; import com.github.pagehelper.PageInfo; import com.iformall.annotation.AuthIgnore; @@ -14,7 +12,6 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.dto.OrderComposeSaveDto; import com.iformall.domain.dto.OrderSaveDto; -import com.iformall.domain.dto.PlatPushOrderSaveDto; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.TenantEntity; @@ -33,13 +30,9 @@ import com.iformall.service.*; import com.iformall.service.cuser.CUserServiceFactory; import com.iformall.service.order.OrderFactory; import com.iformall.service.order.entity.WxComposeOrder; -import com.iformall.service.pay.entity.PayExtraParam; import com.iformall.utils.Constant; -import com.iformall.utils.IPUtil; import com.iformall.utils.MaUtil; -import com.iformall.utils.RedisCacheUtils; import com.iformall.utils.RedisLock; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderGroupController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderGroupController.java index 09f155445..e3bf644f1 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderGroupController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderGroupController.java @@ -6,8 +6,6 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxOrder; import com.iformall.domain.po.WxOrderGroup; -import com.iformall.domain.po.base.TenantEntity; -import com.iformall.domain.vo.WxOrderGroupMarketing; import com.iformall.enums.EnumOrderStatus; import com.iformall.service.WxCouponService; import com.iformall.service.WxMallService; @@ -22,7 +20,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.List; import java.util.Map; @RestController diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java index d5064315d..8d3f9cf42 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java @@ -1,48 +1,32 @@ package com.iformall.controller; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - -import com.iformall.domain.po.*; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; - import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.enums.EnumComposeOrder; +import com.iformall.domain.po.*; import com.iformall.enums.EnumCreditLockedStatus; -import com.iformall.enums.EnumOrderStatus; import com.iformall.enums.EnumPayStatus; import com.iformall.enums.EnumPayWay; import com.iformall.exception.MallinkException; -import com.iformall.service.WxAppinfoService; -import com.iformall.service.WxCUserBasicInfoService; -import com.iformall.service.WxCouponService; -import com.iformall.service.WxOrderService; -import com.iformall.service.WxPayAccountService; -import com.iformall.service.WxPayOrderService; +import com.iformall.service.*; import com.iformall.service.order.OrderFactory; import com.iformall.service.order.entity.WxComposeOrder; import com.iformall.service.pay.entity.PayExtraParam; import com.iformall.utils.IPUtil; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import java.util.Map; @RestController @RequestMapping("/api/pay") diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxPressOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxPressOrderController.java index 76d197d83..917dede25 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxPressOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxPressOrderController.java @@ -3,7 +3,6 @@ package com.iformall.controller; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.WxOrder; import com.iformall.domain.po.WxOrderPress; import com.iformall.domain.po.base.TenantEntity; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionController.java index 162d5da85..0fbcda9e6 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionController.java @@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.WxQuestion; import com.iformall.domain.po.WxQuestionConfig; import com.iformall.domain.po.WxQuestionLog; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java index 4beb46dc0..e77795a8f 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java @@ -1,12 +1,10 @@ package com.iformall.controller; import com.github.pagehelper.PageInfo; -import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.domain.po.WxCUser; -import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.WxScoreHistory; +import com.iformall.domain.po.base.BaseEntity; import com.iformall.service.WxScoreHistoryService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -14,7 +12,9 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/api/scoreHistory") diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java index 00c06ac76..8b5062446 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java @@ -7,14 +7,15 @@ import com.iformall.enums.EnumCacheKey; import com.iformall.enums.EnumWxTopicType; import com.iformall.service.WxTopicService; import com.iformall.utils.RedisCacheUtils; - import io.swagger.annotations.Api; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 65ca148d6..5f55a5957 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -15,14 +15,15 @@ import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCUserVo; import com.iformall.domain.vo.WxCouponOrderCVo; import com.iformall.domain.vo.WxLevelMerchantCVo; -import com.iformall.enums.*; +import com.iformall.enums.EnumAppPlat; +import com.iformall.enums.EnumCUserFrom; +import com.iformall.enums.EnumEnableType; +import com.iformall.enums.EnumLevelConfigDiscountStatus; import com.iformall.exception.MallinkException; import com.iformall.service.*; import com.iformall.service.cuser.CUserServiceFactory; -import com.iformall.service.wechat.FmOpenService; import com.iformall.utils.Constant; import com.iformall.utils.IPUtil; -import com.iformall.utils.RedisCacheUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; @@ -38,7 +39,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; import java.math.BigDecimal; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/mallinkCApi/src/main/java/com/iformall/interceptor/RequestInterceptor.java b/mallinkCApi/src/main/java/com/iformall/interceptor/RequestInterceptor.java index 916338575..85debd4cf 100644 --- a/mallinkCApi/src/main/java/com/iformall/interceptor/RequestInterceptor.java +++ b/mallinkCApi/src/main/java/com/iformall/interceptor/RequestInterceptor.java @@ -25,7 +25,6 @@ import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.nio.charset.Charset; import java.util.Enumeration; -import java.util.concurrent.TimeUnit; /** * 幂等检查 diff --git a/mallinkCApi/src/main/java/com/iformall/interceptor/TestControllerReturnAspect.java b/mallinkCApi/src/main/java/com/iformall/interceptor/TestControllerReturnAspect.java index e08d206b3..f326c7ca4 100644 --- a/mallinkCApi/src/main/java/com/iformall/interceptor/TestControllerReturnAspect.java +++ b/mallinkCApi/src/main/java/com/iformall/interceptor/TestControllerReturnAspect.java @@ -1,22 +1,15 @@ package com.iformall.interceptor; -import java.io.BufferedReader; -import java.io.IOException; - -import javax.servlet.http.HttpServletRequest; - +import com.alibaba.fastjson.JSON; +import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; -import org.aspectj.lang.annotation.Around; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Pointcut; -import org.springframework.context.annotation.Configuration; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import com.alibaba.fastjson.JSON; - -import lombok.extern.slf4j.Slf4j; +import javax.servlet.http.HttpServletRequest; +import java.io.BufferedReader; +import java.io.IOException; /** diff --git a/mallinkCApi/src/main/java/com/iformall/interceptor/WebLogAspect.java b/mallinkCApi/src/main/java/com/iformall/interceptor/WebLogAspect.java index c66aeef83..b1aafc33c 100644 --- a/mallinkCApi/src/main/java/com/iformall/interceptor/WebLogAspect.java +++ b/mallinkCApi/src/main/java/com/iformall/interceptor/WebLogAspect.java @@ -14,7 +14,6 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; -import java.util.Arrays; @Aspect @Component diff --git a/mallinkCApi/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java b/mallinkCApi/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java index db7f5b15a..783e22049 100644 --- a/mallinkCApi/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java +++ b/mallinkCApi/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java @@ -1,17 +1,13 @@ package com.iformall.resolver; import com.iformall.annotation.LoginUser; -import com.iformall.domain.po.WxCUserBasicInfo; import com.iformall.domain.po.base.BaseCUserEntity; -import com.iformall.service.CUserTokenService; import com.iformall.service.WxCUserBasicInfoService; -import com.iformall.utils.Constant; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.MethodParameter; import org.springframework.stereotype.Component; import org.springframework.web.bind.support.WebDataBinderFactory; import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.method.support.ModelAndViewContainer; diff --git a/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 8032f90df..37820edc9 100644 --- a/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -2,18 +2,13 @@ package com.iformall.tenant; import com.iformall.common.TenantThreadLocal; import com.iformall.plugin.autoTenantId.TenantInfo; -import com.iformall.utils.Constant; import org.apache.ibatis.mapping.MappedStatement; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; import java.util.Arrays; import java.util.List; -import javax.servlet.http.HttpServletRequest; - public class TenantInfoImpl implements TenantInfo { private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/mallinkCApi/src/main/java/com/iformall/utils/ImgIdeaUtil.java b/mallinkCApi/src/main/java/com/iformall/utils/ImgIdeaUtil.java index 16ebb8d46..2a65c07d9 100644 --- a/mallinkCApi/src/main/java/com/iformall/utils/ImgIdeaUtil.java +++ b/mallinkCApi/src/main/java/com/iformall/utils/ImgIdeaUtil.java @@ -14,9 +14,7 @@ import org.springframework.util.ResourceUtils; import javax.imageio.ImageIO; import java.awt.*; import java.awt.image.BufferedImage; -import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.File; import java.io.InputStream; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; diff --git a/mallinkCallback/src/main/java/com/iformall/config/MyBatisConfiguration.java b/mallinkCallback/src/main/java/com/iformall/config/MyBatisConfiguration.java index 4e745b64a..c245055a3 100644 --- a/mallinkCallback/src/main/java/com/iformall/config/MyBatisConfiguration.java +++ b/mallinkCallback/src/main/java/com/iformall/config/MyBatisConfiguration.java @@ -2,14 +2,13 @@ package com.iformall.config; import com.iformall.plugin.MyBatisItercepters; import com.iformall.plugin.MyBatisPlus; - -import java.util.ArrayList; -import java.util.List; - import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.transaction.annotation.EnableTransactionManagement; +import java.util.ArrayList; +import java.util.List; + @EnableTransactionManagement @Configuration public class MyBatisConfiguration extends BaseMyBatisConfiguration{ diff --git a/mallinkCallback/src/main/java/com/iformall/config/RestFilter.java b/mallinkCallback/src/main/java/com/iformall/config/RestFilter.java index 4f9298433..b5d331492 100644 --- a/mallinkCallback/src/main/java/com/iformall/config/RestFilter.java +++ b/mallinkCallback/src/main/java/com/iformall/config/RestFilter.java @@ -1,16 +1,10 @@ package com.iformall.config; -import java.io.IOException; -import java.util.Optional; - -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import javax.servlet.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.Optional; /** * 前后端分离RESTful接口过滤器 diff --git a/mallinkCallback/src/main/java/com/iformall/config/ShiroConfig.java b/mallinkCallback/src/main/java/com/iformall/config/ShiroConfig.java index 28771672d..435ffe5a5 100644 --- a/mallinkCallback/src/main/java/com/iformall/config/ShiroConfig.java +++ b/mallinkCallback/src/main/java/com/iformall/config/ShiroConfig.java @@ -14,7 +14,6 @@ import org.crazycake.shiro.RedisCacheManager; import org.crazycake.shiro.RedisManager; import org.crazycake.shiro.RedisSessionDAO; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/mallinkCallback/src/main/java/com/iformall/config/ShiroLoginFilter.java b/mallinkCallback/src/main/java/com/iformall/config/ShiroLoginFilter.java index 67c07385e..b3cb49d5a 100644 --- a/mallinkCallback/src/main/java/com/iformall/config/ShiroLoginFilter.java +++ b/mallinkCallback/src/main/java/com/iformall/config/ShiroLoginFilter.java @@ -1,13 +1,12 @@ package com.iformall.config; +import com.alibaba.fastjson.JSON; +import com.iformall.common.ResultData; +import org.apache.shiro.web.filter.authc.FormAuthenticationFilter; + import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; - -import org.apache.shiro.web.filter.authc.FormAuthenticationFilter; - -import com.alibaba.fastjson.JSON; -import com.iformall.common.ResultData; public class ShiroLoginFilter extends FormAuthenticationFilter { @Override diff --git a/mallinkCallback/src/main/java/com/iformall/controller/base/BaseController.java b/mallinkCallback/src/main/java/com/iformall/controller/base/BaseController.java index a1dfca5fb..7d99ddce6 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/base/BaseController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/base/BaseController.java @@ -1,7 +1,6 @@ package com.iformall.controller.base; import com.alibaba.fastjson.JSONObject; -import com.iformall.domain.po.base.TenantEntity; import com.iformall.utils.IPUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.WebDataBinder; diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/AliPayController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/AliPayController.java index cbe4769d2..80403021e 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/AliPayController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/AliPayController.java @@ -3,25 +3,28 @@ package com.iformall.controller.callback; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.*; +import com.iformall.domain.po.AliBusinessCircleOrder; +import com.iformall.domain.po.AliPayCUser; +import com.iformall.domain.po.WxMall; +import com.iformall.domain.po.WxMerchant; import com.iformall.exception.MallinkException; -import com.iformall.service.*; +import com.iformall.service.AliBusinessCircleOrderService; +import com.iformall.service.AliPayCUserService; +import com.iformall.service.WxMallService; +import com.iformall.service.WxMerchantService; import com.iformall.service.pay.alipay.AliPayUtil; import com.iformall.service.pay.alipay.api.enums.EnumMemberCardConfig; import com.iformall.service.pay.alipay.api.result.UserAuthData; import com.iformall.utils.AlipayMsgPage; - import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestAttribute; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -29,7 +32,6 @@ import java.io.PrintWriter; import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.Date; -import java.util.Locale; import java.util.Map; @RestController diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/DdrivenCallbackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/DdrivenCallbackController.java index 8ca4357d0..72340b661 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/DdrivenCallbackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/DdrivenCallbackController.java @@ -3,7 +3,10 @@ package com.iformall.controller.callback; import com.iformall.controller.base.BaseController; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import java.util.Map; diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java index 810d6a7f8..003f5ae9c 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java @@ -3,11 +3,16 @@ package com.iformall.controller.callback; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.*; +import com.iformall.domain.po.JmSportOrder; +import com.iformall.domain.po.WxCUserBasicInfo; +import com.iformall.domain.po.WxCouponOrder; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCouponOrderCVo; import com.iformall.enums.EnumAssignTagsTrigger; -import com.iformall.service.*; +import com.iformall.service.JmSportOrderService; +import com.iformall.service.WxCUserBasicInfoService; +import com.iformall.service.WxCUserTagsService; +import com.iformall.service.WxCouponOrderService; import com.iformall.service.tags.jinmao.JinMaoOrderTagsDeveloper; import com.iformall.service.tags.jinmao.JinMaoUserTagsDeveloper; import com.iformall.utils.Base64Util; @@ -21,6 +26,9 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.io.PrintWriter; @@ -31,8 +39,6 @@ import java.util.Date; import java.util.HashMap; import java.util.Locale; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; /** * 金茂数据推送 diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/TtGoodsController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/TtGoodsController.java index 6b5c56bc6..bfd00312c 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/TtGoodsController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/TtGoodsController.java @@ -1,18 +1,14 @@ package com.iformall.controller.callback; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.TtCouponChannelPoi; -import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxCoupon; -import com.iformall.enums.EnumCouponVersion; import com.iformall.service.MailService; import com.iformall.service.TtCouponGoodsService; import com.iformall.service.WxAppinfoService; import com.iformall.service.WxCouponService; -import com.iformall.utils.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -21,10 +17,8 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; -import java.util.Date; import java.util.HashMap; import java.util.Map; -import java.util.concurrent.TimeUnit; @RestController diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/TtPayController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/TtPayController.java index ad4c3ebcf..c52a8dfaa 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/TtPayController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/TtPayController.java @@ -2,18 +2,11 @@ package com.iformall.controller.callback; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.github.binarywang.wxpay.bean.ecommerce.SignatureHeader; -import com.iformall.common.ErrorCode; -import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.*; -import com.iformall.domain.po.base.TenantEntity; -import com.iformall.domain.po.msg.FmInsideNotifyRefundSuccessMsg; import com.iformall.douyin.pay.DouYinPayHelper; import com.iformall.douyin.pay.TtPayService; -import com.iformall.douyin.payv2.result.CreateOrderCallback; -import com.iformall.enums.*; -import com.iformall.interceptor.BodyReaderHttpServletRequestWrapper; +import com.iformall.enums.EnumPayStatus; import com.iformall.mq.MqBaseProducer; import com.iformall.service.*; import com.iformall.service.order.OrderFactory; diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/TtWebController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/TtWebController.java index 05d6cbcec..e3070ba11 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/TtWebController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/TtWebController.java @@ -7,11 +7,11 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.po.TtCouponChannelPoi; import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxCoupon; -import com.iformall.enums.EnumSpuSyncStatus; -import com.iformall.service.*; +import com.iformall.service.MailService; +import com.iformall.service.TtCouponGoodsService; +import com.iformall.service.WxAppinfoService; +import com.iformall.service.WxCouponService; import com.iformall.utils.DateUtils; -import com.iformall.utils.RedisCacheUtils; -import me.chanjar.weixin.common.util.crypto.SHA1; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -23,7 +23,6 @@ import javax.servlet.http.HttpServletRequest; import java.util.Date; import java.util.HashMap; import java.util.Map; -import java.util.concurrent.TimeUnit; @RestController diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxBusinessOrderController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxBusinessOrderController.java index 3b3153d86..f4d66a954 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxBusinessOrderController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxBusinessOrderController.java @@ -10,7 +10,9 @@ import com.github.binarywang.wxpay.service.WxPayService; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.*; import com.iformall.domain.po.base.TenantEntity; -import com.iformall.enums.*; +import com.iformall.enums.EnumAppPlat; +import com.iformall.enums.EnumBusinessCircleAuthorizeState; +import com.iformall.enums.EnumMemberCardStatus; import com.iformall.exception.MallinkException; import com.iformall.pay.WxPayConstant; import com.iformall.service.*; diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxMemberCardController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxMemberCardController.java index 960355cd5..ccb3f188b 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxMemberCardController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxMemberCardController.java @@ -15,7 +15,10 @@ import com.iformall.enums.EnumMemberCardActivateScene; import com.iformall.enums.EnumMemberCardStatus; import com.iformall.exception.MallinkException; import com.iformall.pay.WxPayConstant; -import com.iformall.service.*; +import com.iformall.service.WxAppinfoService; +import com.iformall.service.WxMallService; +import com.iformall.service.WxMemberCardService; +import com.iformall.service.WxPayAccountService; import com.iformall.utils.DateUtils; import com.iformall.utils.MaUtil; import org.apache.commons.lang3.StringUtils; diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxPayController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxPayController.java index 8814c4099..3f57c2101 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxPayController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxPayController.java @@ -3,7 +3,6 @@ package com.iformall.controller.callback; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.msg.FmInsideNotifyPaySuccessMsg; import com.iformall.domain.po.msg.FmInsideNotifyRefundSuccessMsg; import com.iformall.enums.*; import com.iformall.exception.BizMessageException; @@ -12,7 +11,6 @@ import com.iformall.mq.MqBaseProducer; import com.iformall.pay.WxPayment; import com.iformall.service.MailService; import com.iformall.service.WxPayOrderService; -import com.iformall.service.WxRefundOrderService; import com.iformall.service.WxSubsidyService; import com.iformall.utils.DateUtils; import com.iformall.utils.XmlUtil; @@ -29,10 +27,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - -import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.InputStream; import java.nio.charset.Charset; import java.util.*; diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarCYFCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarCYFCallBackController.java index fa21d847d..da58897b0 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarCYFCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarCYFCallBackController.java @@ -6,23 +6,14 @@ import com.github.pagehelper.PageInfo; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.*; import com.iformall.domain.vo.WxCarCYFVo; -import com.iformall.enums.EnumCarCmd; -import com.iformall.enums.EnumCarVendor; -import com.iformall.enums.EnumCouponSendSendType; -import com.iformall.enums.EnumPayVersion; -import com.iformall.enums.EnumPayWay; +import com.iformall.enums.*; import com.iformall.service.*; import com.iformall.service.park.impl.cyf.CYFUtil; import com.iformall.service.park.impl.tjd.TJDUtil; - import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import java.util.Date; import java.util.HashMap; diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarETCPCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarETCPCallBackController.java index 055e4a2d9..0c43bdadc 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarETCPCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarETCPCallBackController.java @@ -6,19 +6,11 @@ import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.*; -import com.iformall.enums.EnumCarCmd; -import com.iformall.enums.EnumCarVendor; -import com.iformall.enums.EnumCouponSendSendType; -import com.iformall.enums.EnumETCPCode; -import com.iformall.enums.EnumPayVersion; -import com.iformall.enums.EnumPayWay; -import com.iformall.exception.MallinkException; +import com.iformall.enums.*; import com.iformall.service.*; import com.iformall.service.park.impl.etcp.ETCPUtil; import com.iformall.service.park.utils.ParkCacheUtils; import com.iformall.utils.DateUtils; -import com.iformall.utils.RedisCacheUtils; - import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarTJDCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarTJDCallBackController.java index c0d346840..9dc0e20cb 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarTJDCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarTJDCallBackController.java @@ -4,15 +4,10 @@ import com.alibaba.fastjson.JSON; import com.github.pagehelper.PageInfo; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.*; -import com.iformall.enums.EnumCarCmd; -import com.iformall.enums.EnumCarVendor; -import com.iformall.enums.EnumCouponSendSendType; -import com.iformall.enums.EnumPayVersion; -import com.iformall.enums.EnumPayWay; +import com.iformall.enums.*; import com.iformall.service.*; import com.iformall.service.park.impl.tjd.TJDUtil; import com.iformall.utils.DateUtils; - import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -22,7 +17,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; import java.util.List; diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxParkCallBackBaseController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxParkCallBackBaseController.java index 3747d80ea..c556fc451 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxParkCallBackBaseController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxParkCallBackBaseController.java @@ -6,23 +6,13 @@ import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.*; -import com.iformall.enums.EnumCarCmd; -import com.iformall.enums.EnumCarVendor; -import com.iformall.enums.EnumCouponSendSendType; -import com.iformall.enums.EnumETCPCode; -import com.iformall.enums.EnumPayVersion; -import com.iformall.enums.EnumPayWay; +import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.service.*; import com.iformall.service.park.ParkFactory; import com.iformall.service.park.entity.ParkNotifyParam; -import com.iformall.service.park.impl.cyf.CYFUtil; -import com.iformall.service.park.impl.etcp.ETCPUtil; -import com.iformall.service.park.impl.tjd.TJDUtil; import com.iformall.service.park.utils.ParkCacheUtils; import com.iformall.utils.DateUtils; -import com.iformall.utils.RedisCacheUtils; - import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -30,17 +20,11 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; -import java.util.HashMap; import java.util.List; -import java.util.Map; @RestController public class WxParkCallBackBaseController extends BaseController { diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/cyf/WxCarCYFCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/cyf/WxCarCYFCallBackController.java index dec4c40e7..610686d7a 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/cyf/WxCarCYFCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/cyf/WxCarCYFCallBackController.java @@ -1,33 +1,19 @@ package com.iformall.controller.callback.car.cyf; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageInfo; import com.iformall.common.Result; -import com.iformall.controller.base.BaseController; import com.iformall.controller.callback.car.WxParkCallBackBaseController; -import com.iformall.domain.po.*; import com.iformall.domain.vo.WxCarCYFVo; import com.iformall.enums.EnumCarCmd; import com.iformall.enums.EnumCarVendor; -import com.iformall.enums.EnumCouponSendSendType; -import com.iformall.enums.EnumPayWay; import com.iformall.service.*; -import com.iformall.service.park.impl.cyf.CYFUtil; -import com.iformall.service.park.impl.tjd.TJDUtil; - import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.Date; -import java.util.HashMap; -import java.util.List; import java.util.Map; /** diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/dahua/WxCarDaHuaCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/dahua/WxCarDaHuaCallBackController.java index 96162141e..d508fc047 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/dahua/WxCarDaHuaCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/dahua/WxCarDaHuaCallBackController.java @@ -1,33 +1,17 @@ package com.iformall.controller.callback.car.dahua; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageInfo; import com.iformall.common.Result; -import com.iformall.controller.base.BaseController; import com.iformall.controller.callback.car.WxParkCallBackBaseController; -import com.iformall.domain.po.*; -import com.iformall.domain.vo.WxCarCYFVo; import com.iformall.enums.EnumCarCmd; import com.iformall.enums.EnumCarVendor; -import com.iformall.enums.EnumCouponSendSendType; -import com.iformall.enums.EnumPayWay; import com.iformall.service.*; -import com.iformall.service.park.impl.cyf.CYFUtil; -import com.iformall.service.park.impl.tjd.TJDUtil; - import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.Date; -import java.util.HashMap; -import java.util.List; import java.util.Map; /** diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/fute/WxCarFuteCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/fute/WxCarFuteCallBackController.java index 562b93676..3f96d397a 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/fute/WxCarFuteCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/fute/WxCarFuteCallBackController.java @@ -1,33 +1,17 @@ package com.iformall.controller.callback.car.fute; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageInfo; import com.iformall.common.Result; -import com.iformall.controller.base.BaseController; import com.iformall.controller.callback.car.WxParkCallBackBaseController; -import com.iformall.domain.po.*; -import com.iformall.domain.vo.WxCarCYFVo; import com.iformall.enums.EnumCarCmd; import com.iformall.enums.EnumCarVendor; -import com.iformall.enums.EnumCouponSendSendType; -import com.iformall.enums.EnumPayWay; import com.iformall.service.*; -import com.iformall.service.park.impl.cyf.CYFUtil; -import com.iformall.service.park.impl.tjd.TJDUtil; - import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.Date; -import java.util.HashMap; -import java.util.List; import java.util.Map; /** diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/haikangweishi/WxCarHaiKangWeiShiCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/haikangweishi/WxCarHaiKangWeiShiCallBackController.java index 72830465c..0acb1dce3 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/haikangweishi/WxCarHaiKangWeiShiCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/haikangweishi/WxCarHaiKangWeiShiCallBackController.java @@ -1,33 +1,18 @@ package com.iformall.controller.callback.car.haikangweishi; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageInfo; import com.iformall.common.Result; -import com.iformall.controller.base.BaseController; import com.iformall.controller.callback.car.WxParkCallBackBaseController; -import com.iformall.domain.po.*; -import com.iformall.domain.vo.WxCarCYFVo; import com.iformall.enums.EnumCarCmd; import com.iformall.enums.EnumCarVendor; -import com.iformall.enums.EnumCouponSendSendType; -import com.iformall.enums.EnumPayWay; import com.iformall.service.*; -import com.iformall.service.park.impl.cyf.CYFUtil; -import com.iformall.service.park.impl.tjd.TJDUtil; - import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.Date; import java.util.HashMap; -import java.util.List; import java.util.Map; /** diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunCallBackController.java index b1454a31f..e43d8bd8a 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunCallBackController.java @@ -1,33 +1,17 @@ package com.iformall.controller.callback.car.jieshun; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageInfo; import com.iformall.common.Result; -import com.iformall.controller.base.BaseController; import com.iformall.controller.callback.car.WxParkCallBackBaseController; -import com.iformall.domain.po.*; -import com.iformall.domain.vo.WxCarCYFVo; import com.iformall.enums.EnumCarCmd; import com.iformall.enums.EnumCarVendor; -import com.iformall.enums.EnumCouponSendSendType; -import com.iformall.enums.EnumPayWay; import com.iformall.service.*; -import com.iformall.service.park.impl.cyf.CYFUtil; -import com.iformall.service.park.impl.tjd.TJDUtil; - import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.Date; -import java.util.HashMap; -import java.util.List; import java.util.Map; /** diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunV2CallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunV2CallBackController.java index 387551485..5e873acd0 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunV2CallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunV2CallBackController.java @@ -1,33 +1,17 @@ package com.iformall.controller.callback.car.jieshun; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageInfo; import com.iformall.common.Result; -import com.iformall.controller.base.BaseController; import com.iformall.controller.callback.car.WxParkCallBackBaseController; -import com.iformall.domain.po.*; -import com.iformall.domain.vo.WxCarCYFVo; import com.iformall.enums.EnumCarCmd; import com.iformall.enums.EnumCarVendor; -import com.iformall.enums.EnumCouponSendSendType; -import com.iformall.enums.EnumPayWay; import com.iformall.service.*; -import com.iformall.service.park.impl.cyf.CYFUtil; -import com.iformall.service.park.impl.tjd.TJDUtil; - import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.Date; -import java.util.HashMap; -import java.util.List; import java.util.Map; /** diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/ketuo/WxCarKeTuoCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/ketuo/WxCarKeTuoCallBackController.java index b2e769722..79a2c180c 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/ketuo/WxCarKeTuoCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/ketuo/WxCarKeTuoCallBackController.java @@ -1,33 +1,17 @@ package com.iformall.controller.callback.car.ketuo; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageInfo; import com.iformall.common.Result; -import com.iformall.controller.base.BaseController; import com.iformall.controller.callback.car.WxParkCallBackBaseController; -import com.iformall.domain.po.*; -import com.iformall.domain.vo.WxCarCYFVo; import com.iformall.enums.EnumCarCmd; import com.iformall.enums.EnumCarVendor; -import com.iformall.enums.EnumCouponSendSendType; -import com.iformall.enums.EnumPayWay; import com.iformall.service.*; -import com.iformall.service.park.impl.cyf.CYFUtil; -import com.iformall.service.park.impl.tjd.TJDUtil; - import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.Date; -import java.util.HashMap; -import java.util.List; import java.util.Map; /** diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/lifang/WxCarLiFangCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/lifang/WxCarLiFangCallBackController.java index 89c2ab5bd..88f5d5ed2 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/lifang/WxCarLiFangCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/lifang/WxCarLiFangCallBackController.java @@ -1,33 +1,17 @@ package com.iformall.controller.callback.car.lifang; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageInfo; import com.iformall.common.Result; -import com.iformall.controller.base.BaseController; import com.iformall.controller.callback.car.WxParkCallBackBaseController; -import com.iformall.domain.po.*; -import com.iformall.domain.vo.WxCarCYFVo; import com.iformall.enums.EnumCarCmd; import com.iformall.enums.EnumCarVendor; -import com.iformall.enums.EnumCouponSendSendType; -import com.iformall.enums.EnumPayWay; import com.iformall.service.*; -import com.iformall.service.park.impl.cyf.CYFUtil; -import com.iformall.service.park.impl.tjd.TJDUtil; - import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.Date; -import java.util.HashMap; -import java.util.List; import java.util.Map; /** diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/pay/WxCarPaidCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/pay/WxCarPaidCallBackController.java index afb19b7ef..ce7b1881f 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/pay/WxCarPaidCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/pay/WxCarPaidCallBackController.java @@ -1,57 +1,31 @@ package com.iformall.controller.callback.car.pay; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageInfo; -import com.iformall.common.Result; -import com.iformall.controller.base.BaseController; import com.iformall.controller.callback.car.WxParkCallBackBaseController; -import com.iformall.domain.po.*; import com.iformall.domain.po.msg.FmInsideNotifyCarPaidSuccessMsg; -import com.iformall.domain.po.msg.FmInsideNotifyRefundSuccessMsg; -import com.iformall.domain.vo.WxCarCYFVo; -import com.iformall.enums.EnumCarCmd; -import com.iformall.enums.EnumCarVendor; -import com.iformall.enums.EnumCouponSendSendType; -import com.iformall.enums.EnumMsgMqKey; -import com.iformall.enums.EnumMsgMqTag; -import com.iformall.enums.EnumMsgMqTopic; -import com.iformall.enums.EnumMsgRecordType; -import com.iformall.enums.EnumPayVersion; -import com.iformall.enums.EnumPayWay; +import com.iformall.enums.*; import com.iformall.exception.BizMessageException; import com.iformall.exception.MallinkException; import com.iformall.mq.MqBaseProducer; import com.iformall.pay.WxPayment; import com.iformall.service.*; -import com.iformall.service.park.impl.cyf.CYFUtil; -import com.iformall.service.park.impl.tjd.TJDUtil; import com.iformall.service.park.pay.WxParkPayService; import com.iformall.utils.XmlUtil; - import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletRequest; import java.nio.charset.Charset; -import java.util.Date; -import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.SortedMap; import java.util.TreeMap; -import javax.servlet.http.HttpServletRequest; - /** * @author: furunxin * @Date: 2020/7/6 15:29 diff --git a/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java b/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java index 497cb5623..223caf8b0 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java @@ -12,7 +12,6 @@ import com.iformall.enums.EnumBoxOnlineStatus; import com.iformall.enums.EnumBoxRegisterStatus; import com.iformall.service.kw.KwBoxCmdHistoryService; import com.iformall.service.kw.KwBoxService; - import com.iformall.utils.Utility; import io.netty.util.internal.StringUtil; import io.swagger.annotations.Api; diff --git a/mallinkCallback/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java b/mallinkCallback/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java index aebf7d874..a04274158 100644 --- a/mallinkCallback/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java +++ b/mallinkCallback/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java @@ -6,9 +6,7 @@ import org.slf4j.LoggerFactory; import javax.servlet.*; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.Arrays; public class HttpServletRequestWrapperFilter implements Filter { private static final Logger logger = LoggerFactory.getLogger(HttpServletRequestWrapperFilter.class); diff --git a/mallinkCallback/src/main/java/com/iformall/interceptor/RequestInterceptor.java b/mallinkCallback/src/main/java/com/iformall/interceptor/RequestInterceptor.java index d7b493d12..f9c9ff048 100644 --- a/mallinkCallback/src/main/java/com/iformall/interceptor/RequestInterceptor.java +++ b/mallinkCallback/src/main/java/com/iformall/interceptor/RequestInterceptor.java @@ -25,7 +25,6 @@ import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.nio.charset.Charset; import java.util.Enumeration; -import java.util.concurrent.TimeUnit; /** * 幂等检查 diff --git a/mallinkMQConsumer/src/main/java/com/iformall/ConsumerApplication.java b/mallinkMQConsumer/src/main/java/com/iformall/ConsumerApplication.java index 656995efe..f424fef9c 100644 --- a/mallinkMQConsumer/src/main/java/com/iformall/ConsumerApplication.java +++ b/mallinkMQConsumer/src/main/java/com/iformall/ConsumerApplication.java @@ -9,7 +9,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.EnableAspectJAutoProxy; - import springfox.documentation.swagger2.annotations.EnableSwagger2; /** diff --git a/mallinkMQConsumer/src/main/java/com/iformall/config/MyBatisConfiguration.java b/mallinkMQConsumer/src/main/java/com/iformall/config/MyBatisConfiguration.java index 1e0caaa53..f380f6aa2 100644 --- a/mallinkMQConsumer/src/main/java/com/iformall/config/MyBatisConfiguration.java +++ b/mallinkMQConsumer/src/main/java/com/iformall/config/MyBatisConfiguration.java @@ -2,15 +2,12 @@ package com.iformall.config; import com.iformall.plugin.MyBatisItercepters; import com.iformall.plugin.MyBatisPlus; -import com.iformall.plugin.shard.impl.EnumShardingRule; -import com.iformall.plugin.shard.impl.ShardingSphere; -import com.iformall.plugin.shard.plugin.ShardingSpherePlugin; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.transaction.annotation.EnableTransactionManagement; + import java.util.ArrayList; import java.util.List; -import java.util.Properties; @EnableTransactionManagement @Configuration diff --git a/mallinkMQConsumer/src/main/java/com/iformall/controller/HomeController.java b/mallinkMQConsumer/src/main/java/com/iformall/controller/HomeController.java index 1563e7a7d..0387bbb62 100644 --- a/mallinkMQConsumer/src/main/java/com/iformall/controller/HomeController.java +++ b/mallinkMQConsumer/src/main/java/com/iformall/controller/HomeController.java @@ -1,19 +1,10 @@ package com.iformall.controller; -import com.alibaba.fastjson.JSON; import com.iformall.common.ResultData; -import com.iformall.domain.po.base.TenantEntity; -import com.iformall.enums.EnumPayWay; -import com.iformall.pay.WxPayment; -import com.iformall.service.WxCashOutService; import com.iformall.service.WxRefundOrderService; import com.iformall.service.park.pay.WxParkPayService; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; - -import java.util.Map; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java b/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java index 8c9e2f298..da24215e8 100644 --- a/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java +++ b/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java @@ -1,7 +1,7 @@ package com.iformall.mq; import com.iformall.domain.po.msg.*; -import com.iformall.enums.*; +import com.iformall.enums.EnumMsgRecordType; import com.iformall.mapper.WxMsgRecordMapper; import com.iformall.service.msg.impl.*; import com.iformall.utils.JsonUtil; diff --git a/mallinkMQConsumer/src/main/java/com/iformall/mq/impl/AliyunRocketMqConsumer.java b/mallinkMQConsumer/src/main/java/com/iformall/mq/impl/AliyunRocketMqConsumer.java index f74666ca1..7c230a5be 100644 --- a/mallinkMQConsumer/src/main/java/com/iformall/mq/impl/AliyunRocketMqConsumer.java +++ b/mallinkMQConsumer/src/main/java/com/iformall/mq/impl/AliyunRocketMqConsumer.java @@ -1,28 +1,17 @@ package com.iformall.mq.impl; -import java.util.Properties; - -import javax.annotation.PostConstruct; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Profile; -import org.springframework.stereotype.Service; - import com.alibaba.fastjson.JSON; -import com.aliyun.openservices.ons.api.Action; -import com.aliyun.openservices.ons.api.ConsumeContext; -import com.aliyun.openservices.ons.api.Consumer; -import com.aliyun.openservices.ons.api.Message; -import com.aliyun.openservices.ons.api.MessageListener; -import com.aliyun.openservices.ons.api.ONSFactory; -import com.aliyun.openservices.ons.api.PropertyKeyConst; -import com.aliyun.openservices.ons.api.bean.ConsumerBean; +import com.aliyun.openservices.ons.api.*; import com.iformall.enums.EnumMsgMqTopic; import com.iformall.mq.MQConfig; import com.iformall.mq.MqBaseConsumer; -import com.iformall.utils.JsonUtil; - import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Profile; +import org.springframework.stereotype.Service; + +import javax.annotation.PostConstruct; +import java.util.Properties; @Slf4j @Service diff --git a/mallinkMQConsumer/src/main/java/com/iformall/mq/impl/RabbitMqConsumer.java b/mallinkMQConsumer/src/main/java/com/iformall/mq/impl/RabbitMqConsumer.java index d81e189c1..ee3a5b7c1 100644 --- a/mallinkMQConsumer/src/main/java/com/iformall/mq/impl/RabbitMqConsumer.java +++ b/mallinkMQConsumer/src/main/java/com/iformall/mq/impl/RabbitMqConsumer.java @@ -1,8 +1,8 @@ package com.iformall.mq.impl; -import com.iformall.mq.MqBaseConsumer; import com.iformall.enums.EnumMsgMqTopic; import com.iformall.mq.MQConfig; +import com.iformall.mq.MqBaseConsumer; import org.springframework.amqp.core.*; import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mallinkMQConsumer/src/main/java/com/iformall/mq/impl/RocketMqConsumer.java b/mallinkMQConsumer/src/main/java/com/iformall/mq/impl/RocketMqConsumer.java index ee1d0681d..d2a414b62 100644 --- a/mallinkMQConsumer/src/main/java/com/iformall/mq/impl/RocketMqConsumer.java +++ b/mallinkMQConsumer/src/main/java/com/iformall/mq/impl/RocketMqConsumer.java @@ -1,7 +1,7 @@ package com.iformall.mq.impl; -import com.iformall.mq.MqBaseConsumer; import com.iformall.mq.MQConfig; +import com.iformall.mq.MqBaseConsumer; import lombok.extern.slf4j.Slf4j; import org.rocketmq.starter.annotation.RocketMQListener; import org.rocketmq.starter.annotation.RocketMQMessage; diff --git a/mallinkNeuPosAdmin/src/main/java/com/iformall/NeuPosAdminApplication.java b/mallinkNeuPosAdmin/src/main/java/com/iformall/NeuPosAdminApplication.java index 405397ab8..6e56d88a9 100644 --- a/mallinkNeuPosAdmin/src/main/java/com/iformall/NeuPosAdminApplication.java +++ b/mallinkNeuPosAdmin/src/main/java/com/iformall/NeuPosAdminApplication.java @@ -1,5 +1,6 @@ package com.iformall; +import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; import org.mybatis.spring.annotation.MapperScan; import org.rocketmq.starter.annotation.EnableRocketMQ; import org.springframework.beans.factory.annotation.Value; @@ -8,8 +9,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.EnableAspectJAutoProxy; -import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; - /** * @author chenkx * @date 2017-12-26 diff --git a/mallinkNeuPosAdmin/src/main/java/com/iformall/config/RedisConfig.java b/mallinkNeuPosAdmin/src/main/java/com/iformall/config/RedisConfig.java index 02e61114a..3266ae294 100644 --- a/mallinkNeuPosAdmin/src/main/java/com/iformall/config/RedisConfig.java +++ b/mallinkNeuPosAdmin/src/main/java/com/iformall/config/RedisConfig.java @@ -27,7 +27,6 @@ import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer; import org.springframework.data.redis.serializer.StringRedisSerializer; import java.time.Duration; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/BaseController.java b/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/BaseController.java index 47aee76e7..4a13df5ca 100644 --- a/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/BaseController.java @@ -1,26 +1,5 @@ package com.iformall.controller; -import cn.binarywang.wx.miniapp.api.WxMaService; -import com.iformall.common.ErrorCode; -import com.iformall.common.IdWorker; -import com.iformall.domain.po.WxCUserBasicChild; -import com.iformall.domain.po.base.BaseCUserEntity; -import com.iformall.domain.po.base.TenantEntity; -import com.iformall.domain.po.WxAppinfo; -import com.iformall.domain.po.WxCUser; -import com.iformall.domain.po.WxCUserBasicInfo; -import com.iformall.exception.MallinkException; -import com.iformall.service.CUserTokenService; -import com.iformall.service.WxAppinfoService; -import com.iformall.service.WxCUserBasicChildService; -import com.iformall.service.WxCUserBasicInfoService; -import com.iformall.service.wechat.FmOpenService; -import com.iformall.utils.Constant; -import com.iformall.utils.IPUtil; -import com.iformall.utils.MaUtil; -import com.iformall.utils.RedisCacheUtils; - -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -29,15 +8,11 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.InitBinder; import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; -import javax.servlet.http.HttpServletRequest; import java.beans.PropertyEditorSupport; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; -import java.util.List; @RestController public class BaseController { diff --git a/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java b/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java index 5c71c2ce8..1e2be7f5e 100644 --- a/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java +++ b/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java @@ -6,15 +6,10 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.dto.NeuPosUpdatePayDto; import com.iformall.domain.po.NeuPosOrderMasterExt; -import com.iformall.domain.po.WxActivity; -import com.iformall.domain.po.WxMallApply; import com.iformall.domain.vo.NeuPosOrderDataBVo; import com.iformall.domain.vo.NeuPosSumDataBVo; -import com.iformall.domain.vo.WxCouponOrderBVo; -import com.iformall.enums.EnumCouponOrderStatus; import com.iformall.service.NeuPosOrderService; import com.iformall.utils.DateUtils; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -22,20 +17,14 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** * @author gongbiao */ diff --git a/mallinkNeuPosAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java b/mallinkNeuPosAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java index ff7e81880..8778c394a 100644 --- a/mallinkNeuPosAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java +++ b/mallinkNeuPosAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java @@ -25,7 +25,6 @@ import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.nio.charset.Charset; import java.util.Enumeration; -import java.util.concurrent.TimeUnit; /** * 幂等检查 diff --git a/mallinkNeuPosAdmin/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java b/mallinkNeuPosAdmin/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java index db7f5b15a..783e22049 100644 --- a/mallinkNeuPosAdmin/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java +++ b/mallinkNeuPosAdmin/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java @@ -1,17 +1,13 @@ package com.iformall.resolver; import com.iformall.annotation.LoginUser; -import com.iformall.domain.po.WxCUserBasicInfo; import com.iformall.domain.po.base.BaseCUserEntity; -import com.iformall.service.CUserTokenService; import com.iformall.service.WxCUserBasicInfoService; -import com.iformall.utils.Constant; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.MethodParameter; import org.springframework.stereotype.Component; import org.springframework.web.bind.support.WebDataBinderFactory; import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.method.support.ModelAndViewContainer; diff --git a/mallinkNeuPosAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkNeuPosAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 8032f90df..37820edc9 100644 --- a/mallinkNeuPosAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkNeuPosAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -2,18 +2,13 @@ package com.iformall.tenant; import com.iformall.common.TenantThreadLocal; import com.iformall.plugin.autoTenantId.TenantInfo; -import com.iformall.utils.Constant; import org.apache.ibatis.mapping.MappedStatement; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; import java.util.Arrays; import java.util.List; -import javax.servlet.http.HttpServletRequest; - public class TenantInfoImpl implements TenantInfo { private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/mallinkNeuPosAdmin/src/main/java/com/iformall/utils/ImgIdeaUtil.java b/mallinkNeuPosAdmin/src/main/java/com/iformall/utils/ImgIdeaUtil.java index 16ebb8d46..2a65c07d9 100644 --- a/mallinkNeuPosAdmin/src/main/java/com/iformall/utils/ImgIdeaUtil.java +++ b/mallinkNeuPosAdmin/src/main/java/com/iformall/utils/ImgIdeaUtil.java @@ -14,9 +14,7 @@ import org.springframework.util.ResourceUtils; import javax.imageio.ImageIO; import java.awt.*; import java.awt.image.BufferedImage; -import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.File; import java.io.InputStream; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; diff --git a/mallinkOcr/src/main/java/com/iformall/ocr/FormallTess4j.java b/mallinkOcr/src/main/java/com/iformall/ocr/FormallTess4j.java index d5912dfb7..978e2f993 100644 --- a/mallinkOcr/src/main/java/com/iformall/ocr/FormallTess4j.java +++ b/mallinkOcr/src/main/java/com/iformall/ocr/FormallTess4j.java @@ -1,35 +1,16 @@ package com.iformall.ocr; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.MalformedURLException; -import java.net.URISyntaxException; -import java.net.URL; -import java.net.URLConnection; - import com.baomidou.mybatisplus.core.toolkit.IdWorker; -import com.recognition.software.jdeskew.ImageDeskew; -import net.sourceforge.tess4j.ITessAPI.TessPageIteratorLevel; import net.sourceforge.tess4j.ITesseract; -import net.sourceforge.tess4j.ITesseract.RenderedFormat; import net.sourceforge.tess4j.Tesseract; -import net.sourceforge.tess4j.Word; -import net.sourceforge.tess4j.util.ImageHelper; import net.sourceforge.tess4j.util.LoggHelper; -import net.sourceforge.tess4j.util.Utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.imageio.ImageIO; -import java.awt.*; -import java.awt.image.BufferedImage; -import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; +import java.io.*; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLConnection; /** * https://www.cnblogs.com/pejsidney/p/9487881.html diff --git a/mallinkOcr/src/main/java/com/iformall/ocr/FormallTess4jTrain.java b/mallinkOcr/src/main/java/com/iformall/ocr/FormallTess4jTrain.java index d2006fd4c..58cdbf4c3 100644 --- a/mallinkOcr/src/main/java/com/iformall/ocr/FormallTess4jTrain.java +++ b/mallinkOcr/src/main/java/com/iformall/ocr/FormallTess4jTrain.java @@ -1,12 +1,5 @@ package com.iformall.ocr; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.LineNumberReader; - /** * 训练 * @author iformall diff --git a/mallinkPosApi/src/main/java/com/iformall/config/MyBatisConfiguration.java b/mallinkPosApi/src/main/java/com/iformall/config/MyBatisConfiguration.java index 1e0caaa53..f380f6aa2 100644 --- a/mallinkPosApi/src/main/java/com/iformall/config/MyBatisConfiguration.java +++ b/mallinkPosApi/src/main/java/com/iformall/config/MyBatisConfiguration.java @@ -2,15 +2,12 @@ package com.iformall.config; import com.iformall.plugin.MyBatisItercepters; import com.iformall.plugin.MyBatisPlus; -import com.iformall.plugin.shard.impl.EnumShardingRule; -import com.iformall.plugin.shard.impl.ShardingSphere; -import com.iformall.plugin.shard.plugin.ShardingSpherePlugin; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.transaction.annotation.EnableTransactionManagement; + import java.util.ArrayList; import java.util.List; -import java.util.Properties; @EnableTransactionManagement @Configuration diff --git a/mallinkPosApi/src/main/java/com/iformall/config/WebMvcConfig.java b/mallinkPosApi/src/main/java/com/iformall/config/WebMvcConfig.java index d7ea2644e..038696265 100644 --- a/mallinkPosApi/src/main/java/com/iformall/config/WebMvcConfig.java +++ b/mallinkPosApi/src/main/java/com/iformall/config/WebMvcConfig.java @@ -9,7 +9,10 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import org.springframework.context.annotation.Configuration; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; -import org.springframework.web.servlet.config.annotation.*; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.EnableWebMvc; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/mallinkPosApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkPosApi/src/main/java/com/iformall/controller/BaseController.java index 018a5b523..dea014be9 100644 --- a/mallinkPosApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkPosApi/src/main/java/com/iformall/controller/BaseController.java @@ -1,12 +1,5 @@ package com.iformall.controller; -import java.beans.PropertyEditorSupport; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; - -import cn.binarywang.wx.miniapp.api.WxMaService; -import com.iformall.domain.po.WxAppinfo; import com.iformall.service.WxAppinfoService; import com.iformall.service.wechat.FmOpenService; import com.iformall.utils.IPUtil; @@ -19,6 +12,10 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; +import java.beans.PropertyEditorSupport; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; @RestController public class BaseController { diff --git a/mallinkPosApi/src/main/java/com/iformall/controller/PosController.java b/mallinkPosApi/src/main/java/com/iformall/controller/PosController.java index 3188c2903..2ab6e4621 100644 --- a/mallinkPosApi/src/main/java/com/iformall/controller/PosController.java +++ b/mallinkPosApi/src/main/java/com/iformall/controller/PosController.java @@ -4,12 +4,14 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; -import com.iformall.domain.po.*; -import com.iformall.enums.*; +import com.iformall.domain.po.ThDevInfo; +import com.iformall.enums.EnumEnableType; import com.iformall.exception.MallinkException; import com.iformall.pay.WxPayConstant; import com.iformall.pay.WxPayment; -import com.iformall.service.*; +import com.iformall.service.PosService; +import com.iformall.service.ThDevInfoService; +import com.iformall.service.WxCouponOrderService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; @@ -21,7 +23,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.HashMap; +import java.util.Map; @RestController @AllArgsConstructor diff --git a/mallinkPosApi/src/main/java/com/iformall/log/SystemLogAspect.java b/mallinkPosApi/src/main/java/com/iformall/log/SystemLogAspect.java index cbdabd81a..ec55ee235 100644 --- a/mallinkPosApi/src/main/java/com/iformall/log/SystemLogAspect.java +++ b/mallinkPosApi/src/main/java/com/iformall/log/SystemLogAspect.java @@ -3,11 +3,12 @@ package com.iformall.log; import com.alibaba.fastjson.JSON; import com.iformall.domain.po.PosActionLog; -import com.iformall.pay.WxPayConstant; import com.iformall.service.PosActionLogService; import com.iformall.utils.IPUtil; import org.aspectj.lang.ProceedingJoinPoint; -import org.aspectj.lang.annotation.*; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Pointcut; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -16,8 +17,6 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; -import java.util.HashMap; -import java.util.Map; @Aspect @Component diff --git a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java index 9b73b6cdd..60860de31 100644 --- a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java +++ b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java @@ -16,7 +16,6 @@ import com.iformall.exception.MallinkException; import com.iformall.mapper.*; import com.iformall.pay.WxPayConstant; import com.iformall.service.*; -import io.swagger.models.auth.In; import lombok.AllArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -27,7 +26,10 @@ import org.springframework.web.bind.annotation.RequestBody; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service @AllArgsConstructor diff --git a/mallinkPublicApi/src/main/java/com/iformall/PublicApiApplication.java b/mallinkPublicApi/src/main/java/com/iformall/PublicApiApplication.java index 2c4025e25..263627979 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/PublicApiApplication.java +++ b/mallinkPublicApi/src/main/java/com/iformall/PublicApiApplication.java @@ -1,5 +1,6 @@ package com.iformall; +import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; import org.mybatis.spring.annotation.MapperScan; import org.rocketmq.starter.annotation.EnableRocketMQ; import org.springframework.beans.factory.annotation.Value; @@ -8,8 +9,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.EnableAspectJAutoProxy; -import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; - /** * @author chenkx * @date 2017-12-26 diff --git a/mallinkPublicApi/src/main/java/com/iformall/aop/RedisCacheAspect.java b/mallinkPublicApi/src/main/java/com/iformall/aop/RedisCacheAspect.java index f001c7912..ecc62f784 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/aop/RedisCacheAspect.java +++ b/mallinkPublicApi/src/main/java/com/iformall/aop/RedisCacheAspect.java @@ -3,10 +3,7 @@ package com.iformall.aop; import com.alibaba.fastjson.JSONObject; import com.iformall.annotation.RedisCache; -import com.iformall.common.ErrorCode; -import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.base.BaseCUserEntity; -import com.iformall.exception.MallinkException; import com.iformall.service.CUserTokenService; import com.iformall.utils.HashUtil; import com.iformall.utils.RedisLock; diff --git a/mallinkPublicApi/src/main/java/com/iformall/config/MyBatisConfiguration.java b/mallinkPublicApi/src/main/java/com/iformall/config/MyBatisConfiguration.java index f58a1dd3b..7b2158423 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/config/MyBatisConfiguration.java +++ b/mallinkPublicApi/src/main/java/com/iformall/config/MyBatisConfiguration.java @@ -2,13 +2,12 @@ package com.iformall.config; import com.iformall.plugin.MyBatisItercepters; import com.iformall.plugin.MyBatisPlus; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import java.util.ArrayList; import java.util.List; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - @Configuration public class MyBatisConfiguration extends BaseMyBatisConfiguration { diff --git a/mallinkPublicApi/src/main/java/com/iformall/config/RedisConfig.java b/mallinkPublicApi/src/main/java/com/iformall/config/RedisConfig.java index 02e61114a..3266ae294 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/config/RedisConfig.java +++ b/mallinkPublicApi/src/main/java/com/iformall/config/RedisConfig.java @@ -27,7 +27,6 @@ import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer; import org.springframework.data.redis.serializer.StringRedisSerializer; import java.time.Duration; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/mallinkPublicApi/src/main/java/com/iformall/config/WebMvcConfig.java b/mallinkPublicApi/src/main/java/com/iformall/config/WebMvcConfig.java index de640f6e5..1a254475f 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/config/WebMvcConfig.java +++ b/mallinkPublicApi/src/main/java/com/iformall/config/WebMvcConfig.java @@ -15,11 +15,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; -import org.springframework.web.filter.CharacterEncodingFilter; -import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.servlet.config.annotation.*; -import javax.servlet.Filter; import java.math.BigDecimal; import java.math.BigInteger; import java.text.SimpleDateFormat; diff --git a/mallinkPublicApi/src/main/java/com/iformall/controller/UserBasicInfoController.java b/mallinkPublicApi/src/main/java/com/iformall/controller/UserBasicInfoController.java index 3a3b73e09..5857a929e 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/controller/UserBasicInfoController.java +++ b/mallinkPublicApi/src/main/java/com/iformall/controller/UserBasicInfoController.java @@ -12,12 +12,14 @@ import com.iformall.service.WxCUserService; import com.iformall.service.WxLevelConfigService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; - import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; import java.util.Map; diff --git a/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java b/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java index ad2aba4c8..4e0289041 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java +++ b/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java @@ -5,7 +5,6 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.AliBusinessCircleOrder; import com.iformall.domain.po.WxBusinessCircleOrder; import com.iformall.domain.po.WxThirdPartyOrders; -import com.iformall.enums.EnumThirdOrderType; import com.iformall.enums.EnumUserType; import com.iformall.exception.MallinkException; import com.iformall.service.AliBusinessCircleOrderService; diff --git a/mallinkPublicApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java b/mallinkPublicApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java index 165443ada..7d28da49c 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java +++ b/mallinkPublicApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java @@ -7,7 +7,6 @@ import com.iformall.exception.MallinkException; import com.iformall.service.WxThirdPartyApiService; import com.iformall.utils.Constant; import com.iformall.utils.RedisCacheUtils; - import com.iformall.utils.sign.SignUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -20,7 +19,7 @@ import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.Map; /** * 权限(Token)验证 diff --git a/mallinkPublicApi/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java b/mallinkPublicApi/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java index 19be5e6a7..ec4e7cb7d 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java +++ b/mallinkPublicApi/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java @@ -6,7 +6,6 @@ import org.slf4j.LoggerFactory; import javax.servlet.*; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; public class HttpServletRequestWrapperFilter implements Filter { diff --git a/mallinkPublicApi/src/main/java/com/iformall/interceptor/RequestInterceptor.java b/mallinkPublicApi/src/main/java/com/iformall/interceptor/RequestInterceptor.java index ff7e81880..8778c394a 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/interceptor/RequestInterceptor.java +++ b/mallinkPublicApi/src/main/java/com/iformall/interceptor/RequestInterceptor.java @@ -25,7 +25,6 @@ import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.nio.charset.Charset; import java.util.Enumeration; -import java.util.concurrent.TimeUnit; /** * 幂等检查 diff --git a/mallinkPublicApi/src/main/java/com/iformall/interceptor/WebLogAspect.java b/mallinkPublicApi/src/main/java/com/iformall/interceptor/WebLogAspect.java index c66aeef83..b1aafc33c 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/interceptor/WebLogAspect.java +++ b/mallinkPublicApi/src/main/java/com/iformall/interceptor/WebLogAspect.java @@ -14,7 +14,6 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; -import java.util.Arrays; @Aspect @Component diff --git a/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java b/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java index c1ce3f0f2..b0009bc0a 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java +++ b/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java @@ -1,14 +1,6 @@ package com.iformall.utils; -import com.alibaba.fastjson.JSON; -import com.iformall.common.IdWorker; -import com.iformall.enums.EnumUserType; import com.iformall.utils.sign.AppUtils; -import com.iformall.utils.sign.SignUtils; - -import java.util.Date; -import java.util.HashMap; -import java.util.Map; /** * @author gongbiao diff --git a/mallinkSchedule/src/main/java/com/iformall/ScheduleApplication.java b/mallinkSchedule/src/main/java/com/iformall/ScheduleApplication.java index e1a800de0..a3ac148ba 100644 --- a/mallinkSchedule/src/main/java/com/iformall/ScheduleApplication.java +++ b/mallinkSchedule/src/main/java/com/iformall/ScheduleApplication.java @@ -10,7 +10,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; - import springfox.documentation.swagger2.annotations.EnableSwagger2; /** diff --git a/mallinkSchedule/src/main/java/com/iformall/config/MyBatisConfiguration.java b/mallinkSchedule/src/main/java/com/iformall/config/MyBatisConfiguration.java index cffaca7ef..f380f6aa2 100644 --- a/mallinkSchedule/src/main/java/com/iformall/config/MyBatisConfiguration.java +++ b/mallinkSchedule/src/main/java/com/iformall/config/MyBatisConfiguration.java @@ -2,15 +2,13 @@ package com.iformall.config; import com.iformall.plugin.MyBatisItercepters; import com.iformall.plugin.MyBatisPlus; -import com.iformall.plugin.shard.plugin.ShardingSpherePlugin; - -import java.util.ArrayList; -import java.util.List; - import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.transaction.annotation.EnableTransactionManagement; +import java.util.ArrayList; +import java.util.List; + @EnableTransactionManagement @Configuration public class MyBatisConfiguration extends BaseMyBatisConfiguration { diff --git a/mallinkSchedule/src/main/java/com/iformall/config/RestFilter.java b/mallinkSchedule/src/main/java/com/iformall/config/RestFilter.java index 4f9298433..b5d331492 100644 --- a/mallinkSchedule/src/main/java/com/iformall/config/RestFilter.java +++ b/mallinkSchedule/src/main/java/com/iformall/config/RestFilter.java @@ -1,16 +1,10 @@ package com.iformall.config; -import java.io.IOException; -import java.util.Optional; - -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import javax.servlet.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.Optional; /** * 前后端分离RESTful接口过滤器 diff --git a/mallinkSchedule/src/main/java/com/iformall/config/SchedulingConfig.java b/mallinkSchedule/src/main/java/com/iformall/config/SchedulingConfig.java index 3ff83b3dc..0cdf8b579 100644 --- a/mallinkSchedule/src/main/java/com/iformall/config/SchedulingConfig.java +++ b/mallinkSchedule/src/main/java/com/iformall/config/SchedulingConfig.java @@ -1,11 +1,5 @@ package com.iformall.config; -import org.springframework.context.annotation.Configuration; -import org.springframework.scheduling.annotation.EnableScheduling; -import org.springframework.scheduling.annotation.SchedulingConfigurer; -import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; -import org.springframework.scheduling.config.ScheduledTaskRegistrar; - //@Configuration //@EnableScheduling //public class SchedulingConfig implements SchedulingConfigurer { diff --git a/mallinkSchedule/src/main/java/com/iformall/controller/HomeController.java b/mallinkSchedule/src/main/java/com/iformall/controller/HomeController.java index ecfc89b22..009cb0e15 100644 --- a/mallinkSchedule/src/main/java/com/iformall/controller/HomeController.java +++ b/mallinkSchedule/src/main/java/com/iformall/controller/HomeController.java @@ -3,7 +3,6 @@ package com.iformall.controller; import com.iformall.common.ResultData; import com.iformall.domain.po.msg.WxMsgRecord; import com.iformall.mq.MqBaseProducer; -import com.iformall.mq.impl.RabbitMqMessageProducer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; diff --git a/mallinkSchedule/src/main/java/com/iformall/controller/UserTagsController.java b/mallinkSchedule/src/main/java/com/iformall/controller/UserTagsController.java index e33c7ecb1..48008caad 100644 --- a/mallinkSchedule/src/main/java/com/iformall/controller/UserTagsController.java +++ b/mallinkSchedule/src/main/java/com/iformall/controller/UserTagsController.java @@ -1,21 +1,11 @@ package com.iformall.controller; -import com.github.pagehelper.PageInfo; -import com.iformall.common.ResultData; -import com.iformall.domain.po.WxCUserBasicInfo; -import com.iformall.domain.po.msg.WxMsgRecord; -import com.iformall.enums.EnumAssignTagsTrigger; -import com.iformall.mq.MqBaseProducer; -import com.iformall.mq.impl.RabbitMqMessageProducer; import com.iformall.service.WxCUserBasicInfoService; import com.iformall.service.WxCUserTagsService; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java index e23f320aa..cc027e3c5 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java @@ -1,9 +1,7 @@ package com.iformall.schedule; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iformall.domain.po.WxActivity; import com.iformall.domain.po.WxActivityJoin; -import com.iformall.domain.po.WxCampaign; import com.iformall.domain.po.msg.WxMsgRecord; import com.iformall.enums.*; import com.iformall.mapper.WxActivityJoinMapper; @@ -20,7 +18,6 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java index f7e0a4327..d73f54e3c 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java @@ -1,7 +1,6 @@ package com.iformall.schedule; import com.alibaba.fastjson.JSONObject; -import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.WxMsgRecord; import com.iformall.enums.*; import com.iformall.mapper.WxBillAllMapper; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/BillSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/BillSchedule.java index 973023a11..64fadd8aa 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/BillSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/BillSchedule.java @@ -1,7 +1,6 @@ package com.iformall.schedule; import com.iformall.domain.vo.WxBillAll; -import com.iformall.mapper.WxBillAllMapper; import com.iformall.mapper.WxBillSettleScheduleMapper; import com.iformall.service.WxBillAllService; import org.slf4j.Logger; @@ -10,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; + import java.util.List; @Component diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CarPaidNotifySchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CarPaidNotifySchedule.java index 5e2122b22..d80f17e77 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CarPaidNotifySchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CarPaidNotifySchedule.java @@ -1,28 +1,15 @@ package com.iformall.schedule; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.iformall.domain.po.WxActivity; -import com.iformall.domain.po.WxActivityJoin; -import com.iformall.domain.po.WxCampaign; import com.iformall.domain.po.WxCarPayOrder; import com.iformall.domain.po.WxMall; import com.iformall.domain.po.WxPark; import com.iformall.domain.po.base.TenantEntity; -import com.iformall.domain.po.msg.WxMsgRecord; -import com.iformall.enums.*; -import com.iformall.mapper.WxActivityJoinMapper; -import com.iformall.mapper.WxActivityMapper; -import com.iformall.mapper.WxCampaignMapper; +import com.iformall.enums.EnumYesOrNo; import com.iformall.mapper.WxCarPayOrderMapper; import com.iformall.mapper.WxMallMapper; -import com.iformall.mq.MqBaseProducer; import com.iformall.service.WxParkService; import com.iformall.service.park.ParkFactory; -import com.iformall.service.park.entity.ParkCreatePayOrder; import com.iformall.service.park.entity.ParkNotifyPaid; -import com.iformall.utils.DateUtils; -import org.apache.commons.collections.map.HashedMap; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -30,10 +17,8 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Map; /** * @author gongbiao diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CashOutSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CashOutSchedule.java index 17a2411a2..e1880e39c 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CashOutSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CashOutSchedule.java @@ -1,24 +1,15 @@ package com.iformall.schedule; -import com.iformall.domain.po.WxAppinfo; -import com.iformall.domain.po.WxCashOut; -import com.iformall.domain.po.WxCouponChannel; -import com.iformall.domain.po.WxCouponOrder; -import com.iformall.domain.po.WxGame; -import com.iformall.domain.po.WxMall; -import com.iformall.domain.po.WxMerchant; -import com.iformall.domain.po.WxPayAccount; +import com.iformall.domain.po.*; import com.iformall.enums.EnumCashOutStatus; -import com.iformall.enums.EnumCouponChannelStatus; -import com.iformall.enums.EnumCouponChannelType; -import com.iformall.enums.EnumGameStatus; import com.iformall.enums.EnumPayWay; -import com.iformall.mapper.*; +import com.iformall.mapper.WxCashOutMapper; +import com.iformall.mapper.WxMallMapper; +import com.iformall.mapper.WxMerchantMapper; import com.iformall.service.WxAppinfoService; import com.iformall.service.WxPayAccountService; import com.iformall.service.pay.PayServiceFactory; import com.iformall.service.pay.service.cashout.entity.CashOutAdapterResult; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java index 8948d5243..43aa9fe68 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java @@ -3,16 +3,20 @@ package com.iformall.schedule; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iformall.common.IdWorker; import com.iformall.domain.dto.WxCUserBasicInfoDto; -import com.iformall.domain.po.*; +import com.iformall.domain.po.WxChartDataEntity; +import com.iformall.domain.po.WxCouponOrder; +import com.iformall.domain.po.WxMall; +import com.iformall.domain.po.WxMerchantTradeDaily; import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumAppPlat; import com.iformall.enums.EnumCarCmd; import com.iformall.enums.EnumChartType; -import com.iformall.mapper.*; +import com.iformall.mapper.WxCUserCarMapper; +import com.iformall.mapper.WxChartDataMapper; +import com.iformall.mapper.WxMallMapper; import com.iformall.service.*; import com.iformall.service.cuser.CUserServiceFactory; import com.iformall.utils.DateUtils; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -20,7 +24,6 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import java.math.BigDecimal; import java.util.Date; import java.util.HashMap; import java.util.List; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java index 2b6ed8d9a..3994dc7dc 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java @@ -1,40 +1,22 @@ package com.iformall.schedule; -import com.github.pagehelper.PageInfo; -import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxMall; import com.iformall.domain.po.WxPropertyContract; import com.iformall.domain.po.WxRentContract; -import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.WxMsgRecord; -import com.iformall.enums.EnumDelStatus; -import com.iformall.enums.EnumIsPreview; -import com.iformall.enums.EnumMsgMqKey; -import com.iformall.enums.EnumMsgMqTag; -import com.iformall.enums.EnumMsgMqTopic; -import com.iformall.enums.EnumMsgRecordType; -import com.iformall.enums.EnumRentContractStatus; -import com.iformall.enums.EnumRentContractType; +import com.iformall.enums.*; import com.iformall.mapper.WxMallMapper; import com.iformall.mq.MqBaseProducer; -import com.iformall.service.WxBillRentService; import com.iformall.service.WxPropertyContractService; import com.iformall.service.WxRentContractService; import com.iformall.utils.DateUtils; - import lombok.extern.slf4j.Slf4j; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @author gongbiao diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java index 3bc5d4666..ba0929478 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java @@ -6,8 +6,6 @@ import com.alibaba.fastjson.JSONObject; import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.po.WxGame; import com.iformall.domain.po.WxMall; -import com.iformall.domain.vo.WxCouponCVo; -import com.iformall.domain.vo.WxCouponChannelVo; import com.iformall.enums.EnumCouponChannelStatus; import com.iformall.enums.EnumCouponChannelType; import com.iformall.enums.EnumGameStatus; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java index 3afcef59d..c91dfdc66 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java @@ -1,21 +1,18 @@ package com.iformall.schedule; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iformall.common.ErrorCode; -import com.iformall.common.ResultData; -import com.iformall.domain.dto.WxSharingOrderDto; -import com.iformall.domain.po.*; +import com.iformall.domain.po.WxCouponOrder; +import com.iformall.domain.po.WxMall; +import com.iformall.domain.po.WxOrder; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.*; import com.iformall.service.*; -import com.iformall.service.order.entity.WxComposeChildOrderShare; import com.iformall.utils.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.aop.framework.AopContext; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Propagation; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderNoticeSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderNoticeSchedule.java index bbaf31f93..8b979224c 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderNoticeSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderNoticeSchedule.java @@ -1,33 +1,24 @@ package com.iformall.schedule; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.iformall.common.ErrorCode; -import com.iformall.common.ResultData; -import com.iformall.domain.dto.WxSharingOrderDto; import com.iformall.domain.po.*; import com.iformall.domain.po.msg.WxMsg; -import com.iformall.enums.*; -import com.iformall.exception.MallinkException; -import com.iformall.mapper.*; -import com.iformall.service.WxCouponOrderService; +import com.iformall.enums.EnumCouponType; +import com.iformall.enums.EnumTemplateType; +import com.iformall.mapper.WxCUserMapper; +import com.iformall.mapper.WxCouponMapper; +import com.iformall.mapper.WxCouponOrderMapper; +import com.iformall.mapper.WxMallMapper; import com.iformall.service.WxMsgService; -import com.iformall.service.WxOrderService; -import com.iformall.service.WxProfitSharingOrderService; -import com.iformall.service.WxRefundOrderService; import com.iformall.service.WxTemplateMsgService; -import com.iformall.service.order.entity.WxComposeChildOrderShare; import com.iformall.utils.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.aop.framework.AopContext; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java index 0838ad6cd..d774d6eea 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java @@ -1,6 +1,5 @@ package com.iformall.schedule; -import com.iformall.common.IdWorker; import com.iformall.domain.po.*; import com.iformall.domain.vo.WxMerchantProductVo; import com.iformall.enums.EnumDateAmtType; @@ -18,8 +17,6 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; -import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.*; @Component diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/DeviceHbCheckSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/DeviceHbCheckSchedule.java index 48f2a84d7..d12f01df1 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/DeviceHbCheckSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/DeviceHbCheckSchedule.java @@ -4,9 +4,6 @@ package com.iformall.schedule; import com.iformall.mapper.KwBoxMapper; import com.iformall.mapper.KwMeterMapper; import com.iformall.mapper.WxDeviceMapper; - - - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java index 11fe0d039..87f2dcd9c 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java @@ -19,8 +19,6 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; -import org.springframework.scheduling.annotation.Async; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java index 7701fc425..ee843c987 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java @@ -1,17 +1,11 @@ package com.iformall.schedule; -import com.iformall.domain.po.base.TenantEntity; -import com.iformall.domain.po.msg.*; -import com.iformall.enums.*; import com.iformall.mq.MqBaseProducer; import com.iformall.service.WxMsgRecordService; -import com.iformall.utils.JsonUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import java.util.List; /** * 消息重发 diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java index 8c3a2b45a..b7c25ad70 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java @@ -1,13 +1,9 @@ package com.iformall.schedule; import com.alibaba.fastjson.JSONArray; -import com.iformall.common.ErrorCode; -import com.iformall.common.ResultData; import com.iformall.domain.po.msg.WxMsg; import com.iformall.enums.*; -import com.iformall.mapper.WxMsgConfigMapper; import com.iformall.mapper.WxMsgMapper; -import com.iformall.mapper.WxMsgModelMapper; import com.iformall.mq.MqBaseProducer; import com.iformall.service.WxMsgService; import com.iformall.utils.DateUtils; @@ -18,6 +14,7 @@ import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; + import java.util.List; /** diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java index 11045ef63..282d50705 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java @@ -1,41 +1,35 @@ package com.iformall.schedule; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.iformall.domain.po.*; -import com.iformall.domain.po.base.TenantEntity; -import com.iformall.domain.po.msg.FmInsideOrderPushMsg; -import com.iformall.enums.*; -import com.iformall.mapper.*; -import com.iformall.mq.MqBaseProducer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.aop.framework.AopContext; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iformall.common.ErrorCode; -import com.iformall.common.ResultData; +import com.iformall.domain.po.*; +import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.exception.PayPlatOrderNotExistsException; +import com.iformall.mapper.*; +import com.iformall.mq.MqBaseProducer; import com.iformall.service.WxAppinfoService; import com.iformall.service.WxOrderService; import com.iformall.service.WxPayOrderService; import com.iformall.service.WxRefundOrderService; -import com.iformall.service.helper.WxPayOrderServiceHelper; import com.iformall.service.order.OrderFactory; import com.iformall.service.order.entity.WxComposeOrder; import com.iformall.service.pay.PayServiceFactory; import com.iformall.service.pay.service.pay.entity.PayQueryAdapterResult; import com.iformall.utils.DateUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.aop.framework.AopContext; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Component public class OrderExpiringSchedule { diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderRefundAuditSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderRefundAuditSchedule.java index 316bcc821..30a57a174 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderRefundAuditSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderRefundAuditSchedule.java @@ -1,17 +1,17 @@ package com.iformall.schedule; -import com.iformall.domain.po.*; -import com.iformall.domain.po.base.TenantEntity; -import com.iformall.douyin.pay.TtPayService; -import com.iformall.douyin.pay.exception.TtPayException; -import com.iformall.douyin.payv2.request.TtRefundAuditMsgRequest; +import com.iformall.domain.po.WxAppinfo; +import com.iformall.domain.po.WxPayAccount; +import com.iformall.domain.po.WxRefundOrder; import com.iformall.enums.*; import com.iformall.exception.MallinkException; -import com.iformall.mapper.*; +import com.iformall.mapper.WxAppinfoMapper; +import com.iformall.mapper.WxOrderMapper; +import com.iformall.mapper.WxPayAccountMapper; +import com.iformall.mapper.WxRefundOrderMapper; import com.iformall.service.WxRefundOrderService; import com.iformall.service.pay.PayServiceFactory; -import com.iformall.service.pay.service.pay.PayAdapterService; import com.iformall.service.pay.service.refund.RefundPayAdapterService; import com.iformall.utils.MaUtil; import org.slf4j.Logger; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java index 9d6de280e..552a49a0c 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java @@ -17,8 +17,6 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import java.math.BigDecimal; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java index 7081c081e..c7ea53450 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java @@ -1,8 +1,10 @@ package com.iformall.schedule; import com.iformall.common.ResultData; -import com.iformall.domain.po.*; -import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.po.WxMall; +import com.iformall.domain.po.WxMallNoticeContact; +import com.iformall.domain.po.WxPayOrder; +import com.iformall.domain.po.WxProfitSharingOrder; import com.iformall.domain.po.msg.MailMsg; import com.iformall.domain.po.msg.WxMsgRecord; import com.iformall.enums.*; @@ -13,7 +15,6 @@ import com.iformall.mapper.WxProfitSharingOrderMapper; import com.iformall.mq.MqBaseProducer; import com.iformall.service.WxProfitSharingOrderService; import com.iformall.utils.DateUtils; -import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,7 +25,6 @@ import org.springframework.stereotype.Component; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Collectors; @Component public class SharingOrderRedoSchedule { diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java index c6972f08c..698855376 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java @@ -4,7 +4,8 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.WxMall; import com.iformall.domain.po.WxProfitSharingOrder; import com.iformall.enums.EnumProfitSharingOrderStatus; -import com.iformall.mapper.*; +import com.iformall.mapper.WxMallMapper; +import com.iformall.mapper.WxProfitSharingOrderMapper; import com.iformall.service.WxProfitSharingOrderService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/SharingReceiverApplySchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/SharingReceiverApplySchedule.java index b505db7fa..770278e92 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/SharingReceiverApplySchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/SharingReceiverApplySchedule.java @@ -2,7 +2,6 @@ package com.iformall.schedule; import com.iformall.common.ResultData; import com.iformall.domain.po.WxProfitSharingReceiverApply; -import com.iformall.enums.EnumSharingReceiverApplyStatus; import com.iformall.enums.EnumSharingReceiverApplymentState; import com.iformall.enums.EnumSharingReceiverVerifyResult; import com.iformall.mapper.WxProfitSharingReceiverApplyMapper; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/SysMonitorSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/SysMonitorSchedule.java index df571f537..3448ee977 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/SysMonitorSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/SysMonitorSchedule.java @@ -1,20 +1,12 @@ package com.iformall.schedule; -import com.iformall.domain.po.SysMonitor; -import com.iformall.enums.EnumSysMonitorStatus; -import com.iformall.mapper.*; +import com.iformall.mapper.SysMonitorMapper; import com.iformall.service.MailService; -import com.iformall.utils.HttpUtil; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import java.util.List; - @Component public class SysMonitorSchedule { diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/TtMerchantPoiSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/TtMerchantPoiSchedule.java index eb5268081..d0655609a 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/TtMerchantPoiSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/TtMerchantPoiSchedule.java @@ -1,19 +1,12 @@ package com.iformall.schedule; -import com.iformall.domain.po.*; -import com.iformall.enums.EnumSpuSyncStatus; -import com.iformall.enums.EnumSupplierMathStatus; import com.iformall.mapper.TtCouponChannelPoiMapper; import com.iformall.service.TtMerchantPoiService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import java.util.List; - @Component public class TtMerchantPoiSchedule { diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/TtMerchantReciverSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/TtMerchantReciverSchedule.java index 06c056bf6..4aab80e61 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/TtMerchantReciverSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/TtMerchantReciverSchedule.java @@ -1,9 +1,15 @@ package com.iformall.schedule; -import com.iformall.domain.po.*; -import com.iformall.enums.*; +import com.iformall.domain.po.WxAppinfo; +import com.iformall.domain.po.WxMerchant; +import com.iformall.enums.EnumAppPlat; +import com.iformall.enums.EnumAppType; +import com.iformall.enums.EnumEnableType; import com.iformall.mapper.WxMerchantMapper; -import com.iformall.service.*; +import com.iformall.service.WxAppinfoService; +import com.iformall.service.WxMallService; +import com.iformall.service.WxPayAccountService; +import com.iformall.service.WxProfitPaymentReceiverService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -11,9 +17,7 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; /** diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/TtOrderQueryCpsSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/TtOrderQueryCpsSchedule.java index 5666fdcbe..fad2242c1 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/TtOrderQueryCpsSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/TtOrderQueryCpsSchedule.java @@ -1,12 +1,11 @@ package com.iformall.schedule; -import com.iformall.domain.po.*; -import com.iformall.douyin.pay.TtPayService; -import com.iformall.douyin.payv2.result.TtPayCpsOrderQueryV2Result; +import com.iformall.domain.po.OrderCps; +import com.iformall.domain.po.WxAppinfo; +import com.iformall.domain.po.WxOrder; +import com.iformall.domain.po.WxPayAccount; import com.iformall.enums.*; import com.iformall.mapper.OrderCpsMapper; -import com.iformall.mapper.TtOrderPushErrorMapper; -import com.iformall.mapper.WxBatchOrderMapper; import com.iformall.service.WxAppinfoService; import com.iformall.service.WxOrderService; import com.iformall.service.WxPayAccountService; @@ -14,7 +13,6 @@ import com.iformall.service.pay.PayServiceFactory; import com.iformall.service.pay.service.pay.PayAdapterService; import com.iformall.service.pay.service.pay.entity.PayAdapterResult; import com.iformall.utils.MaUtil; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/WxAppVisitSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/WxAppVisitSchedule.java index e98218694..b66e7a89e 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/WxAppVisitSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/WxAppVisitSchedule.java @@ -1,13 +1,16 @@ package com.iformall.schedule; -import java.text.SimpleDateFormat; -import java.util.*; - import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.bean.analysis.WxMaVisitTrend; +import com.github.pagehelper.PageInfo; +import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxMall; +import com.iformall.domain.po.WxUserVisit; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.enums.EnumAppType; +import com.iformall.service.WxAppinfoService; import com.iformall.service.WxMallService; +import com.iformall.service.WxUserVisitService; import com.iformall.service.wechat.FmOpenService; import com.iformall.utils.MaUtil; import me.chanjar.weixin.common.error.WxErrorException; @@ -19,13 +22,10 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import com.github.pagehelper.PageInfo; -import com.iformall.domain.po.WxAppinfo; -import com.iformall.domain.po.WxUserVisit; -import com.iformall.enums.EnumAppType; -import com.iformall.enums.EnumPayWay; -import com.iformall.service.WxAppinfoService; -import com.iformall.service.WxUserVisitService; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.List; @Component public class WxAppVisitSchedule { diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java index 0b96e3975..0a28b7d1d 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java @@ -1,17 +1,5 @@ package com.iformall.schedule; -import java.util.Calendar; -import java.util.Date; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxCUserBasicInfo; import com.iformall.domain.po.WxMall; @@ -20,6 +8,16 @@ import com.iformall.enums.EnumAssignTagsTrigger; import com.iformall.service.WxCUserBasicInfoService; import com.iformall.service.WxCUserTagsService; import com.iformall.service.WxMallService; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Component; + +import java.util.Calendar; +import java.util.Date; +import java.util.List; @Component diff --git a/mallinkService/src/main/java/com/iformall/common/FmHttpClientBuilder.java b/mallinkService/src/main/java/com/iformall/common/FmHttpClientBuilder.java index 1687296a6..ac849bab6 100644 --- a/mallinkService/src/main/java/com/iformall/common/FmHttpClientBuilder.java +++ b/mallinkService/src/main/java/com/iformall/common/FmHttpClientBuilder.java @@ -18,11 +18,7 @@ import org.apache.http.conn.HttpClientConnectionManager; import org.apache.http.conn.socket.ConnectionSocketFactory; import org.apache.http.conn.socket.PlainConnectionSocketFactory; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; -import org.apache.http.impl.client.BasicCredentialsProvider; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.DefaultConnectionKeepAliveStrategy; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.impl.client.HttpClients; +import org.apache.http.impl.client.*; import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; import org.apache.http.protocol.HttpContext; import org.slf4j.Logger; diff --git a/mallinkService/src/main/java/com/iformall/config/BaseMyBatisConfiguration.java b/mallinkService/src/main/java/com/iformall/config/BaseMyBatisConfiguration.java index 0faf49d7c..74274e48b 100644 --- a/mallinkService/src/main/java/com/iformall/config/BaseMyBatisConfiguration.java +++ b/mallinkService/src/main/java/com/iformall/config/BaseMyBatisConfiguration.java @@ -1,9 +1,5 @@ package com.iformall.config; -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; - import com.iformall.plugin.MyBatisItercepters; import com.iformall.plugin.MyBatisPlus; import com.iformall.plugin.autoTenantId.MultiTenancy; @@ -11,6 +7,10 @@ import com.iformall.plugin.shard.impl.EnumShardingRule; import com.iformall.plugin.shard.impl.ShardingSphere; import com.iformall.plugin.shard.plugin.ShardingSpherePlugin; +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; + public class BaseMyBatisConfiguration { protected MyBatisItercepters allIntercepters() { diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/OrderComposeSaveDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/OrderComposeSaveDto.java index a65589b93..9f28be6a5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/OrderComposeSaveDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/OrderComposeSaveDto.java @@ -1,13 +1,12 @@ package com.iformall.domain.dto; import com.iformall.domain.po.UserBasicInfoAddress; +import com.iformall.domain.po.WxCoupon; +import com.iformall.domain.po.WxCouponChannel; import lombok.Data; import java.io.Serializable; -import com.iformall.domain.po.WxCoupon; -import com.iformall.domain.po.WxCouponChannel; - @Data public class OrderComposeSaveDto implements Serializable { diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/PlatPushOrderSaveDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/PlatPushOrderSaveDto.java index 04d4a6edb..b6108f3f9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/PlatPushOrderSaveDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/PlatPushOrderSaveDto.java @@ -1,11 +1,11 @@ package com.iformall.domain.dto; -import lombok.Data; -import java.io.Serializable; - import com.iformall.domain.po.UserBasicInfoAddress; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponChannel; +import lombok.Data; + +import java.io.Serializable; @Data public class PlatPushOrderSaveDto implements Serializable { diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java index 12d6357f9..b1b894500 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java @@ -1,12 +1,9 @@ package com.iformall.domain.dto; import com.baomidou.mybatisplus.annotation.TableField; -import com.iformall.domain.po.base.BaseTenantEntity; import com.iformall.domain.po.base.TenantEntity; - import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.commons.lang3.StringUtils; import java.util.Date; import java.util.List; diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxMerchantDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxMerchantDto.java index 46b17e5a2..28d478c6e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxMerchantDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxMerchantDto.java @@ -1,6 +1,5 @@ package com.iformall.domain.dto; -import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxProfitShareAppInoDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxProfitShareAppInoDto.java index e1b96ebec..9e4482202 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxProfitShareAppInoDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxProfitShareAppInoDto.java @@ -1,12 +1,10 @@ package com.iformall.domain.dto; -import java.io.Serializable; - import com.iformall.domain.po.WxAppinfo; -import com.iformall.domain.po.WxPayOrder; - import lombok.Data; +import java.io.Serializable; + @Data public class WxProfitShareAppInoDto implements Serializable{ diff --git a/mallinkService/src/main/java/com/iformall/domain/po/AliPayCUser.java b/mallinkService/src/main/java/com/iformall/domain/po/AliPayCUser.java index 0cfa12390..4937254f5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/AliPayCUser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/AliPayCUser.java @@ -1,12 +1,12 @@ package com.iformall.domain.po; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.Date; + @TableName(value = "alipay_c_user") @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/po/BusinessCircleBase.java b/mallinkService/src/main/java/com/iformall/domain/po/BusinessCircleBase.java index 3e7450fc3..01265b1d5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/BusinessCircleBase.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/BusinessCircleBase.java @@ -2,7 +2,6 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwMerchantMeter.java b/mallinkService/src/main/java/com/iformall/domain/po/KwMerchantMeter.java index 1caae931b..96a7f3ca6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwMerchantMeter.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMerchantMeter.java @@ -6,7 +6,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; - import java.util.Date; /** diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallCooUserInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/MallCooUserInfo.java index aa724c13f..c03c1e8c1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallCooUserInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallCooUserInfo.java @@ -2,13 +2,10 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.iformall.domain.po.base.TenantEntity; -import com.iformall.domain.po.base.TenantEntityWithoutFinalTenantId; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import org.apache.commons.lang3.StringUtils; import java.util.Date; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallUserAction.java b/mallinkService/src/main/java/com/iformall/domain/po/MallUserAction.java index 4ef283113..54ca0bbda 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallUserAction.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallUserAction.java @@ -5,7 +5,7 @@ import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.*; +import java.util.Date; @TableName(value = "mall_user_action") @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java index f2cd1f7e3..62ed0ae25 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java @@ -11,7 +11,6 @@ import lombok.EqualsAndHashCode; import lombok.ToString; import org.apache.commons.lang3.StringUtils; - import java.util.Date; import java.util.List; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MemCouponFromDsp.java b/mallinkService/src/main/java/com/iformall/domain/po/MemCouponFromDsp.java index 13cb2acd7..2292f0a02 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MemCouponFromDsp.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MemCouponFromDsp.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import java.util.*; +import java.util.Date; @TableName(value = "mem_coupon_from_dsp") @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/po/NeuPosOrderMasterExt.java b/mallinkService/src/main/java/com/iformall/domain/po/NeuPosOrderMasterExt.java index c837d0b5f..456bd07b1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/NeuPosOrderMasterExt.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/NeuPosOrderMasterExt.java @@ -1,13 +1,13 @@ package com.iformall.domain.po; -import java.util.Date; -import java.util.List; - import com.iformall.domain.po.base.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; +import java.util.Date; +import java.util.List; + @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/OrderSnapshot.java b/mallinkService/src/main/java/com/iformall/domain/po/OrderSnapshot.java index 4ea34a3a2..18a601748 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/OrderSnapshot.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/OrderSnapshot.java @@ -5,14 +5,10 @@ import com.alibaba.fastjson.JSON; import com.aliyun.openservices.shade.com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.common.SortColumn; import com.iformall.domain.po.base.TenantEntity; -import com.iformall.domain.vo.WxCouponStatisVo; import com.iformall.domain.vo.WxMerchantVo; import com.iformall.douyin.web.bean.GoodsTemplateGet; import com.iformall.enums.EnumCouponType; -import com.iformall.utils.Constant; -import com.iformall.utils.DateUtils; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/PosActionLog.java b/mallinkService/src/main/java/com/iformall/domain/po/PosActionLog.java index df4d3ba96..ba04c9202 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/PosActionLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/PosActionLog.java @@ -2,6 +2,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; + import java.io.Serializable; @TableName(value = "pos_action_log") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/PosMallConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/PosMallConfig.java index dd0358f6e..aad7da2c5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/PosMallConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/PosMallConfig.java @@ -5,7 +5,7 @@ import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.*; +import java.util.Date; @TableName(value = "pos_mall_config") @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/po/PosOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/PosOrder.java index bc90058fc..2f86b9ae6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/PosOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/PosOrder.java @@ -5,7 +5,7 @@ import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.*; +import java.util.Date; @TableName(value = "pos_order") @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/po/PosPayOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/PosPayOrder.java index 9a8179e97..0934623cd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/PosPayOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/PosPayOrder.java @@ -5,7 +5,7 @@ import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.*; +import java.util.Date; @TableName(value = "pos_pay_order") @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/po/PushLimit.java b/mallinkService/src/main/java/com/iformall/domain/po/PushLimit.java index c4fd85cb1..8b8a6a40a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/PushLimit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/PushLimit.java @@ -5,7 +5,7 @@ import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.*; +import java.util.Date; @TableName(value = "push_limit") @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/po/SellerAgent.java b/mallinkService/src/main/java/com/iformall/domain/po/SellerAgent.java index 1c66b2a74..acf1822df 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/SellerAgent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/SellerAgent.java @@ -5,6 +5,7 @@ import com.iformall.domain.po.base.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; + import java.util.Date; @TableName(value = "seller_agent") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/SellerAgentAccount.java b/mallinkService/src/main/java/com/iformall/domain/po/SellerAgentAccount.java index cd5854f7c..3b60aff2a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/SellerAgentAccount.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/SellerAgentAccount.java @@ -5,6 +5,7 @@ import com.iformall.domain.po.base.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; + import java.util.Date; @TableName(value = "seller_agent_account") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/SysConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/SysConfig.java index 2dd27cd4e..2d1a0f69c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/SysConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/SysConfig.java @@ -1,13 +1,13 @@ package com.iformall.domain.po; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.Date; + @TableName(value = "sys_config") @Data @EqualsAndHashCode(callSuper = true) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/SysConfigValue.java b/mallinkService/src/main/java/com/iformall/domain/po/SysConfigValue.java index afb3b8db2..c9a669351 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/SysConfigValue.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/SysConfigValue.java @@ -1,11 +1,7 @@ package com.iformall.domain.po; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.TenantEntity; - import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/SysGaodeCity.java b/mallinkService/src/main/java/com/iformall/domain/po/SysGaodeCity.java index e8f93bb15..8a4c861bb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/SysGaodeCity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/SysGaodeCity.java @@ -1,12 +1,12 @@ package com.iformall.domain.po; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.Date; + @TableName(value = "sys_gaode_city") @Data @EqualsAndHashCode(callSuper = true) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/SysNotice.java b/mallinkService/src/main/java/com/iformall/domain/po/SysNotice.java index b2dd209ef..01c905860 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/SysNotice.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/SysNotice.java @@ -1,17 +1,11 @@ package com.iformall.domain.po; -import cn.afterturn.easypoi.excel.annotation.Excel; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.common.SortColumn; import com.iformall.domain.po.base.BaseEntity; -import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; - -import java.math.BigDecimal; import java.util.Date; @TableName(value = "sys_notice") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/ThDevInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/ThDevInfo.java index b76db1edc..b49c81154 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/ThDevInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/ThDevInfo.java @@ -5,7 +5,7 @@ import com.iformall.domain.po.base.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.*; +import java.util.Date; @TableName(value = "th_dev_info") @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/po/TtCouponChannelPoi.java b/mallinkService/src/main/java/com/iformall/domain/po/TtCouponChannelPoi.java index eb6bc497e..a76ff3c07 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/TtCouponChannelPoi.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/TtCouponChannelPoi.java @@ -1,14 +1,11 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.google.gson.JsonObject; import com.iformall.domain.po.base.TenantEntity; -import com.iformall.utils.Constant; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import java.math.BigDecimal; import java.util.Date; @TableName(value = "tt_coupon_channel_poi") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/TtMallGoodsCategory.java b/mallinkService/src/main/java/com/iformall/domain/po/TtMallGoodsCategory.java index 8aa5ca275..087b88a02 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/TtMallGoodsCategory.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/TtMallGoodsCategory.java @@ -2,7 +2,6 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/TtMallIm.java b/mallinkService/src/main/java/com/iformall/domain/po/TtMallIm.java index c4ee33242..9da354b04 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/TtMallIm.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/TtMallIm.java @@ -1,13 +1,11 @@ package com.iformall.domain.po; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import java.util.Date; -import java.util.List; @TableName(value = "tt_mall_im") @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java index 962399f2f..09fa02f94 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java @@ -5,7 +5,6 @@ import com.iformall.domain.po.base.BaseTenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; - import java.util.Date; @TableName(value = "wx_authorizer_info") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBatchOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBatchOrder.java index a62621079..861505da7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBatchOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBatchOrder.java @@ -12,10 +12,9 @@ import com.iformall.utils.Constant; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; + import java.util.Date; -import java.util.HashMap; import java.util.List; -import java.util.Map; @TableName(value = "wx_batch_order") @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java index 22a6f191c..d7bc80dd7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java @@ -11,8 +11,6 @@ import lombok.ToString; import javax.validation.constraints.NotNull; import java.util.Date; -import java.util.List; -import java.util.Map; /** * @author gongbiao diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java index 477500185..3e94f522e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java @@ -11,8 +11,6 @@ import lombok.ToString; import java.math.BigDecimal; import java.util.Date; -import java.util.List; -import java.util.Map; /** * @author gongbiao diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java index 7ee27bedb..40114a6d2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java @@ -9,7 +9,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; - import java.math.BigDecimal; import java.util.Date; import java.util.List; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRentManage.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRentManage.java index ddf8e3058..ff7bd4dd2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRentManage.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRentManage.java @@ -1,17 +1,13 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.common.SortColumn; import com.iformall.domain.po.base.TenantEntity; -import com.iformall.enums.EnumDelStatus; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import org.apache.commons.lang3.StringUtils; import java.math.BigDecimal; import java.util.Date; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java index 1b57de98c..3689f0d74 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java @@ -7,7 +7,6 @@ import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; - import java.util.Date; import java.util.List; import java.util.Map; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleSchedule.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleSchedule.java index ba4b092be..89b04a10f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleSchedule.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleSchedule.java @@ -3,16 +3,12 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.common.SortColumn; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import java.math.BigDecimal; import java.util.Date; -import java.util.List; -import java.util.Map; /** * @author gongbiao diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java index 95b7a9a0f..15f714ae1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java @@ -2,7 +2,6 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - import com.iformall.enums.EnumAppPlat; import com.iformall.utils.Constant; import lombok.Data; @@ -10,7 +9,6 @@ import lombok.EqualsAndHashCode; import lombok.ToString; import org.apache.commons.lang3.StringUtils; - import java.util.Date; import java.util.UUID; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicChild.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicChild.java index b20357599..a15e0ac39 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicChild.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicChild.java @@ -6,6 +6,7 @@ import com.iformall.domain.po.base.BaseTenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; + import java.util.Date; @TableName(value = "wx_c_user_basic_child") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java index 7c0c46105..aa9e41aa4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java @@ -8,8 +8,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.iformall.domain.dto.GetPointDTO; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.TenantEntityWithoutFinalTenantId; - -import com.iformall.utils.Constant; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserCar.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserCar.java index 79d3cb4e4..8cada1ce8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserCar.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserCar.java @@ -2,13 +2,12 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseTenantEntity; import com.iformall.domain.po.base.TenantEntity; - import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.*; +import java.util.Date; +import java.util.List; @TableName(value = "wx_c_user_car") @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserTags.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserTags.java index 228a640c7..4de1b4645 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserTags.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserTags.java @@ -6,7 +6,8 @@ import com.iformall.domain.po.base.BaseTenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.*; +import java.util.Date; +import java.util.List; @TableName(value = "wx_c_user_tags") @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCarJSOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCarJSOrder.java index 9ff30a1b6..925383764 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCarJSOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCarJSOrder.java @@ -5,6 +5,7 @@ import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; + import java.util.Date; @TableName(value = "wx_car_js_order") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayOrder.java index 4b3ebd583..3dcfa9042 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayOrder.java @@ -1,15 +1,16 @@ package com.iformall.domain.po; +import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumCarPayAmountType; - -import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import java.util.*; + +import java.util.Date; +import java.util.List; @TableName(value = "wx_car_pay_order") @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java index 88ffd7176..4a9b0a9e5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java @@ -8,7 +8,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; - import java.util.Date; @TableName(value = "wx_car_pay_record") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java index ec980d717..90b24cf08 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java @@ -7,7 +7,6 @@ import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; - import java.math.BigDecimal; import java.util.Date; import java.util.List; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java index c40808943..ed43beabd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java @@ -8,7 +8,6 @@ import com.iformall.enums.EnumPayType; import lombok.Data; import lombok.EqualsAndHashCode; - import java.math.BigDecimal; import java.util.Date; import java.util.List; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxComponentVerifyTicket.java b/mallinkService/src/main/java/com/iformall/domain/po/WxComponentVerifyTicket.java index d15ff6ead..6becab32b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxComponentVerifyTicket.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxComponentVerifyTicket.java @@ -5,7 +5,7 @@ import com.iformall.domain.po.base.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.*; +import java.util.Date; @TableName(value = "wx_component_verify_ticket") @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index 7d36ea8b4..6524874f1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -1,5 +1,6 @@ package com.iformall.domain.po; +import cn.afterturn.easypoi.excel.annotation.Excel; import com.aliyun.openservices.shade.com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; @@ -10,14 +11,11 @@ import com.iformall.douyin.web.bean.GoodsTemplateGet; import com.iformall.enums.EnumCouponType; import com.iformall.enums.EnumCouponValidType; import com.iformall.utils.DateUtils; - -import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; import org.apache.commons.lang3.StringUtils; - import java.math.BigDecimal; import java.util.Date; import java.util.HashMap; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponActionLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponActionLog.java index 95c1f8e07..1f31e1992 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponActionLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponActionLog.java @@ -7,7 +7,7 @@ import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.*; +import java.util.Date; import java.util.List; @TableName(value = "wx_coupon_action_log") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponBatch.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponBatch.java index 6e2785fe8..96a2b74b5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponBatch.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponBatch.java @@ -6,6 +6,7 @@ import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; + import java.util.Date; import java.util.List; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponBatchItem.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponBatchItem.java index ab1f3d87f..8c47ae2ba 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponBatchItem.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponBatchItem.java @@ -6,6 +6,7 @@ import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; + import java.util.Date; @TableName(value = "wx_coupon_batch_item") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponCar.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponCar.java index 4a30b7d84..89107b304 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponCar.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponCar.java @@ -6,7 +6,8 @@ import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.*; +import java.util.Date; +import java.util.Map; @TableName(value = "wx_coupon_car") @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java index 4c5fdf72d..66ad2532a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java @@ -1,7 +1,6 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; - import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java index aabd24fdb..95c0fb617 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java @@ -9,13 +9,11 @@ import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; - +import org.apache.commons.lang3.StringUtils; import java.util.Date; import java.util.List; -import org.apache.commons.lang3.StringUtils; - @TableName(value = "wx_coupon_send") @Data @ToString(callSuper = true) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSendConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSendConfig.java index a8a3c619c..dae86b52d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSendConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSendConfig.java @@ -5,7 +5,7 @@ import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.*; +import java.util.Date; @TableName(value = "wx_coupon_send_config") @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java index 27892435d..dae0cdf4a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java @@ -3,7 +3,6 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.BaseTenantEntity; -import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxDataRuleTarget.java b/mallinkService/src/main/java/com/iformall/domain/po/WxDataRuleTarget.java index 261e7346b..a0a123646 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxDataRuleTarget.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxDataRuleTarget.java @@ -6,7 +6,6 @@ import com.iformall.domain.po.base.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; - import java.util.Date; import java.util.List; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxDateAmountRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxDateAmountRecord.java index ae6eb862a..d433f010d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxDateAmountRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxDateAmountRecord.java @@ -5,7 +5,7 @@ import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.*; +import java.util.Date; @TableName(value = "wx_date_amount_record") @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java index b2a497dbe..ffda51f49 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java @@ -6,7 +6,6 @@ import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; - import java.util.Date; import java.util.List; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxGameActionLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxGameActionLog.java index c721ad690..036f2355c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxGameActionLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxGameActionLog.java @@ -6,7 +6,6 @@ import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; - import java.util.Date; @TableName(value = "wx_game_action_log") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxGroup.java b/mallinkService/src/main/java/com/iformall/domain/po/WxGroup.java index 7469f5158..8a41544fc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxGroup.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxGroup.java @@ -5,7 +5,6 @@ import com.iformall.domain.po.base.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; - import java.util.Date; @TableName(value = "wx_group") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxLevelConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxLevelConfig.java index 1dc668a2d..5e4730b04 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxLevelConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxLevelConfig.java @@ -6,7 +6,7 @@ import com.iformall.domain.po.base.BaseTenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.*; +import java.util.Date; @TableName(value = "wx_level_config") @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxLevelMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxLevelMerchant.java index cc232b674..93f4e094e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxLevelMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxLevelMerchant.java @@ -5,7 +5,6 @@ import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; - import java.util.Date; @TableName(value = "wx_level_merchant") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java index cd6b84685..680146694 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java @@ -1,13 +1,11 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.IdType; -import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.TenantEntity; import com.iformall.utils.DateUtils; import lombok.Data; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMallFloor.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMallFloor.java index b97b5f556..9298a2b1f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMallFloor.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMallFloor.java @@ -3,14 +3,15 @@ package com.iformall.domain.po; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.google.gson.JsonObject; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang3.StringUtils; import java.math.BigDecimal; -import java.util.*; +import java.util.Date; +import java.util.List; +import java.util.Map; @TableName(value = "wx_mall_floor") @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMallOcrModel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMallOcrModel.java index ee7c97148..2c7cb26ed 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMallOcrModel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMallOcrModel.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; + import java.util.Date; @TableName(value = "wx_mall_ocr_model") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMallVersion.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMallVersion.java index e192d9c95..fbc3e8a19 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMallVersion.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMallVersion.java @@ -1,22 +1,12 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.IdType; -import com.alibaba.fastjson.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.TenantEntity; -import com.iformall.utils.DateUtils; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.commons.lang3.StringUtils; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; @JsonIgnoreProperties(value = {"handler"}) @TableName(value = "wx_mall_version") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index bdbaf9e95..8e1eb1947 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -3,11 +3,12 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.google.gson.JsonObject; import com.iformall.common.SortColumn; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxShopVo; -import com.iformall.enums.*; +import com.iformall.enums.EnumMerchantStatus; +import com.iformall.enums.EnumProfitPaymentReceiverType; +import com.iformall.enums.EnumProfitSharingType; import com.iformall.utils.Constant; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java index 328dfd5c3..2d1f849c1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java @@ -9,7 +9,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang3.StringUtils; - import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantOcrModel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantOcrModel.java index d98f628c3..5a43dc019 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantOcrModel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantOcrModel.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; + import java.util.Date; @TableName(value = "wx_merchant_ocr_model") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantRelation.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantRelation.java index 39a0d1975..98472ca38 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantRelation.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantRelation.java @@ -4,10 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.ToString; -import java.io.Serializable; import java.util.Date; import java.util.List; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantScoreRules.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantScoreRules.java index 6d6a80f28..2eba661d1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantScoreRules.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantScoreRules.java @@ -1,16 +1,12 @@ package com.iformall.domain.po; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.BaseTenantEntity; -import com.iformall.enums.EnumScoreType; -import com.iformall.utils.Constant; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.*; +import java.util.Date; @TableName(value = "wx_merchant_score_rules") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java index 93370ade8..34ab46020 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java @@ -10,7 +10,7 @@ import lombok.EqualsAndHashCode; import lombok.ToString; import java.math.BigDecimal; -import java.util.*; +import java.util.Date; import java.util.List; @TableName(value = "wx_merchant_subsidy") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTax.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTax.java index a1ce70154..e632506ea 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTax.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTax.java @@ -5,7 +5,6 @@ import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; - import java.util.Date; @TableName(value = "wx_merchant_tax") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java index 0242ca2ec..3efa0c751 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java @@ -7,7 +7,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang3.StringUtils; - import java.util.Date; import java.util.List; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDailyHistory.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDailyHistory.java index 3b74c0c1d..e5e21f3b4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDailyHistory.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDailyHistory.java @@ -1,14 +1,8 @@ package com.iformall.domain.po; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.commons.lang3.StringUtils; - - -import java.util.Date; @TableName(value = "wx_merchant_trade_daily_history") @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMiniappThemeDeploy.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMiniappThemeDeploy.java index 83404576b..b7d20ac68 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMiniappThemeDeploy.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMiniappThemeDeploy.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.io.Serializable; -import java.util.Date; @TableName(value = "wx_miniapp_theme_deploy") @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgCallback.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgCallback.java index a3a916aeb..92c69f30d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgCallback.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgCallback.java @@ -7,7 +7,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; - import java.util.Date; @TableName(value = "wx_msg_callback") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java index e6b013606..3c07b4272 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java @@ -7,7 +7,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; - import java.util.Date; @TableName(value = "wx_msg_model") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgSignature.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgSignature.java index f2fbfa0f9..1f3966dd0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgSignature.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgSignature.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import java.util.*; +import java.util.Date; @TableName(value = "wx_msg_signature") @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcode.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcode.java index ac246d492..89f05ce08 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcode.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcode.java @@ -6,7 +6,6 @@ import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; - import java.util.Date; @TableName(value = "wx_msg_validationcode") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModelTenant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModelTenant.java index 603fa58ce..ca300f6a2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModelTenant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModelTenant.java @@ -1,14 +1,10 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.TenantEntity; - import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - @TableName(value = "wx_msg_validationcode_model_tenant") @Data @EqualsAndHashCode(callSuper = true) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxOcrModel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOcrModel.java index c407d7390..cab360a44 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOcrModel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOcrModel.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; + import java.util.Date; @TableName(value = "wx_ocr_model") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java index c456085cf..4d0858f47 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java @@ -1,7 +1,6 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; - import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; @@ -9,9 +8,6 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.common.SortColumn; import com.iformall.domain.po.base.TenantEntity; -import com.iformall.enums.EnumAppPlat; -import com.iformall.enums.EnumCouponType; -import com.iformall.utils.Constant; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxOrderPress.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOrderPress.java index 58cc9dd11..516a3e6b7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOrderPress.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOrderPress.java @@ -6,7 +6,8 @@ import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.*; +import java.util.Date; +import java.util.List; @TableName(value = "wx_order_press") @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPark.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPark.java index c5708c29d..a2edbbb2b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPark.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPark.java @@ -6,11 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; - -import java.util.*; - import org.apache.commons.lang3.StringUtils; +import java.util.Date; + @TableName(value = "wx_park") @Data @EqualsAndHashCode(callSuper = true) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPayBill.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPayBill.java index a1edde52c..b8df73768 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPayBill.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPayBill.java @@ -5,7 +5,6 @@ import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; - import java.util.Date; /** diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java index e70f39748..890731a69 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java @@ -6,15 +6,13 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; import com.iformall.service.order.entity.WxComposeChildOrderShare; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; +import org.apache.commons.lang3.StringUtils; import java.util.*; -import org.apache.commons.lang3.StringUtils; - @TableName(value = "wx_pay_order") @Data @EqualsAndHashCode(callSuper = true) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPrepayment.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPrepayment.java index ab86b047e..28843bdc7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPrepayment.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPrepayment.java @@ -6,7 +6,6 @@ import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; - import java.util.Date; /** diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPrepaymentHistory.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPrepaymentHistory.java index 2b414ba07..ef929d49d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPrepaymentHistory.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPrepaymentHistory.java @@ -6,7 +6,6 @@ import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; - import java.util.Date; /** diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPressBatch.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPressBatch.java index cc56a787e..9d351332d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPressBatch.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPressBatch.java @@ -6,6 +6,7 @@ import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; + import java.util.Date; import java.util.List; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPressBatchItem.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPressBatchItem.java index 34bd8cb62..ce1377b22 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPressBatchItem.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPressBatchItem.java @@ -6,6 +6,7 @@ import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; + import java.util.Date; @TableName(value = "wx_press_batch_item") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingOrder.java index 83c7fcefd..e4ab9b1b7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingOrder.java @@ -5,7 +5,7 @@ import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.*; +import java.util.Date; @TableName(value = "wx_profit_sharing_order") @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingResult.java b/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingResult.java index ca132287b..9153faab4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingResult.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingResult.java @@ -5,7 +5,7 @@ import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.*; +import java.util.Date; @TableName(value = "wx_profit_sharing_result") @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxProjectConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxProjectConfig.java index af314829e..db590f9a9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxProjectConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxProjectConfig.java @@ -1,16 +1,11 @@ package com.iformall.domain.po; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonProperty; import com.iformall.domain.po.base.BaseEntity; -import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import java.math.BigDecimal; -import java.util.Date; -import java.util.List; @TableName(value = "wx_project_config") @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionLog.java index 612cf31be..c122b8e79 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionLog.java @@ -5,7 +5,6 @@ import com.iformall.domain.po.base.BaseTenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; - import java.util.Date; @TableName(value = "wx_question_log") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionOneselfTopic.java b/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionOneselfTopic.java index 0fa471782..812c3cbf8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionOneselfTopic.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionOneselfTopic.java @@ -1,7 +1,6 @@ package com.iformall.domain.po; import com.alibaba.fastjson.JSONArray; -import com.aliyun.openservices.shade.com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; @@ -10,7 +9,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang3.StringUtils; -import java.util.Arrays; import java.util.Date; import java.util.List; import java.util.Map; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRefundOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRefundOrder.java index c272d4c39..fe26105d2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRefundOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRefundOrder.java @@ -7,7 +7,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import java.util.*; +import java.util.Date; @TableName(value = "wx_refund_order") @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index 916961164..754d638e7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -11,7 +11,6 @@ import com.iformall.enums.EnumRentContractAdjustPeriod; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; - import org.apache.commons.compress.utils.Lists; import org.apache.commons.lang3.StringUtils; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxScoreHistory.java b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreHistory.java index 62fac20ae..0b67b7ba4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxScoreHistory.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreHistory.java @@ -3,11 +3,10 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.BaseTenantEntity; -import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.*; +import java.util.Date; @TableName(value = "wx_score_history") @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java index ad34850ed..9524eb497 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java @@ -7,16 +7,10 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.BaseTenantEntity; import com.iformall.enums.EnumScoreType; import com.iformall.utils.Constant; - import lombok.Data; import lombok.EqualsAndHashCode; - -import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 1. 每天登录首次给成长值 diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java index 0d0ab01e1..567b52e3f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java @@ -9,7 +9,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; - import java.math.BigDecimal; import java.util.Date; import java.util.List; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxSubsidy.java b/mallinkService/src/main/java/com/iformall/domain/po/WxSubsidy.java index 82fdb97ff..d949459c8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxSubsidy.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxSubsidy.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import java.util.*; +import java.util.Date; @TableName(value = "wx_subsidy") @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java index 6bad67eaf..24acad6d1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java @@ -7,7 +7,8 @@ import com.iformall.enums.EnumTemplateType; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.*; +import java.util.Date; +import java.util.List; @TableName(value = "wx_template_msg") @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java index 34fb95e6a..8aadc95eb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java @@ -6,7 +6,7 @@ import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.*; +import java.util.Date; @TableName(value = "wx_user_visit") @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappBasicSet.java b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappBasicSet.java index 814246f62..5f19f1775 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappBasicSet.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappBasicSet.java @@ -5,7 +5,7 @@ import com.iformall.domain.po.base.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.*; +import java.util.Date; @TableName(value = "wx_weapp_basic_set") @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java index d4d034862..1b4eca26c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java @@ -5,7 +5,7 @@ import com.iformall.domain.po.base.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.*; +import java.util.Date; @TableName(value = "wx_weapp_ext_set") @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseCUserEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseCUserEntity.java index 2172681b9..edb840eaa 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseCUserEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseCUserEntity.java @@ -5,7 +5,6 @@ import com.iformall.domain.po.WxAppinfo; import com.iformall.enums.EnumAppPlat; import com.iformall.utils.UserUtil; import lombok.EqualsAndHashCode; -import org.apache.commons.lang3.StringUtils; import java.util.Date; import java.util.List; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java index 175549f43..56ec878e2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java @@ -2,11 +2,8 @@ package com.iformall.domain.po.base; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; - import org.apache.commons.lang3.StringUtils; /** diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java index b1172ea08..9fc78cd63 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java @@ -2,13 +2,11 @@ package com.iformall.domain.po.base; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.StringUtils; import java.util.List; -import org.apache.commons.lang3.StringUtils; - /** * @author Stormeye * @date 2019/4/24 14:32 diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantVEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantVEntity.java index b84de9620..4ddf5911d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantVEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantVEntity.java @@ -2,7 +2,6 @@ package com.iformall.domain.po.base; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang3.StringUtils; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestBaseEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestBaseEntity.java index 14797dc5b..082b859c6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestBaseEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestBaseEntity.java @@ -2,12 +2,12 @@ package com.iformall.domain.po.invest; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.*; +import java.util.Date; /** * @author luozukai diff --git a/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestCustomerEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestCustomerEntity.java index c51b95447..7137f5cef 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestCustomerEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestCustomerEntity.java @@ -2,8 +2,6 @@ package com.iformall.domain.po.invest; import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableName; - - import com.baomidou.mybatisplus.annotation.Version; import com.fasterxml.jackson.annotation.JsonProperty; import com.iformall.common.LogColumn; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestDemandEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestDemandEntity.java index 9bfdcb7ad..03ab862a4 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestDemandEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestDemandEntity.java @@ -1,10 +1,6 @@ package com.iformall.domain.po.invest; -import com.baomidou.mybatisplus.annotation.FieldStrategy; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; - - import com.baomidou.mybatisplus.annotation.Version; import com.fasterxml.jackson.annotation.JsonProperty; import com.iformall.common.LogColumn; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestFollowRecordEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestFollowRecordEntity.java index 6e60c56e7..4aa6e6fdd 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestFollowRecordEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestFollowRecordEntity.java @@ -1,8 +1,6 @@ package com.iformall.domain.po.invest; import com.baomidou.mybatisplus.annotation.TableName; - - import com.iformall.enums.EnumFollowType; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestOperateRecordEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestOperateRecordEntity.java index 0bab14c6b..f3ccf0cc7 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestOperateRecordEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestOperateRecordEntity.java @@ -2,14 +2,13 @@ package com.iformall.domain.po.invest; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; - -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.iformall.enums.EnumTableOperateType; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.Date; + /** * 操作记录 * diff --git a/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestRemindEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestRemindEntity.java index c62b0a8aa..7283abed9 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestRemindEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestRemindEntity.java @@ -2,15 +2,14 @@ package com.iformall.domain.po.invest; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; - -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.iformall.enums.EnumInvestRemindStatus; import com.iformall.enums.EnumNegotiationType; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.Date; + /** * 招商提醒 * diff --git a/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestTaskEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestTaskEntity.java index 3e625a5f2..edff43cee 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestTaskEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestTaskEntity.java @@ -1,7 +1,6 @@ package com.iformall.domain.po.invest; import com.baomidou.mybatisplus.annotation.TableName; - import com.baomidou.mybatisplus.annotation.Version; import com.fasterxml.jackson.annotation.JsonProperty; import com.iformall.enums.EnumInvestType; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/AfterAddCreditMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/AfterAddCreditMsg.java index c8ca841bd..f7638b0ac 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/AfterAddCreditMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/AfterAddCreditMsg.java @@ -4,8 +4,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import java.util.List; - /** * */ diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/AppUniformMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/AppUniformMsg.java index 903f76d14..93adde552 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/AppUniformMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/AppUniformMsg.java @@ -1,12 +1,10 @@ package com.iformall.domain.po.msg; -import cn.binarywang.wx.miniapp.bean.WxMaTemplateData; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; import java.util.List; -import java.util.Map; /** * 微信公众号-模板消息 diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideCashOutMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideCashOutMsg.java index 611ac1ef9..9d99aa3f0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideCashOutMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideCashOutMsg.java @@ -1,7 +1,6 @@ package com.iformall.domain.po.msg; import com.iformall.enums.EnumPayWay; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideOrderPushMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideOrderPushMsg.java index 5455b3cb8..1ccd5fd1b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideOrderPushMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideOrderPushMsg.java @@ -1,7 +1,5 @@ package com.iformall.domain.po.msg; -import com.iformall.domain.po.base.TenantEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/MailMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/MailMsg.java index e94faec09..b94e1ffac 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/MailMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/MailMsg.java @@ -3,6 +3,7 @@ package com.iformall.domain.po.msg; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; + import java.util.Map; /** diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/MpAppMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/MpAppMsg.java index dcdd81a03..dc2da0100 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/MpAppMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/MpAppMsg.java @@ -3,7 +3,6 @@ package com.iformall.domain.po.msg; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import me.chanjar.weixin.mp.bean.template.WxMpTemplateData; import java.util.List; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/SmartAppMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/SmartAppMsg.java index de1cb01a6..ef56a0e99 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/SmartAppMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/SmartAppMsg.java @@ -1,7 +1,5 @@ package com.iformall.domain.po.msg; -import cn.binarywang.wx.miniapp.bean.WxMaTemplateData; -import com.iformall.domain.po.msg.BaseMsg; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java index 9e2a7db97..d289ee199 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java @@ -10,6 +10,7 @@ import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; + import java.util.Date; import java.util.List; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsgRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsgRecord.java index 2d9ab9388..a822b30ad 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsgRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsgRecord.java @@ -1,10 +1,10 @@ package com.iformall.domain.po.msg; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; + import java.util.Date; import java.util.Map; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCUser.java b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCUser.java index 156cf10b9..ec777071a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCUser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCUser.java @@ -1,10 +1,8 @@ package com.iformall.domain.po.tt; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.iformall.domain.po.CUser; -import com.iformall.domain.po.base.BaseCUserEntity; import com.iformall.enums.EnumAppPlat; import com.iformall.utils.Constant; import lombok.Data; @@ -12,9 +10,7 @@ import lombok.EqualsAndHashCode; import lombok.ToString; import org.apache.commons.lang3.StringUtils; -import java.math.BigDecimal; import java.util.Date; -import java.util.List; import java.util.UUID; @TableName(value = "tt_c_user") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/AmountRecordVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/AmountRecordVo.java index e664a3d44..45d9cd6a5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/AmountRecordVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/AmountRecordVo.java @@ -1,10 +1,11 @@ package com.iformall.domain.vo; -import java.io.Serializable; -import java.text.DecimalFormat; import com.iformall.domain.po.WxDateAmountRecord; import lombok.Data; +import java.io.Serializable; +import java.text.DecimalFormat; + /** * 交易记录核销记录Vo * @author jinguo diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/BillTimeVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/BillTimeVo.java index 74d8c7aed..e81e07192 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/BillTimeVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/BillTimeVo.java @@ -1,6 +1,7 @@ package com.iformall.domain.vo; import lombok.Data; + import java.io.Serializable; import java.util.Date; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/CouponBatchVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/CouponBatchVo.java index 470ae842c..c8d1ab705 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/CouponBatchVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/CouponBatchVo.java @@ -1,15 +1,11 @@ package com.iformall.domain.vo; -import java.io.Serializable; -import java.text.DecimalFormat; -import java.util.List; - import com.iformall.domain.po.WxCouponBatch; -import com.iformall.domain.po.WxDateAmountRecord; -import com.iformall.domain.po.WxPressBatch; - import lombok.Data; +import java.io.Serializable; +import java.util.List; + @Data public class CouponBatchVo implements Serializable{ diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/CouponPressBatchVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/CouponPressBatchVo.java index dee849f29..3f360d735 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/CouponPressBatchVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/CouponPressBatchVo.java @@ -1,14 +1,11 @@ package com.iformall.domain.vo; -import java.io.Serializable; -import java.text.DecimalFormat; -import java.util.List; - -import com.iformall.domain.po.WxDateAmountRecord; import com.iformall.domain.po.WxPressBatch; - import lombok.Data; +import java.io.Serializable; +import java.util.List; + @Data public class CouponPressBatchVo implements Serializable{ diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/FlowUserVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/FlowUserVo.java index 06808a6ab..e99b1970c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/FlowUserVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/FlowUserVo.java @@ -1,6 +1,7 @@ package com.iformall.domain.vo; import lombok.Data; + import java.io.Serializable; @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/GaoDePoiInfo.java b/mallinkService/src/main/java/com/iformall/domain/vo/GaoDePoiInfo.java index db4f18d09..67794669e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/GaoDePoiInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/GaoDePoiInfo.java @@ -1,6 +1,7 @@ package com.iformall.domain.vo; import lombok.Data; + import java.io.Serializable; import java.math.BigDecimal; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/GaodeCityTree.java b/mallinkService/src/main/java/com/iformall/domain/vo/GaodeCityTree.java index 789d7968c..940d46c41 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/GaodeCityTree.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/GaodeCityTree.java @@ -1,13 +1,11 @@ package com.iformall.domain.vo; -import java.io.Serializable; -import java.text.DecimalFormat; -import java.util.List; - import com.iformall.domain.po.SysGaodeCity; -import com.iformall.domain.po.WxDateAmountRecord; import lombok.Data; +import java.io.Serializable; +import java.util.List; + @Data public class GaodeCityTree implements Serializable{ diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/MerchantCreditRankingVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/MerchantCreditRankingVo.java index 7d3274c49..5d15ef3b4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/MerchantCreditRankingVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/MerchantCreditRankingVo.java @@ -1,6 +1,5 @@ package com.iformall.domain.vo; -import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/MerchantPoiT.java b/mallinkService/src/main/java/com/iformall/domain/vo/MerchantPoiT.java index d02eafdde..311f2af77 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/MerchantPoiT.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/MerchantPoiT.java @@ -1,11 +1,9 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; -import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; import java.io.Serializable; import java.math.BigDecimal; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/MerchantPoiTNew.java b/mallinkService/src/main/java/com/iformall/domain/vo/MerchantPoiTNew.java index 273d4562c..f9b364223 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/MerchantPoiTNew.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/MerchantPoiTNew.java @@ -1,11 +1,8 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; -import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; import java.io.Serializable; import java.math.BigDecimal; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/NeuPosOrderDataBVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/NeuPosOrderDataBVo.java index 009f2e86f..6e897e09b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/NeuPosOrderDataBVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/NeuPosOrderDataBVo.java @@ -1,19 +1,12 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; -import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.iformall.domain.po.WxCouponOrder; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.ToString; import java.io.Serializable; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.text.DecimalFormat; import java.util.Date; -import java.util.List; @JsonIgnoreProperties(value = {"handler"}) @Data @ToString(callSuper = true) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/NeuPosSumDataBVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/NeuPosSumDataBVo.java index 5c9774a20..a449c25df 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/NeuPosSumDataBVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/NeuPosSumDataBVo.java @@ -1,19 +1,11 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; -import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.iformall.domain.po.WxCouponOrder; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.ToString; import java.io.Serializable; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.text.DecimalFormat; -import java.util.Date; -import java.util.List; @JsonIgnoreProperties(value = {"handler"}) @Data @ToString(callSuper = true) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/OweMerchantVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/OweMerchantVo.java index a5d89ae39..0eaa9ba84 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/OweMerchantVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/OweMerchantVo.java @@ -2,6 +2,7 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; + import java.math.BigDecimal; @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/TtCouponChannelVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/TtCouponChannelVo.java index 797de8b5c..05e2af9c3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/TtCouponChannelVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/TtCouponChannelVo.java @@ -1,17 +1,11 @@ package com.iformall.domain.vo; -import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.iformall.domain.po.WxCoupon; -import com.iformall.domain.po.WxCouponChannel; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; /** * Created by syf on 2018/8/22. diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/TtCouponVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/TtCouponVo.java index a583d30cf..21f03e878 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/TtCouponVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/TtCouponVo.java @@ -1,6 +1,5 @@ package com.iformall.domain.vo; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.iformall.domain.po.WxCoupon; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/TtMallGoodsCategoryVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/TtMallGoodsCategoryVo.java index ba0cffe62..8590057ad 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/TtMallGoodsCategoryVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/TtMallGoodsCategoryVo.java @@ -1,13 +1,10 @@ package com.iformall.domain.vo; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.TtGoodsCategory; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; import java.util.List; @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/UserCountVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/UserCountVo.java index 623acb1a8..a286a20b8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/UserCountVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/UserCountVo.java @@ -3,7 +3,6 @@ package com.iformall.domain.vo; import lombok.Data; import java.io.Serializable; -import java.text.DecimalFormat; /** * 会员结构vo diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/UserTaskVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/UserTaskVo.java index 957b7df79..d0439da49 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/UserTaskVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/UserTaskVo.java @@ -1,6 +1,7 @@ package com.iformall.domain.vo; import lombok.Data; + import java.io.Serializable; import java.util.List; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/UserTradeRecordVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/UserTradeRecordVo.java index 76c7541c2..3b9e23fee 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/UserTradeRecordVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/UserTradeRecordVo.java @@ -2,6 +2,7 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; + import java.io.Serializable; @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSettleVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSettleVo.java index fe55ed2c8..826f44561 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSettleVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSettleVo.java @@ -2,7 +2,6 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.ToString; /** diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCUserBasicTagVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCUserBasicTagVo.java index 4caf02df3..65467ac0c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCUserBasicTagVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCUserBasicTagVo.java @@ -1,7 +1,6 @@ package com.iformall.domain.vo; import com.iformall.domain.po.WxCUserBasicInfo; - import lombok.AllArgsConstructor; import lombok.Data; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardPriceTemplate.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardPriceTemplate.java index 28accfcaa..e6064efbb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardPriceTemplate.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardPriceTemplate.java @@ -1,13 +1,10 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; -import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; import java.io.Serializable; -import java.math.BigDecimal; @Data public class WxCardPriceTemplate implements Serializable { diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendMerchantVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendMerchantVo.java index 6114d9128..33b4301e8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendMerchantVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendMerchantVo.java @@ -1,10 +1,11 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; -import java.math.BigDecimal; import lombok.Data; import lombok.ToString; +import java.math.BigDecimal; + @Data @ToString(callSuper = true) public class WxCardSpendMerchantVo { diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java index 46268bb8c..7d31f6ae2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java @@ -1,10 +1,6 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; - -import java.util.Date; -import java.util.List; - import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.domain.po.WxCardInfo; import com.iformall.domain.po.WxCardSpend; @@ -12,6 +8,9 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; +import java.util.Date; +import java.util.List; + @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelAddVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelAddVo.java index abdc76824..1d0a2cfb7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelAddVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelAddVo.java @@ -3,7 +3,6 @@ package com.iformall.domain.vo; import com.iformall.domain.po.WxCoupon; import lombok.Data; -import java.beans.Transient; import java.io.Serializable; import java.util.Date; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java index fa7c089c0..01ab127e9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java @@ -2,7 +2,6 @@ package com.iformall.domain.vo; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.iformall.common.SortColumn; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponChannel; import lombok.Data; @@ -11,7 +10,6 @@ import lombok.ToString; import java.io.Serializable; import java.math.BigDecimal; - import java.util.Date; import java.util.List; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java index d46ce7d63..47cd7c200 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java @@ -2,23 +2,19 @@ package com.iformall.domain.vo; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.iformall.common.ErrorCode; -import com.iformall.common.ResultData; import com.iformall.common.SortColumn; import com.iformall.domain.po.WxCouponOrder; import com.iformall.utils.Base64Util; import com.iformall.utils.DateUtils; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; +import org.apache.commons.lang3.StringUtils; import java.math.BigDecimal; import java.util.Date; import java.util.List; -import org.apache.commons.lang3.StringUtils; - @JsonIgnoreProperties(value = {"handler"}) @Data @ToString(callSuper = true) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCarCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCarCVo.java index 24f822cbf..bb1c799b0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCarCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCarCVo.java @@ -1,13 +1,10 @@ package com.iformall.domain.vo; import com.baomidou.mybatisplus.annotation.TableField; -import com.iformall.domain.po.WxCouponOrder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import java.util.List; - @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponPasswordVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponPasswordVo.java index b768578ab..cc5573cfd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponPasswordVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponPasswordVo.java @@ -1,20 +1,13 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; -import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.iformall.domain.po.WxCouponOrder; import com.iformall.domain.po.base.TenantEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.text.DecimalFormat; import java.util.Date; -import java.util.List; @JsonIgnoreProperties(value = {"handler"}) @Data @ToString(callSuper = true) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponStatisVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponStatisVo.java index 144566a73..ab0f3059f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponStatisVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponStatisVo.java @@ -2,7 +2,6 @@ package com.iformall.domain.vo; import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.domain.po.WxCoupon; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java index f5bbb1f7d..0310b607a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java @@ -1,10 +1,8 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; - import com.iformall.domain.po.WxCreditHistory; import com.iformall.domain.po.base.BaseTenantEntity; -import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantProductVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantProductVo.java index 4ea56653d..944bda57b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantProductVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantProductVo.java @@ -5,9 +5,6 @@ import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; -import java.util.List; - @JsonIgnoreProperties(value = {"handler"}) @Data @EqualsAndHashCode(callSuper = true) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java index 0077440df..c5db381e1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java @@ -3,7 +3,6 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.domain.po.base.TenantEntity; -import com.iformall.enums.EnumSubBusiness; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -11,8 +10,6 @@ import lombok.ToString; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; @Data @ToString(callSuper = true) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDetailVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDetailVo.java index b55df4591..ffb4bd320 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDetailVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDetailVo.java @@ -5,6 +5,7 @@ import com.iformall.domain.po.base.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; + import java.util.Date; @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponPressVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponPressVo.java index c0355ae9c..86f193083 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponPressVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponPressVo.java @@ -2,7 +2,6 @@ package com.iformall.domain.vo; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.iformall.domain.po.WxOrder; -import com.iformall.domain.po.WxOrderPress; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java index be1752080..79e1ba467 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java @@ -1,16 +1,15 @@ package com.iformall.domain.vo; -import java.util.Date; -import java.util.List; - +import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.domain.po.base.TenantEntity; - -import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; +import java.util.Date; +import java.util.List; + @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderPayExpVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderPayExpVo.java index a33fbdb06..83bc1c091 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderPayExpVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderPayExpVo.java @@ -1,11 +1,6 @@ package com.iformall.domain.vo; -import com.iformall.domain.po.WxCUserBasicInfo; -import com.iformall.domain.po.WxMerchant; -import com.iformall.domain.po.WxMerchantBUser; -import com.iformall.domain.po.WxOrder; -import com.iformall.domain.po.WxPayOrder; - +import com.iformall.domain.po.*; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderPayVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderPayVo.java index d81bb0f69..a576da0c0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderPayVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderPayVo.java @@ -9,8 +9,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import java.util.List; - @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxParkCouponConfig.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxParkCouponConfig.java index e73d70226..0e432927e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxParkCouponConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxParkCouponConfig.java @@ -1,14 +1,13 @@ package com.iformall.domain.vo; -import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; - -import org.apache.commons.lang3.StringUtils; - import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import org.apache.commons.lang3.StringUtils; + +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; public class WxParkCouponConfig implements Serializable{ diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java index f4da81be9..50a937934 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java @@ -1,7 +1,6 @@ package com.iformall.domain.vo; import com.baomidou.mybatisplus.annotation.TableField; -import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java index 4338fe464..db742d83d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java @@ -1,11 +1,8 @@ package com.iformall.domain.vo; +import cn.afterturn.easypoi.excel.annotation.Excel; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.domain.po.base.TenantEntity; - -import cn.afterturn.easypoi.excel.annotation.Excel; import com.iformall.service.order.entity.WxComposeChildOrderShare; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java index 642fed370..135e18c52 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java @@ -1,6 +1,5 @@ package com.iformall.domain.vo; -import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxThirdPartyOrdersVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxThirdPartyOrdersVo.java index 87bc11169..2e79997c2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxThirdPartyOrdersVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxThirdPartyOrdersVo.java @@ -2,8 +2,6 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.BusinessCircleBase; import com.iformall.domain.po.WxCUserBasicInfo; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.base.TenantEntity; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/excel/WxCardData.java b/mallinkService/src/main/java/com/iformall/domain/vo/excel/WxCardData.java index 64225f2f2..f8f6de6f4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/excel/WxCardData.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/excel/WxCardData.java @@ -1,10 +1,8 @@ package com.iformall.domain.vo.excel; +import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableField; -import com.iformall.domain.po.WxCoupon; import com.iformall.domain.vo.WxCouponStatisVo; - -import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/excel/WxCouponData.java b/mallinkService/src/main/java/com/iformall/domain/vo/excel/WxCouponData.java index 92239d910..9f296af2e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/excel/WxCouponData.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/excel/WxCouponData.java @@ -1,10 +1,8 @@ package com.iformall.domain.vo.excel; +import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableField; -import com.iformall.domain.po.WxCoupon; import com.iformall.domain.vo.WxCouponStatisVo; - -import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/excel/WxPressData.java b/mallinkService/src/main/java/com/iformall/domain/vo/excel/WxPressData.java index 95a2b3281..07bd41331 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/excel/WxPressData.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/excel/WxPressData.java @@ -1,10 +1,8 @@ package com.iformall.domain.vo.excel; +import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableField; -import com.iformall.domain.po.WxCoupon; import com.iformall.domain.vo.WxCouponStatisVo; - -import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestDemandVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestDemandVo.java index 9d60f375e..e3d670e26 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestDemandVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestDemandVo.java @@ -1,9 +1,9 @@ package com.iformall.domain.vo.invest; -import com.iformall.domain.po.invest.InvestCustomerEntity; -import com.iformall.domain.po.invest.InvestDemandEntity; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBrand; +import com.iformall.domain.po.invest.InvestCustomerEntity; +import com.iformall.domain.po.invest.InvestDemandEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestPageQuery.java b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestPageQuery.java index 9b91eaf08..0af7c441d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestPageQuery.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestPageQuery.java @@ -3,8 +3,6 @@ package com.iformall.domain.vo.invest; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.List; - @Data @NoArgsConstructor public class InvestPageQuery { diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestRemindVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestRemindVo.java index 441243b15..d81846e14 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestRemindVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestRemindVo.java @@ -4,7 +4,6 @@ import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBrand; import com.iformall.domain.po.invest.InvestCustomerEntity; import com.iformall.domain.po.invest.InvestRemindEntity; -import com.iformall.enums.EnumNegotiationType; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestTaskVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestTaskVo.java index 408ba09f1..e69aa6619 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestTaskVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestTaskVo.java @@ -1,7 +1,7 @@ package com.iformall.domain.vo.invest; -import com.iformall.domain.po.invest.InvestTaskEntity; import com.iformall.domain.po.MallUserInfo; +import com.iformall.domain.po.invest.InvestTaskEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/TtMaMsgService.java b/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/TtMaMsgService.java index f85750c87..6cb4cb853 100644 --- a/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/TtMaMsgService.java +++ b/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/TtMaMsgService.java @@ -1,7 +1,5 @@ package com.iformall.douyin.miniapp.api; -import cn.binarywang.wx.miniapp.bean.*; -import com.google.gson.JsonObject; import com.iformall.douyin.miniapp.api.bean.TtMaSubscribeMessage; import me.chanjar.weixin.common.error.WxErrorException; diff --git a/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/TtMaUserService.java b/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/TtMaUserService.java index 42a81942e..98aeaf60c 100644 --- a/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/TtMaUserService.java +++ b/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/TtMaUserService.java @@ -5,8 +5,6 @@ import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo; import cn.binarywang.wx.miniapp.bean.WxMaUserInfo; import me.chanjar.weixin.common.error.WxErrorException; -import java.util.Map; - /** * 用户信息相关操作接口. * diff --git a/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/bean/TtMaGsonBuilder.java b/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/bean/TtMaGsonBuilder.java index 410adfdf6..2bec99c3b 100644 --- a/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/bean/TtMaGsonBuilder.java +++ b/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/bean/TtMaGsonBuilder.java @@ -1,14 +1,5 @@ package com.iformall.douyin.miniapp.api.bean; -import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage; -import cn.binarywang.wx.miniapp.bean.WxMaTemplateMessage; -import cn.binarywang.wx.miniapp.bean.WxMaUniformMessage; -import cn.binarywang.wx.miniapp.bean.analysis.WxMaRetainInfo; -import cn.binarywang.wx.miniapp.bean.analysis.WxMaUserPortrait; -import cn.binarywang.wx.miniapp.bean.analysis.WxMaVisitDistribution; -import cn.binarywang.wx.miniapp.bean.code.WxMaCodeCommitRequest; -import cn.binarywang.wx.miniapp.bean.code.WxMaCodeVersionDistribution; -import cn.binarywang.wx.miniapp.util.json.*; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/bean/TtMaSubscribeMessage.java b/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/bean/TtMaSubscribeMessage.java index 59553694b..90508202d 100644 --- a/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/bean/TtMaSubscribeMessage.java +++ b/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/bean/TtMaSubscribeMessage.java @@ -1,6 +1,5 @@ package com.iformall.douyin.miniapp.api.bean; -import com.alibaba.fastjson.JSONObject; import com.google.gson.JsonObject; import lombok.*; diff --git a/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/impl/TtMaMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/impl/TtMaMsgServiceImpl.java index 406f48589..90b097a7b 100644 --- a/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/impl/TtMaMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/impl/TtMaMsgServiceImpl.java @@ -1,7 +1,5 @@ package com.iformall.douyin.miniapp.api.impl; -import cn.binarywang.wx.miniapp.bean.*; -import cn.binarywang.wx.miniapp.constant.WxMaConstants; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.iformall.douyin.miniapp.api.TtMaMsgService; diff --git a/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/impl/TtMaServiceImpl.java b/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/impl/TtMaServiceImpl.java index 176a782b2..9baaa6291 100644 --- a/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/impl/TtMaServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/impl/TtMaServiceImpl.java @@ -4,11 +4,12 @@ import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; import cn.binarywang.wx.miniapp.config.WxMaConfig; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.google.common.base.Joiner; import com.google.gson.Gson; -import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import com.iformall.douyin.miniapp.api.*; +import com.iformall.douyin.miniapp.api.TtMaMsgService; +import com.iformall.douyin.miniapp.api.TtMaQrcodeService; +import com.iformall.douyin.miniapp.api.TtMaService; +import com.iformall.douyin.miniapp.api.TtMaUserService; import com.iformall.douyin.miniapp.api.bean.TtMaGsonBuilder; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.WxType; @@ -20,11 +21,9 @@ import me.chanjar.weixin.common.util.crypto.SHA1; import me.chanjar.weixin.common.util.http.*; import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder; import me.chanjar.weixin.common.util.http.apache.DefaultApacheHttpClientBuilder; -import me.chanjar.weixin.common.util.json.WxGsonBuilder; import org.apache.http.HttpHost; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.BasicResponseHandler; diff --git a/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/impl/TtMaUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/impl/TtMaUserServiceImpl.java index 8ca0dbde9..bda9dc599 100644 --- a/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/impl/TtMaUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/impl/TtMaUserServiceImpl.java @@ -10,8 +10,6 @@ import lombok.AllArgsConstructor; import me.chanjar.weixin.common.error.WxErrorException; import org.apache.commons.codec.digest.DigestUtils; -import java.util.Map; - /** * @author Binary Wang */ diff --git a/mallinkService/src/main/java/com/iformall/douyin/pay/DouYinPayHelper.java b/mallinkService/src/main/java/com/iformall/douyin/pay/DouYinPayHelper.java index ef3c1343f..2ee6d02bd 100644 --- a/mallinkService/src/main/java/com/iformall/douyin/pay/DouYinPayHelper.java +++ b/mallinkService/src/main/java/com/iformall/douyin/pay/DouYinPayHelper.java @@ -1,24 +1,22 @@ package com.iformall.douyin.pay; -import java.nio.charset.StandardCharsets; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.*; - +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.iformall.common.ErrorCode; import com.iformall.douyin.pay.orderQuery.*; import com.iformall.douyin.pay.preOrder.*; import com.iformall.enums.EnumPayStatus; import com.iformall.exception.MallinkException; -import com.iformall.utils.sign.SignUtils; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.iformall.utils.HttpUtil; - +import com.iformall.utils.sign.SignUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.*; + /** * 抖音小程序支付 * https://microapp.bytedance.com/docs/zh-CN/mini-app/develop/api/open-interface/payment/secure/YE diff --git a/mallinkService/src/main/java/com/iformall/douyin/pay/ProfitSharingV2Service.java b/mallinkService/src/main/java/com/iformall/douyin/pay/ProfitSharingV2Service.java index b9f0d29e7..f96abb849 100644 --- a/mallinkService/src/main/java/com/iformall/douyin/pay/ProfitSharingV2Service.java +++ b/mallinkService/src/main/java/com/iformall/douyin/pay/ProfitSharingV2Service.java @@ -2,7 +2,6 @@ package com.iformall.douyin.pay; import com.iformall.douyin.pay.exception.TtPayException; import com.iformall.douyin.payv2.request.ProfitSharingRequest; -import com.iformall.douyin.payv2.result.ProfitSharingResult; import com.iformall.douyin.payv2.result.TtSettleResult; import java.util.List; diff --git a/mallinkService/src/main/java/com/iformall/douyin/pay/impl/BaseTtPayServiceImpl.java b/mallinkService/src/main/java/com/iformall/douyin/pay/impl/BaseTtPayServiceImpl.java index 893f0c9de..29ca278d4 100644 --- a/mallinkService/src/main/java/com/iformall/douyin/pay/impl/BaseTtPayServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/douyin/pay/impl/BaseTtPayServiceImpl.java @@ -3,8 +3,6 @@ package com.iformall.douyin.pay.impl; import com.alibaba.fastjson.TypeReference; import com.github.binarywang.wxpay.bean.WxPayApiData; import com.github.binarywang.wxpay.bean.ecommerce.SignatureHeader; -import com.github.binarywang.wxpay.exception.WxPayException; -import com.github.binarywang.wxpay.v3.util.AesUtils; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.iformall.douyin.pay.ProfitSharingV2Service; @@ -17,10 +15,10 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; import java.nio.charset.StandardCharsets; -import java.security.GeneralSecurityException; -import java.util.*; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; /** *
diff --git a/mallinkService/src/main/java/com/iformall/douyin/pay/impl/TtPayServiceApacheHttpImpl.java b/mallinkService/src/main/java/com/iformall/douyin/pay/impl/TtPayServiceApacheHttpImpl.java
index 2479959d2..23cfdafe4 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/pay/impl/TtPayServiceApacheHttpImpl.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/pay/impl/TtPayServiceApacheHttpImpl.java
@@ -15,7 +15,6 @@ import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.util.EntityUtils;
 
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 
 
diff --git a/mallinkService/src/main/java/com/iformall/douyin/pay/preOrder/DouYinCreatePreOrder.java b/mallinkService/src/main/java/com/iformall/douyin/pay/preOrder/DouYinCreatePreOrder.java
index 4a5bff559..63a87cfb3 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/pay/preOrder/DouYinCreatePreOrder.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/pay/preOrder/DouYinCreatePreOrder.java
@@ -1,13 +1,12 @@
 package com.iformall.douyin.pay.preOrder;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import com.iformall.douyin.pay.DouYinPayHelper;
-
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @Data
 public class DouYinCreatePreOrder {
 
diff --git a/mallinkService/src/main/java/com/iformall/douyin/pay/preOrder/SettleResult.java b/mallinkService/src/main/java/com/iformall/douyin/pay/preOrder/SettleResult.java
index f63643749..32c9e1a6a 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/pay/preOrder/SettleResult.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/pay/preOrder/SettleResult.java
@@ -1,11 +1,7 @@
 package com.iformall.douyin.pay.preOrder;
 
-import com.iformall.douyin.pay.DouYinPayHelper;
 import lombok.Data;
 
-import java.util.HashMap;
-import java.util.Map;
-
 @Data
 public class SettleResult {
 
diff --git a/mallinkService/src/main/java/com/iformall/douyin/payv2/auth/CertificatesVerifier.java b/mallinkService/src/main/java/com/iformall/douyin/payv2/auth/CertificatesVerifier.java
index dcbfd0389..36c286bf8 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/payv2/auth/CertificatesVerifier.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/payv2/auth/CertificatesVerifier.java
@@ -1,10 +1,7 @@
 package com.iformall.douyin.payv2.auth;
 
-import com.iformall.douyin.payv2.util.PemUtils;
 import me.chanjar.weixin.common.error.WxRuntimeException;
 
-import java.io.ByteArrayInputStream;
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.security.*;
 import java.util.Base64;
diff --git a/mallinkService/src/main/java/com/iformall/douyin/payv2/config/TtPayConfig.java b/mallinkService/src/main/java/com/iformall/douyin/payv2/config/TtPayConfig.java
index 2a130ef35..7c6fc03d3 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/payv2/config/TtPayConfig.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/payv2/config/TtPayConfig.java
@@ -12,6 +12,7 @@ import lombok.SneakyThrows;
 import org.apache.commons.lang3.RegExUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.impl.client.CloseableHttpClient;
+
 import java.io.*;
 import java.net.URL;
 import java.security.PrivateKey;
diff --git a/mallinkService/src/main/java/com/iformall/douyin/payv2/request/CallBackSettingsRequest.java b/mallinkService/src/main/java/com/iformall/douyin/payv2/request/CallBackSettingsRequest.java
index 354f5b552..dc1386d1d 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/payv2/request/CallBackSettingsRequest.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/payv2/request/CallBackSettingsRequest.java
@@ -6,7 +6,6 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  *
diff --git a/mallinkService/src/main/java/com/iformall/douyin/payv2/request/TtPayRefundQueryV2Request.java b/mallinkService/src/main/java/com/iformall/douyin/payv2/request/TtPayRefundQueryV2Request.java
index 5af00d555..130a5d9bc 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/payv2/request/TtPayRefundQueryV2Request.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/payv2/request/TtPayRefundQueryV2Request.java
@@ -6,7 +6,6 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * 
diff --git a/mallinkService/src/main/java/com/iformall/douyin/payv2/request/TtRefundAuditMsgRequest.java b/mallinkService/src/main/java/com/iformall/douyin/payv2/request/TtRefundAuditMsgRequest.java
index f5429273b..20537632f 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/payv2/request/TtRefundAuditMsgRequest.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/payv2/request/TtRefundAuditMsgRequest.java
@@ -6,7 +6,6 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * 
diff --git a/mallinkService/src/main/java/com/iformall/douyin/payv2/result/CreateOrderCallback.java b/mallinkService/src/main/java/com/iformall/douyin/payv2/result/CreateOrderCallback.java
index f7aa1b86f..b0de393e5 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/payv2/result/CreateOrderCallback.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/payv2/result/CreateOrderCallback.java
@@ -1,6 +1,5 @@
 package com.iformall.douyin.payv2.result;
 
-import cn.binarywang.wx.miniapp.bean.WxMaGetLiveInfo;
 import com.google.gson.annotations.SerializedName;
 import lombok.Data;
 import lombok.NoArgsConstructor;
diff --git a/mallinkService/src/main/java/com/iformall/douyin/payv2/result/TtPayOrderQueryV2Result.java b/mallinkService/src/main/java/com/iformall/douyin/payv2/result/TtPayOrderQueryV2Result.java
index b6d23e911..a76409556 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/payv2/result/TtPayOrderQueryV2Result.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/payv2/result/TtPayOrderQueryV2Result.java
@@ -1,12 +1,10 @@
 package com.iformall.douyin.payv2.result;
 
 import com.google.gson.annotations.SerializedName;
-import io.swagger.models.auth.In;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * 
diff --git a/mallinkService/src/main/java/com/iformall/douyin/payv2/result/TtSettleResult.java b/mallinkService/src/main/java/com/iformall/douyin/payv2/result/TtSettleResult.java
index df2879dc4..9f93cbf25 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/payv2/result/TtSettleResult.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/payv2/result/TtSettleResult.java
@@ -5,7 +5,6 @@ import com.google.gson.annotations.SerializedName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * 请求分账API返回的分账结果实体
diff --git a/mallinkService/src/main/java/com/iformall/douyin/payv2/util/TtPayV2HttpClientBuilder.java b/mallinkService/src/main/java/com/iformall/douyin/payv2/util/TtPayV2HttpClientBuilder.java
index fde3552e7..367f49b1c 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/payv2/util/TtPayV2HttpClientBuilder.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/payv2/util/TtPayV2HttpClientBuilder.java
@@ -1,6 +1,9 @@
 package com.iformall.douyin.payv2.util;
 
-import com.iformall.douyin.payv2.auth.*;
+import com.iformall.douyin.payv2.auth.CertificatesVerifier;
+import com.iformall.douyin.payv2.auth.PrivateKeySigner;
+import com.iformall.douyin.payv2.auth.TtPayCredentials;
+import com.iformall.douyin.payv2.auth.TtPayValidator;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.execchain.ClientExecChain;
diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/api/basic/TtBasicServiceImpl.java b/mallinkService/src/main/java/com/iformall/douyin/web/api/basic/TtBasicServiceImpl.java
index b1dbf2ac0..e528b9a4e 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/web/api/basic/TtBasicServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/web/api/basic/TtBasicServiceImpl.java
@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
 import com.google.gson.JsonParser;
-import com.iformall.douyin.web.api.*;
 import com.iformall.douyin.web.config.TtWebConfig;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.WxType;
@@ -12,7 +11,9 @@ import me.chanjar.weixin.common.bean.WxAccessToken;
 import me.chanjar.weixin.common.error.WxError;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.common.util.DataUtils;
-import me.chanjar.weixin.common.util.http.*;
+import me.chanjar.weixin.common.util.http.HttpType;
+import me.chanjar.weixin.common.util.http.RequestExecutor;
+import me.chanjar.weixin.common.util.http.RequestHttp;
 import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
 import me.chanjar.weixin.common.util.http.apache.DefaultApacheHttpClientBuilder;
 import org.apache.http.HttpHost;
@@ -27,7 +28,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.locks.Lock;
 
-import static com.iformall.douyin.web.config.TtWebConstants.ErrorCode.*;
+import static com.iformall.douyin.web.config.TtWebConstants.ErrorCode.ERR_200104;
+import static com.iformall.douyin.web.config.TtWebConstants.ErrorCode.ERR_2190008;
 
 
 /**
diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/api/basic/TtWebGetRequestExecutor.java b/mallinkService/src/main/java/com/iformall/douyin/web/api/basic/TtWebGetRequestExecutor.java
index 5d740b0ad..b5e5c33dc 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/web/api/basic/TtWebGetRequestExecutor.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/web/api/basic/TtWebGetRequestExecutor.java
@@ -2,7 +2,6 @@ package com.iformall.douyin.web.api.basic;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.WxType;
 import me.chanjar.weixin.common.error.WxError;
 import me.chanjar.weixin.common.error.WxErrorException;
diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/api/goodlifesaas/TtGoodLifeSaasService.java b/mallinkService/src/main/java/com/iformall/douyin/web/api/goodlifesaas/TtGoodLifeSaasService.java
index 84d1ed894..8c13bdb84 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/web/api/goodlifesaas/TtGoodLifeSaasService.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/web/api/goodlifesaas/TtGoodLifeSaasService.java
@@ -1,10 +1,6 @@
 package com.iformall.douyin.web.api.goodlifesaas;
 
 import com.iformall.douyin.web.api.basic.TtBasicService;
-import com.iformall.douyin.web.api.web.TtWebGoodsService;
-import com.iformall.douyin.web.api.web.TtWebPoiPlanService;
-import com.iformall.douyin.web.api.web.TtWebProductService;
-import com.iformall.douyin.web.api.web.TtWebShopMatchService;
 /**
  *
  */
diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/api/goodlifesaas/impl/TtGoodLifeSaasGoodsServiceImpl.java b/mallinkService/src/main/java/com/iformall/douyin/web/api/goodlifesaas/impl/TtGoodLifeSaasGoodsServiceImpl.java
index d94e0e2a8..b276e7f91 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/web/api/goodlifesaas/impl/TtGoodLifeSaasGoodsServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/web/api/goodlifesaas/impl/TtGoodLifeSaasGoodsServiceImpl.java
@@ -2,7 +2,8 @@ package com.iformall.douyin.web.api.goodlifesaas.impl;
 
 import com.alibaba.fastjson.TypeReference;
 import com.google.gson.*;
-import com.iformall.douyin.web.api.basic.*;
+import com.iformall.douyin.web.api.basic.TtWebGetRequestExecutor;
+import com.iformall.douyin.web.api.basic.TtWebPostRequestExecutor;
 import com.iformall.douyin.web.api.goodlifesaas.TtGoodLifeSaasGoodsService;
 import com.iformall.douyin.web.api.goodlifesaas.TtGoodLifeSaasService;
 import com.iformall.douyin.web.bean.*;
@@ -11,6 +12,7 @@ import me.chanjar.weixin.common.error.WxError;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.common.util.json.GsonHelper;
 import org.apache.commons.lang3.StringUtils;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/api/goodlifesaas/impl/TtGoodLifeSaasPoiPlanServiceImpl.java b/mallinkService/src/main/java/com/iformall/douyin/web/api/goodlifesaas/impl/TtGoodLifeSaasPoiPlanServiceImpl.java
index b877012ea..63fd4922d 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/web/api/goodlifesaas/impl/TtGoodLifeSaasPoiPlanServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/web/api/goodlifesaas/impl/TtGoodLifeSaasPoiPlanServiceImpl.java
@@ -7,7 +7,6 @@ import com.google.gson.GsonBuilder;
 import com.iformall.douyin.web.api.basic.TtWebPostRequestExecutor;
 import com.iformall.douyin.web.api.goodlifesaas.TtGoodLifeSaasPoiPlanService;
 import com.iformall.douyin.web.api.goodlifesaas.TtGoodLifeSaasService;
-import com.iformall.douyin.web.api.web.TtWebService;
 import com.iformall.douyin.web.bean.*;
 import lombok.AllArgsConstructor;
 import me.chanjar.weixin.common.error.WxErrorException;
diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/api/order/TtWebOrderService.java b/mallinkService/src/main/java/com/iformall/douyin/web/api/order/TtWebOrderService.java
index 248e8d00d..9541e5f5b 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/web/api/order/TtWebOrderService.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/web/api/order/TtWebOrderService.java
@@ -1,16 +1,12 @@
 package com.iformall.douyin.web.api.order;
 
 
-import com.iformall.douyin.pay.exception.TtPayException;
 import com.iformall.douyin.payv2.request.TtOrderPushDeliveryRequest;
 import com.iformall.douyin.payv2.request.TtPayOrderQueryV2Request;
 import com.iformall.douyin.payv2.result.TtPayCpsOrderQueryV2Result;
 import com.iformall.douyin.payv2.result.TtPayOrderQueryV2Result;
-import com.iformall.douyin.web.bean.*;
 import me.chanjar.weixin.common.error.WxErrorException;
 
-import java.util.List;
-
 /**
  * 接入商品库
  *
diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/api/order/TtWebPayService.java b/mallinkService/src/main/java/com/iformall/douyin/web/api/order/TtWebPayService.java
index ed8c85247..7d41db3df 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/web/api/order/TtWebPayService.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/web/api/order/TtWebPayService.java
@@ -1,10 +1,6 @@
 package com.iformall.douyin.web.api.order;
 
 import com.iformall.douyin.web.api.basic.TtBasicService;
-import com.iformall.douyin.web.api.web.TtWebGoodsService;
-import com.iformall.douyin.web.api.web.TtWebPoiPlanService;
-import com.iformall.douyin.web.api.web.TtWebProductService;
-import com.iformall.douyin.web.api.web.TtWebShopMatchService;
 
 /**
  *
diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/api/order/TtWebRefundService.java b/mallinkService/src/main/java/com/iformall/douyin/web/api/order/TtWebRefundService.java
index f3341c11b..a73ed6c6b 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/web/api/order/TtWebRefundService.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/web/api/order/TtWebRefundService.java
@@ -1,20 +1,14 @@
 package com.iformall.douyin.web.api.order;
 
 
-import com.github.binarywang.wxpay.bean.ecommerce.SignatureHeader;
 import com.iformall.douyin.pay.exception.TtPayException;
-import com.iformall.douyin.payv2.request.ProfitSharingRequest;
 import com.iformall.douyin.payv2.request.TtPayRefundQueryV2Request;
 import com.iformall.douyin.payv2.request.TtPayRefundV2Request;
 import com.iformall.douyin.payv2.request.TtRefundAuditMsgRequest;
-import com.iformall.douyin.payv2.result.RefundOrderCallback;
 import com.iformall.douyin.payv2.result.TtPayRefundQueryV2Result;
 import com.iformall.douyin.payv2.result.TtPayRefundV2Result;
-import com.iformall.douyin.payv2.result.TtSettleResult;
 import me.chanjar.weixin.common.error.WxErrorException;
 
-import java.util.List;
-
 /**
  * 接入商品库
  *
diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/api/order/TtWebShareService.java b/mallinkService/src/main/java/com/iformall/douyin/web/api/order/TtWebShareService.java
index 5b57c49e8..6a19258ce 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/web/api/order/TtWebShareService.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/web/api/order/TtWebShareService.java
@@ -1,13 +1,7 @@
 package com.iformall.douyin.web.api.order;
 
 
-import com.iformall.douyin.pay.exception.TtPayException;
 import com.iformall.douyin.payv2.request.ProfitSharingRequest;
-import com.iformall.douyin.payv2.request.TtOrderPushDeliveryRequest;
-import com.iformall.douyin.payv2.request.TtPayOrderQueryV2Request;
-import com.iformall.douyin.payv2.result.ProfitSharingResult;
-import com.iformall.douyin.payv2.result.TtPayCpsOrderQueryV2Result;
-import com.iformall.douyin.payv2.result.TtPayOrderQueryV2Result;
 import com.iformall.douyin.payv2.result.TtSettleResult;
 import me.chanjar.weixin.common.error.WxErrorException;
 
diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/api/order/TtWebSolutionService.java b/mallinkService/src/main/java/com/iformall/douyin/web/api/order/TtWebSolutionService.java
index 85cf9a190..ecc7168e8 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/web/api/order/TtWebSolutionService.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/web/api/order/TtWebSolutionService.java
@@ -2,7 +2,6 @@ package com.iformall.douyin.web.api.order;
 
 import com.iformall.douyin.payv2.request.TtSolutionSetImplRequest;
 import com.iformall.douyin.payv2.result.Templateeffabilityimpl;
-import com.iformall.douyin.payv2.result.TtPayOrderQueryV2Result;
 import me.chanjar.weixin.common.error.WxErrorException;
 
 import java.util.List;
diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/api/order/impl/TtWebOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/douyin/web/api/order/impl/TtWebOrderServiceImpl.java
index c7c2a0220..e1f38fe9c 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/web/api/order/impl/TtWebOrderServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/web/api/order/impl/TtWebOrderServiceImpl.java
@@ -1,30 +1,19 @@
 package com.iformall.douyin.web.api.order.impl;
 
-import com.alibaba.fastjson.TypeReference;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import com.iformall.douyin.pay.exception.TtPayException;
 import com.iformall.douyin.payv2.request.TtOrderPushDeliveryRequest;
 import com.iformall.douyin.payv2.request.TtPayOrderQueryV2Request;
-import com.iformall.douyin.payv2.result.BaseTtPayResult;
 import com.iformall.douyin.payv2.result.TtPayCpsOrderQueryV2Result;
 import com.iformall.douyin.payv2.result.TtPayOrderQueryV2Result;
 import com.iformall.douyin.web.api.basic.TtWebPostRequestExecutor;
 import com.iformall.douyin.web.api.order.TtWebOrderService;
 import com.iformall.douyin.web.api.order.TtWebPayService;
-import com.iformall.douyin.web.api.web.*;
-import com.iformall.douyin.web.bean.*;
-import com.iformall.enums.EnumPayStatus;
-import com.iformall.service.pay.service.pay.entity.PayQueryAdapterResult;
 import lombok.AllArgsConstructor;
-import me.chanjar.weixin.common.error.WxError;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/api/order/impl/TtWebPayServiceImpl.java b/mallinkService/src/main/java/com/iformall/douyin/web/api/order/impl/TtWebPayServiceImpl.java
index 47675dca8..77a717b24 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/web/api/order/impl/TtWebPayServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/web/api/order/impl/TtWebPayServiceImpl.java
@@ -2,11 +2,6 @@ package com.iformall.douyin.web.api.order.impl;
 
 import com.iformall.douyin.web.api.basic.TtBasicServiceImpl;
 import com.iformall.douyin.web.api.order.*;
-import com.iformall.douyin.web.api.web.*;
-import com.iformall.douyin.web.api.web.impl.TtWebGoodsServiceImpl;
-import com.iformall.douyin.web.api.web.impl.TtWebPoiPlanServiceImpl;
-import com.iformall.douyin.web.api.web.impl.TtWebProductServiceImpl;
-import com.iformall.douyin.web.api.web.impl.TtWebShopMatchServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 
 
diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/api/order/impl/TtWebRefundServiceImpl.java b/mallinkService/src/main/java/com/iformall/douyin/web/api/order/impl/TtWebRefundServiceImpl.java
index 663b4363e..6603ea24c 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/web/api/order/impl/TtWebRefundServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/web/api/order/impl/TtWebRefundServiceImpl.java
@@ -1,25 +1,17 @@
 package com.iformall.douyin.web.api.order.impl;
 
-import com.alibaba.fastjson.TypeReference;
-import com.github.binarywang.wxpay.bean.ecommerce.SignatureHeader;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.iformall.douyin.payv2.request.ProfitSharingRequest;
 import com.iformall.douyin.payv2.request.TtPayRefundQueryV2Request;
 import com.iformall.douyin.payv2.request.TtPayRefundV2Request;
 import com.iformall.douyin.payv2.request.TtRefundAuditMsgRequest;
-import com.iformall.douyin.payv2.result.*;
+import com.iformall.douyin.payv2.result.TtPayRefundQueryV2Result;
+import com.iformall.douyin.payv2.result.TtPayRefundV2Result;
 import com.iformall.douyin.web.api.basic.TtWebPostRequestExecutor;
 import com.iformall.douyin.web.api.order.TtWebPayService;
 import com.iformall.douyin.web.api.order.TtWebRefundService;
-import com.iformall.douyin.web.api.order.TtWebShareService;
 import lombok.AllArgsConstructor;
 import me.chanjar.weixin.common.error.WxErrorException;
-import me.chanjar.weixin.common.util.json.GsonHelper;
-
-import java.util.List;
 
 /**
  *
diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/api/order/impl/TtWebShareServiceImpl.java b/mallinkService/src/main/java/com/iformall/douyin/web/api/order/impl/TtWebShareServiceImpl.java
index 4b3c30ec9..8e9fa6a84 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/web/api/order/impl/TtWebShareServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/web/api/order/impl/TtWebShareServiceImpl.java
@@ -6,21 +6,13 @@ import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.iformall.douyin.payv2.request.ProfitSharingRequest;
-import com.iformall.douyin.payv2.request.TtOrderPushDeliveryRequest;
-import com.iformall.douyin.payv2.request.TtPayOrderQueryV2Request;
-import com.iformall.douyin.payv2.result.ProfitSharingResult;
-import com.iformall.douyin.payv2.result.TtPayCpsOrderQueryV2Result;
-import com.iformall.douyin.payv2.result.TtPayOrderQueryV2Result;
 import com.iformall.douyin.payv2.result.TtSettleResult;
 import com.iformall.douyin.web.api.basic.TtWebPostRequestExecutor;
-import com.iformall.douyin.web.api.order.TtWebOrderService;
 import com.iformall.douyin.web.api.order.TtWebPayService;
 import com.iformall.douyin.web.api.order.TtWebShareService;
-import com.iformall.douyin.web.bean.GoodsCategory;
 import lombok.AllArgsConstructor;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.common.util.json.GsonHelper;
-import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
 
diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/api/order/impl/TtWebSolutionServiceImpl.java b/mallinkService/src/main/java/com/iformall/douyin/web/api/order/impl/TtWebSolutionServiceImpl.java
index e2f6e2f4b..6023ab13b 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/web/api/order/impl/TtWebSolutionServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/web/api/order/impl/TtWebSolutionServiceImpl.java
@@ -3,23 +3,14 @@ package com.iformall.douyin.web.api.order.impl;
 import com.alibaba.fastjson.TypeReference;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
-import com.iformall.douyin.payv2.request.TtOrderPushDeliveryRequest;
-import com.iformall.douyin.payv2.request.TtPayOrderQueryV2Request;
 import com.iformall.douyin.payv2.request.TtSolutionSetImplRequest;
 import com.iformall.douyin.payv2.result.Templateeffabilityimpl;
-import com.iformall.douyin.payv2.result.TtPayCpsOrderQueryV2Result;
-import com.iformall.douyin.payv2.result.TtPayOrderQueryV2Result;
-import com.iformall.douyin.payv2.result.TtSettleResult;
-import com.iformall.douyin.web.api.basic.TtWebPostRequestExecutor;
 import com.iformall.douyin.web.api.basic.TtWebSolutionPostRequestExecutor;
-import com.iformall.douyin.web.api.order.TtWebOrderService;
 import com.iformall.douyin.web.api.order.TtWebPayService;
 import com.iformall.douyin.web.api.order.TtWebSolutionService;
 import lombok.AllArgsConstructor;
 import me.chanjar.weixin.common.error.WxErrorException;
-import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/api/web/impl/TtWebGoodsServiceImpl.java b/mallinkService/src/main/java/com/iformall/douyin/web/api/web/impl/TtWebGoodsServiceImpl.java
index a553a6adb..32c90aa06 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/web/api/web/impl/TtWebGoodsServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/web/api/web/impl/TtWebGoodsServiceImpl.java
@@ -1,7 +1,10 @@
 package com.iformall.douyin.web.api.web.impl;
 
 import com.alibaba.fastjson.TypeReference;
-import com.google.gson.*;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
 import com.iformall.douyin.web.api.basic.TtWebGoodsCategoryGetRequestExecutor;
 import com.iformall.douyin.web.api.basic.TtWebGoodsGetRequestExecutor;
 import com.iformall.douyin.web.api.basic.TtWebGoodsPostRequestExecutor;
diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/api/web/impl/TtWebPoiPlanServiceImpl.java b/mallinkService/src/main/java/com/iformall/douyin/web/api/web/impl/TtWebPoiPlanServiceImpl.java
index 1955b97bd..e10c94abd 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/web/api/web/impl/TtWebPoiPlanServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/web/api/web/impl/TtWebPoiPlanServiceImpl.java
@@ -4,8 +4,8 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.iformall.douyin.web.api.web.TtWebPoiPlanService;
 import com.iformall.douyin.web.api.basic.TtWebPostRequestExecutor;
+import com.iformall.douyin.web.api.web.TtWebPoiPlanService;
 import com.iformall.douyin.web.api.web.TtWebService;
 import com.iformall.douyin.web.bean.*;
 import lombok.AllArgsConstructor;
diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/api/web/impl/TtWebServiceImpl.java b/mallinkService/src/main/java/com/iformall/douyin/web/api/web/impl/TtWebServiceImpl.java
index 0dd77448f..91050bc6b 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/web/api/web/impl/TtWebServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/web/api/web/impl/TtWebServiceImpl.java
@@ -1,39 +1,8 @@
 package com.iformall.douyin.web.api.web.impl;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.google.gson.Gson;
-import com.google.gson.JsonParser;
-import com.iformall.douyin.web.api.*;
 import com.iformall.douyin.web.api.basic.TtBasicServiceImpl;
-import com.iformall.douyin.web.api.web.TtWebGoodsService;
-import com.iformall.douyin.web.api.web.TtWebPoiPlanService;
-import com.iformall.douyin.web.api.web.TtWebProductService;
-import com.iformall.douyin.web.api.web.TtWebService;
-import com.iformall.douyin.web.api.web.TtWebShopMatchService;
-import com.iformall.douyin.web.config.TtWebConfig;
+import com.iformall.douyin.web.api.web.*;
 import lombok.extern.slf4j.Slf4j;
-import me.chanjar.weixin.common.WxType;
-import me.chanjar.weixin.common.bean.WxAccessToken;
-import me.chanjar.weixin.common.error.WxError;
-import me.chanjar.weixin.common.error.WxErrorException;
-import me.chanjar.weixin.common.util.DataUtils;
-import me.chanjar.weixin.common.util.http.*;
-import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
-import me.chanjar.weixin.common.util.http.apache.DefaultApacheHttpClientBuilder;
-import org.apache.http.HttpHost;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.impl.client.BasicResponseHandler;
-import org.apache.http.impl.client.CloseableHttpClient;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.locks.Lock;
-
-import static com.iformall.douyin.web.config.TtWebConstants.ErrorCode.*;
 
 
 /**
diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/bean/GoodsCategory.java b/mallinkService/src/main/java/com/iformall/douyin/web/bean/GoodsCategory.java
index 0a46317cd..fde86e130 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/web/bean/GoodsCategory.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/web/bean/GoodsCategory.java
@@ -5,7 +5,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * 商品类目信息
diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/bean/PoiPlanDetail.java b/mallinkService/src/main/java/com/iformall/douyin/web/bean/PoiPlanDetail.java
index 1640cc57f..16394ec79 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/web/bean/PoiPlanDetail.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/web/bean/PoiPlanDetail.java
@@ -5,7 +5,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.util.List;
 import java.util.Map;
 
 /**
diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/bean/ProductPage.java b/mallinkService/src/main/java/com/iformall/douyin/web/bean/ProductPage.java
index 014048edb..9b517d458 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/web/bean/ProductPage.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/web/bean/ProductPage.java
@@ -6,7 +6,6 @@ import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 商品.
diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/bean/ProductSku.java b/mallinkService/src/main/java/com/iformall/douyin/web/bean/ProductSku.java
index 1d074c0f7..9e1a84824 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/web/bean/ProductSku.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/web/bean/ProductSku.java
@@ -6,7 +6,6 @@ import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 商品.
diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/bean/TtSpuStockSync.java b/mallinkService/src/main/java/com/iformall/douyin/web/bean/TtSpuStockSync.java
index e65621428..f4315a625 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/web/bean/TtSpuStockSync.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/web/bean/TtSpuStockSync.java
@@ -4,7 +4,6 @@ import com.iformall.douyin.web.json.TtWebGsonBuilder;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  *
diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/bean/TtSupplierSyncQuery.java b/mallinkService/src/main/java/com/iformall/douyin/web/bean/TtSupplierSyncQuery.java
index d492b134c..f3a1e27e1 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/web/bean/TtSupplierSyncQuery.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/web/bean/TtSupplierSyncQuery.java
@@ -1,6 +1,5 @@
 package com.iformall.douyin.web.bean;
 
-import com.google.gson.JsonObject;
 import com.iformall.douyin.web.json.TtWebGsonBuilder;
 import lombok.Data;
 
diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/json/TtSpuGetAdapter.java b/mallinkService/src/main/java/com/iformall/douyin/web/json/TtSpuGetAdapter.java
index 5b75840c4..a86a90c4f 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/web/json/TtSpuGetAdapter.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/web/json/TtSpuGetAdapter.java
@@ -8,14 +8,12 @@
  */
 package com.iformall.douyin.web.json;
 
-import com.alibaba.fastjson.JSONArray;
 import com.google.gson.*;
 import com.iformall.douyin.web.bean.TtSpuGet;
 import me.chanjar.weixin.common.util.json.GsonHelper;
 
 import java.lang.reflect.Type;
 import java.util.Arrays;
-import java.util.Collections;
 
 
 /**
diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/json/TtSpuGetResultAdapter.java b/mallinkService/src/main/java/com/iformall/douyin/web/json/TtSpuGetResultAdapter.java
index 36aa00551..db3aee343 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/web/json/TtSpuGetResultAdapter.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/web/json/TtSpuGetResultAdapter.java
@@ -9,7 +9,8 @@
 package com.iformall.douyin.web.json;
 
 import com.google.gson.*;
-import com.iformall.douyin.web.bean.*;
+import com.iformall.douyin.web.bean.TtSpuGetResult;
+import com.iformall.douyin.web.bean.TtSpuSync;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/json/TtSpuStatusSyncAdapter.java b/mallinkService/src/main/java/com/iformall/douyin/web/json/TtSpuStatusSyncAdapter.java
index 4076bdfcc..7ccf52e9c 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/web/json/TtSpuStatusSyncAdapter.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/web/json/TtSpuStatusSyncAdapter.java
@@ -8,14 +8,12 @@
  */
 package com.iformall.douyin.web.json;
 
-import com.alibaba.fastjson.JSONArray;
 import com.google.gson.*;
 import com.iformall.douyin.web.bean.TtSpuStatusSync;
 import me.chanjar.weixin.common.util.json.GsonHelper;
 
 import java.lang.reflect.Type;
 import java.util.Arrays;
-import java.util.Collections;
 
 
 /**
diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/json/TtSpuSyncAdapter.java b/mallinkService/src/main/java/com/iformall/douyin/web/json/TtSpuSyncAdapter.java
index bf724b920..42a3f30d1 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/web/json/TtSpuSyncAdapter.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/web/json/TtSpuSyncAdapter.java
@@ -8,15 +8,12 @@
  */
 package com.iformall.douyin.web.json;
 
-import com.alibaba.fastjson.JSONArray;
 import com.google.gson.*;
 import com.iformall.douyin.web.bean.TtSpuSync;
-import com.iformall.douyin.web.bean.TtSupplierSync;
 import me.chanjar.weixin.common.util.json.GsonHelper;
 
 import java.lang.reflect.Type;
 import java.util.Arrays;
-import java.util.Collections;
 
 
 /**
diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/json/TtSupplierMatchAdapter.java b/mallinkService/src/main/java/com/iformall/douyin/web/json/TtSupplierMatchAdapter.java
index 1e8fb23ed..f686ab5c3 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/web/json/TtSupplierMatchAdapter.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/web/json/TtSupplierMatchAdapter.java
@@ -10,7 +10,6 @@ package com.iformall.douyin.web.json;
 
 import com.google.gson.*;
 import com.iformall.douyin.web.bean.TtSupplierMatch;
-import com.iformall.douyin.web.bean.TtSupplierMatchList;
 import me.chanjar.weixin.common.util.json.GsonHelper;
 
 import java.lang.reflect.Type;
diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/json/TtSupplierSyncAdapter.java b/mallinkService/src/main/java/com/iformall/douyin/web/json/TtSupplierSyncAdapter.java
index fcd5f5971..c1b3a556b 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/web/json/TtSupplierSyncAdapter.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/web/json/TtSupplierSyncAdapter.java
@@ -8,15 +8,12 @@
  */
 package com.iformall.douyin.web.json;
 
-import com.alibaba.fastjson.JSONArray;
 import com.google.gson.*;
-import com.iformall.douyin.web.bean.TtSupplierMatch;
 import com.iformall.douyin.web.bean.TtSupplierSync;
 import me.chanjar.weixin.common.util.json.GsonHelper;
 
 import java.lang.reflect.Type;
 import java.util.Arrays;
-import java.util.Collections;
 
 
 /**
diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/json/TtSupplierSyncQueryAdapter.java b/mallinkService/src/main/java/com/iformall/douyin/web/json/TtSupplierSyncQueryAdapter.java
index c35f27f0b..541acd874 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/web/json/TtSupplierSyncQueryAdapter.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/web/json/TtSupplierSyncQueryAdapter.java
@@ -9,7 +9,9 @@
 package com.iformall.douyin.web.json;
 
 import com.google.gson.*;
-import com.iformall.douyin.web.bean.*;
+import com.iformall.douyin.web.bean.TtSupplierSync;
+import com.iformall.douyin.web.bean.TtSupplierSyncQuery;
+import com.iformall.douyin.web.bean.TtSupplierSyncStatus;
 import me.chanjar.weixin.common.util.json.GsonHelper;
 
 import java.lang.reflect.Type;
diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumComposeOrder.java b/mallinkService/src/main/java/com/iformall/enums/EnumComposeOrder.java
index 70078062d..7d590efa8 100644
--- a/mallinkService/src/main/java/com/iformall/enums/EnumComposeOrder.java
+++ b/mallinkService/src/main/java/com/iformall/enums/EnumComposeOrder.java
@@ -1,7 +1,5 @@
 package com.iformall.enums;
 
-import com.iformall.domain.po.WxOrder;
-
 /**
  * @author gongbiao
  */
diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumSharingReceiverIdDocType.java b/mallinkService/src/main/java/com/iformall/enums/EnumSharingReceiverIdDocType.java
index 5994b45db..4e3e39e31 100644
--- a/mallinkService/src/main/java/com/iformall/enums/EnumSharingReceiverIdDocType.java
+++ b/mallinkService/src/main/java/com/iformall/enums/EnumSharingReceiverIdDocType.java
@@ -2,9 +2,6 @@ package com.iformall.enums;
 
 import com.github.binarywang.wxpay.bean.applyment.enums.IdTypeEnum;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * 经营者/法人证件类型
  * IDENTIFICATION_TYPE_IDCARD:中国大陆居民-身份证
diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumTtProductType.java b/mallinkService/src/main/java/com/iformall/enums/EnumTtProductType.java
index 570b5d3f3..1990af25b 100644
--- a/mallinkService/src/main/java/com/iformall/enums/EnumTtProductType.java
+++ b/mallinkService/src/main/java/com/iformall/enums/EnumTtProductType.java
@@ -1,8 +1,5 @@
 package com.iformall.enums;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Created by Stormeye on 2018/08/09.
  */
diff --git a/mallinkService/src/main/java/com/iformall/file/aliyun/AliyunOSS.java b/mallinkService/src/main/java/com/iformall/file/aliyun/AliyunOSS.java
index bc1fc6b77..e794d2445 100644
--- a/mallinkService/src/main/java/com/iformall/file/aliyun/AliyunOSS.java
+++ b/mallinkService/src/main/java/com/iformall/file/aliyun/AliyunOSS.java
@@ -1,6 +1,9 @@
 package com.iformall.file.aliyun;
 
-import com.aliyun.oss.*;
+import com.aliyun.oss.ClientException;
+import com.aliyun.oss.OSS;
+import com.aliyun.oss.OSSClientBuilder;
+import com.aliyun.oss.OSSException;
 import com.aliyun.oss.model.CannedAccessControlList;
 import com.aliyun.oss.model.CreateBucketRequest;
 import com.aliyun.oss.model.PutObjectRequest;
@@ -11,9 +14,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
 
-import java.io.File;
 import java.io.InputStream;
 import java.text.SimpleDateFormat;
 import java.util.Date;
diff --git a/mallinkService/src/main/java/com/iformall/mallcoo/MallcooHelper.java b/mallinkService/src/main/java/com/iformall/mallcoo/MallcooHelper.java
index d32b8dded..08219995e 100644
--- a/mallinkService/src/main/java/com/iformall/mallcoo/MallcooHelper.java
+++ b/mallinkService/src/main/java/com/iformall/mallcoo/MallcooHelper.java
@@ -3,7 +3,6 @@ package com.iformall.mallcoo;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.iformall.common.ErrorCode;
-import com.iformall.domain.po.WxThirdPartyApi;
 import com.iformall.domain.po.WxThirdPartyConfig;
 import com.iformall.exception.MallinkException;
 import com.iformall.mallcoo.biImport.BasicBi;
@@ -17,7 +16,9 @@ import org.apache.commons.lang3.StringUtils;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 猫酷开放平台
diff --git a/mallinkService/src/main/java/com/iformall/mallcoo/biImport/BasicBi.java b/mallinkService/src/main/java/com/iformall/mallcoo/biImport/BasicBi.java
index 60fc70544..e2d35ad7a 100644
--- a/mallinkService/src/main/java/com/iformall/mallcoo/biImport/BasicBi.java
+++ b/mallinkService/src/main/java/com/iformall/mallcoo/biImport/BasicBi.java
@@ -2,8 +2,6 @@ package com.iformall.mallcoo.biImport;
 
 import lombok.Data;
 
-import java.util.Date;
-
 @Data
 public class BasicBi {
 
diff --git a/mallinkService/src/main/java/com/iformall/mallcoo/biImport/BuyGroup.java b/mallinkService/src/main/java/com/iformall/mallcoo/biImport/BuyGroup.java
index 6b18e1ebb..a1dff3887 100644
--- a/mallinkService/src/main/java/com/iformall/mallcoo/biImport/BuyGroup.java
+++ b/mallinkService/src/main/java/com/iformall/mallcoo/biImport/BuyGroup.java
@@ -1,13 +1,7 @@
 package com.iformall.mallcoo.biImport;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.iformall.utils.DateUtils;
 import lombok.Data;
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 
 @Data
 public class BuyGroup extends BasicBi{
diff --git a/mallinkService/src/main/java/com/iformall/mallcoo/biImport/EnumBiEventType.java b/mallinkService/src/main/java/com/iformall/mallcoo/biImport/EnumBiEventType.java
index 27e4f9415..4b66f677c 100644
--- a/mallinkService/src/main/java/com/iformall/mallcoo/biImport/EnumBiEventType.java
+++ b/mallinkService/src/main/java/com/iformall/mallcoo/biImport/EnumBiEventType.java
@@ -1,7 +1,5 @@
 package com.iformall.mallcoo.biImport;
 
-import com.iformall.enums.EnumActivityType;
-
 public enum EnumBiEventType {
 
     buy(901001, "购买团购"),
diff --git a/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java
index b2df06155..82d70fccb 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java
@@ -5,9 +5,7 @@ import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.AliBusinessCircleOrder;
 import com.iformall.domain.po.BusinessCircleBase;
 import com.iformall.domain.vo.AlipayOrWxStatistics;
-import org.apache.ibatis.annotations.Param;
 
-import java.util.Date;
 import java.util.List;
 
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/AliPayCUserMapper.java b/mallinkService/src/main/java/com/iformall/mapper/AliPayCUserMapper.java
index 2c83e5277..a4314c11c 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/AliPayCUserMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/AliPayCUserMapper.java
@@ -1,10 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.List;
-
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.AliPayCUser;
 
+import java.util.List;
+
 public interface AliPayCUserMapper extends CommonMapper {
 	
 	List findList(AliPayCUser alipayCUser);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/InvestOperateRecordMapper.java b/mallinkService/src/main/java/com/iformall/mapper/InvestOperateRecordMapper.java
index cf4617218..0023ed3ed 100755
--- a/mallinkService/src/main/java/com/iformall/mapper/InvestOperateRecordMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/InvestOperateRecordMapper.java
@@ -1,6 +1,5 @@
 package com.iformall.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.iformall.domain.po.invest.InvestOperateRecordEntity;
 import org.apache.ibatis.annotations.Mapper;
diff --git a/mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java b/mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java
index af5f83dd6..4f76ea24c 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java
@@ -11,7 +11,6 @@ import com.iformall.domain.vo.MerchantMeterVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 public interface KwMerchantMeterMapper extends CommonMapper {
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/MallPermissionMapper.java b/mallinkService/src/main/java/com/iformall/mapper/MallPermissionMapper.java
index 4898a5de2..43419cb2a 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/MallPermissionMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/MallPermissionMapper.java
@@ -2,7 +2,6 @@ package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.MallPermission;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/MallResourceMapper.java b/mallinkService/src/main/java/com/iformall/mapper/MallResourceMapper.java
index 5b5e016e6..7bdc0431a 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/MallResourceMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/MallResourceMapper.java
@@ -1,10 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
-import org.apache.ibatis.annotations.Param;
 import com.iformall.domain.po.MallResource;
 
+import java.util.List;
+
 public interface MallResourceMapper extends CommonMapper {
 
 	List findList(MallResource mallResource);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/MallUserActionMapper.java b/mallinkService/src/main/java/com/iformall/mapper/MallUserActionMapper.java
index 1316c1754..d351c35b3 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/MallUserActionMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/MallUserActionMapper.java
@@ -1,9 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
-import com.iformall.domain.vo.MallUserActionVo;
 import com.iformall.domain.po.MallUserAction;
+import com.iformall.domain.vo.MallUserActionVo;
+
+import java.util.List;
 
 public interface MallUserActionMapper extends CommonMapper {
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/MemCouponFromDspMapper.java b/mallinkService/src/main/java/com/iformall/mapper/MemCouponFromDspMapper.java
index 90b202cce..e4aa18075 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/MemCouponFromDspMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/MemCouponFromDspMapper.java
@@ -1,10 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
-import org.apache.ibatis.annotations.Param;
 import com.iformall.domain.po.MemCouponFromDsp;
 
+import java.util.List;
+
 public interface MemCouponFromDspMapper extends CommonMapper {
 
 	List findList(MemCouponFromDsp memCouponFromDsp);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java b/mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java
index 538c98829..05da75009 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java
@@ -4,11 +4,11 @@ package com.iformall.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.iformall.domain.dto.NeuPosUpdatePayDto;
 import com.iformall.domain.po.NeuPosOrderMasterExt;
+import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 import java.util.Map;
 
-import org.apache.ibatis.annotations.Param;
-
 
 public interface NeuPosOrderMasterExtMapper extends BaseMapper {
 	
diff --git a/mallinkService/src/main/java/com/iformall/mapper/PosActionLogMapper.java b/mallinkService/src/main/java/com/iformall/mapper/PosActionLogMapper.java
index 485f8244f..759ab9800 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/PosActionLogMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/PosActionLogMapper.java
@@ -1,10 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
-import org.apache.ibatis.annotations.Param;
 import com.iformall.domain.po.PosActionLog;
 
+import java.util.List;
+
 public interface PosActionLogMapper extends CommonMapper {
 
 	List findList(PosActionLog posActionLog);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/PosCouponOrderVerifyMapper.java b/mallinkService/src/main/java/com/iformall/mapper/PosCouponOrderVerifyMapper.java
index fd6555c4c..a143271af 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/PosCouponOrderVerifyMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/PosCouponOrderVerifyMapper.java
@@ -1,10 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
-import org.apache.ibatis.annotations.Param;
 import com.iformall.domain.po.PosCouponOrderVerify;
 
+import java.util.List;
+
 public interface PosCouponOrderVerifyMapper extends CommonMapper {
 
 	List findList(PosCouponOrderVerify posCouponOrderVerify);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/PosMallConfigMapper.java b/mallinkService/src/main/java/com/iformall/mapper/PosMallConfigMapper.java
index 8793b76eb..052eb1452 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/PosMallConfigMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/PosMallConfigMapper.java
@@ -1,9 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.PosMallConfig;
 
+import java.util.List;
+
 public interface PosMallConfigMapper extends CommonMapper {
 
 	List findList(PosMallConfig posMallConfig);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/PosOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/PosOrderMapper.java
index 27bb3250d..08eb98e56 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/PosOrderMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/PosOrderMapper.java
@@ -1,9 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
-import org.apache.ibatis.annotations.Param;
 import com.iformall.domain.po.PosOrder;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface PosOrderMapper extends CommonMapper {
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/PosPayOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/PosPayOrderMapper.java
index 985aacdf1..b2acb0ffd 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/PosPayOrderMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/PosPayOrderMapper.java
@@ -1,9 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
-import org.apache.ibatis.annotations.Param;
 import com.iformall.domain.po.PosPayOrder;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface PosPayOrderMapper extends CommonMapper {
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/SellerAgentAccountMapper.java b/mallinkService/src/main/java/com/iformall/mapper/SellerAgentAccountMapper.java
index 0d04b5651..583ac72ab 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/SellerAgentAccountMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/SellerAgentAccountMapper.java
@@ -2,11 +2,10 @@ package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.SellerAgentAccount;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-import org.apache.ibatis.annotations.Param;
-
 public interface SellerAgentAccountMapper extends CommonMapper {
 	
 	List findList(SellerAgentAccount record);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/SellerAgentMapper.java b/mallinkService/src/main/java/com/iformall/mapper/SellerAgentMapper.java
index a46d6a21a..474c79a62 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/SellerAgentMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/SellerAgentMapper.java
@@ -2,10 +2,10 @@ package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.SellerAgent;
-import java.util.List;
-
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface SellerAgentMapper extends CommonMapper {
 	
 	List findList(SellerAgent record);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/SysConfigMapper.java b/mallinkService/src/main/java/com/iformall/mapper/SysConfigMapper.java
index 3a08365b6..14ad2ed9f 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/SysConfigMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/SysConfigMapper.java
@@ -1,9 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.SysConfig;
 
+import java.util.List;
+
 public interface SysConfigMapper extends CommonMapper {
 
 	List findList(SysConfig sysMonitor);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/SysGaodeCityMapper.java b/mallinkService/src/main/java/com/iformall/mapper/SysGaodeCityMapper.java
index a92022667..e174cf803 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/SysGaodeCityMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/SysGaodeCityMapper.java
@@ -1,9 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.SysGaodeCity;
 
+import java.util.List;
+
 public interface SysGaodeCityMapper extends CommonMapper {
 
 	List findList(SysGaodeCity sysGaodeCity);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/SysMonitorMapper.java b/mallinkService/src/main/java/com/iformall/mapper/SysMonitorMapper.java
index bacc31d97..3bf638267 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/SysMonitorMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/SysMonitorMapper.java
@@ -1,9 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.SysMonitor;
 
+import java.util.List;
+
 public interface SysMonitorMapper extends CommonMapper {
 
 	List findList(SysMonitor sysMonitor);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/SysNoticeMapper.java b/mallinkService/src/main/java/com/iformall/mapper/SysNoticeMapper.java
index 48496ae10..bdcd547e3 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/SysNoticeMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/SysNoticeMapper.java
@@ -2,6 +2,7 @@ package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.SysNotice;
+
 import java.util.List;
 
 /**
diff --git a/mallinkService/src/main/java/com/iformall/mapper/ThDevInfoMapper.java b/mallinkService/src/main/java/com/iformall/mapper/ThDevInfoMapper.java
index 4ae2d26ce..72009233a 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/ThDevInfoMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/ThDevInfoMapper.java
@@ -1,10 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
-import org.apache.ibatis.annotations.Param;
 import com.iformall.domain.po.ThDevInfo;
 
+import java.util.List;
+
 public interface ThDevInfoMapper extends CommonMapper {
 
 	List findList(ThDevInfo thDevInfo);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/TtBuserMapper.java b/mallinkService/src/main/java/com/iformall/mapper/TtBuserMapper.java
index 2330ac1a2..d8df8de76 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/TtBuserMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/TtBuserMapper.java
@@ -2,7 +2,6 @@ package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.TtBuser;
-import com.iformall.domain.po.WxBuser;
 
 import java.util.List;
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/TtCUserMapper.java b/mallinkService/src/main/java/com/iformall/mapper/TtCUserMapper.java
index 347c9addc..e81d30f92 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/TtCUserMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/TtCUserMapper.java
@@ -3,7 +3,6 @@ package com.iformall.mapper;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.dto.WxCUserBasicInfoDto;
 import com.iformall.domain.po.tt.TtCUser;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.UserCountVo;
 import com.iformall.domain.vo.UserStructureVo;
 import org.apache.ibatis.annotations.Param;
diff --git a/mallinkService/src/main/java/com/iformall/mapper/TtMallGoodsCategoryMapper.java b/mallinkService/src/main/java/com/iformall/mapper/TtMallGoodsCategoryMapper.java
index 48e0e9ae0..d02a15144 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/TtMallGoodsCategoryMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/TtMallGoodsCategoryMapper.java
@@ -1,7 +1,6 @@
 package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
-import com.iformall.domain.po.TtGoodsCategory;
 import com.iformall.domain.po.TtMallGoodsCategory;
 import com.iformall.domain.vo.TtMallGoodsCategoryVo;
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/TtMerchantPoiMapper.java b/mallinkService/src/main/java/com/iformall/mapper/TtMerchantPoiMapper.java
index b39fddc73..09d3e1b6d 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/TtMerchantPoiMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/TtMerchantPoiMapper.java
@@ -4,7 +4,6 @@ import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.TtMerchantPoi;
 
 import java.util.List;
-import java.util.Map;
 
 public interface TtMerchantPoiMapper extends CommonMapper {
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/TtOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/TtOrderMapper.java
index c3f3bd374..a809926ba 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/TtOrderMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/TtOrderMapper.java
@@ -1,17 +1,11 @@
 package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
-import com.iformall.domain.dto.WxOrderReportDto;
-import com.iformall.domain.po.WxOrder;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.tt.TtOrder;
-import com.iformall.domain.vo.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 public interface TtOrderMapper extends CommonMapper {
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/TtPoiTakeRateMapper.java b/mallinkService/src/main/java/com/iformall/mapper/TtPoiTakeRateMapper.java
index 2687f84f3..b25404b39 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/TtPoiTakeRateMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/TtPoiTakeRateMapper.java
@@ -1,7 +1,6 @@
 package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
-import com.iformall.domain.po.OrderCps;
 import com.iformall.domain.po.TtPoiTakeRate;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxAdminLogMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxAdminLogMapper.java
index d0e495950..926efbbec 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxAdminLogMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxAdminLogMapper.java
@@ -1,9 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxAdminLog;
 
+import java.util.List;
+
 public interface WxAdminLogMapper extends CommonMapper {
 
 	List findList(WxAdminLog wxAdminLog);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxAppinfoMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxAppinfoMapper.java
index 414561c14..950eb14d0 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxAppinfoMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxAppinfoMapper.java
@@ -1,9 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxAppinfo;
 
+import java.util.List;
+
 public interface WxAppinfoMapper extends CommonMapper {
 
 	List findList(WxAppinfo wxAppinfo);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxAuthorizerInfoMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxAuthorizerInfoMapper.java
index 48a65030f..fb5239f1b 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxAuthorizerInfoMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxAuthorizerInfoMapper.java
@@ -1,10 +1,11 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxAuthorizerInfo;
 import com.iformall.domain.vo.WxWeappInfo;
 
+import java.util.List;
+
 public interface WxAuthorizerInfoMapper extends CommonMapper {
 
 	List findList(WxAuthorizerInfo wxAuthorizerInfo);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBatchOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBatchOrderMapper.java
index d49574e0d..772b0f7c5 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxBatchOrderMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxBatchOrderMapper.java
@@ -2,11 +2,10 @@ package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxBatchOrder;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-import org.apache.ibatis.annotations.Param;
-
 public interface WxBatchOrderMapper extends CommonMapper {
 
 	List findList(WxBatchOrder order);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java
index 3910aefaa..167d956b9 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java
@@ -1,18 +1,12 @@
 package com.iformall.mapper;
 
-import com.iformall.domain.po.WxBillDaily;
-import com.iformall.domain.po.WxBillOther;
-import com.iformall.domain.po.WxBillProperty;
-import com.iformall.domain.po.WxBillRent;
-import com.iformall.domain.po.WxMerchantSubsidy;
 import com.iformall.domain.vo.WxBillAll;
 import com.iformall.domain.vo.WxBillAllVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
 
-import org.apache.ibatis.annotations.Param;
-
 /**
  * @author gongbiao
  */
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillDepositMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillDepositMapper.java
index c13448e58..df3e4dc12 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxBillDepositMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillDepositMapper.java
@@ -4,6 +4,7 @@ package com.iformall.mapper;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxBillDeposit;
 import com.iformall.domain.po.WxRentContract;
+
 import java.util.List;
 import java.util.Map;
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java
index 30f0de014..e47efc046 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java
@@ -1,7 +1,10 @@
 package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.WxBillProperty;
+import com.iformall.domain.po.WxPayAccountBill;
+import com.iformall.domain.po.WxPropertyContract;
+import com.iformall.domain.po.WxRentContract;
 
 import java.util.List;
 import java.util.Map;
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentManageMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentManageMapper.java
index bede06dba..b5bfe2d8c 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentManageMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentManageMapper.java
@@ -2,12 +2,11 @@ package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxBillRentManage;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
 
-import org.apache.ibatis.annotations.Param;
-
 /**
  * @author gongbiao
  */
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillSettleBillMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillSettleBillMapper.java
index 83bc1cd91..dd3843eb7 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxBillSettleBillMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillSettleBillMapper.java
@@ -3,6 +3,7 @@ package com.iformall.mapper;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxBillSettle;
 import com.iformall.domain.po.WxBillSettleBill;
+
 import java.util.List;
 
 /**
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillSettleMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillSettleMapper.java
index 64ae17d8c..bb55ff3fd 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxBillSettleMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillSettleMapper.java
@@ -2,10 +2,10 @@ package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxBillSettle;
-import java.util.List;
-
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * @author luozukai
  */
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillSettleScheduleMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillSettleScheduleMapper.java
index 507ad615f..5f2f4d861 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxBillSettleScheduleMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillSettleScheduleMapper.java
@@ -1,18 +1,12 @@
 package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
-import com.iformall.domain.po.WxBillDaily;
-import com.iformall.domain.po.WxBillOther;
-import com.iformall.domain.po.WxBillProperty;
-import com.iformall.domain.po.WxBillRent;
-import com.iformall.domain.po.WxBillSettleSchedule;
-import com.iformall.domain.po.WxMerchantSubsidy;
+import com.iformall.domain.po.*;
 import com.iformall.domain.vo.WxBillAll;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-import org.apache.ibatis.annotations.Param;
-
 /**
  * @author luozukai
  */
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessCircleOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessCircleOrderMapper.java
index 67044b186..86a4e6117 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessCircleOrderMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessCircleOrderMapper.java
@@ -1,7 +1,6 @@
 package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
-import com.iformall.domain.po.AliBusinessCircleOrder;
 import com.iformall.domain.po.BusinessCircleBase;
 import com.iformall.domain.po.WxBusinessCircleOrder;
 import com.iformall.domain.vo.AlipayOrWxStatistics;
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java
index 870c6728f..62a468d5a 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java
@@ -1,11 +1,12 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
-import com.iformall.common.ResultData;
 import com.iformall.domain.po.WxBusiness;
 import io.lettuce.core.dynamic.annotation.Param;
 
+import java.util.List;
+import java.util.Map;
+
 public interface WxBusinessMapper extends CommonMapper {
 
 	List findList(WxBusiness wxBusiness);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicChildMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicChildMapper.java
index 7714f39c9..d3f74dcb7 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicChildMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicChildMapper.java
@@ -2,8 +2,6 @@ package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxCUserBasicChild;
-import com.iformall.domain.po.WxCUserBasicInfo;
-import com.iformall.domain.po.WxCreditHistory;
 
 import java.util.List;
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java
index 7584390df..4fbde6784 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java
@@ -3,7 +3,6 @@ package com.iformall.mapper;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.dto.WxCUserBasicInfoDto;
 import com.iformall.domain.po.WxCUserBasicInfo;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.CUserBaseVo;
 import com.iformall.domain.vo.UserCountVo;
 import com.iformall.domain.vo.WxCUserBasicInfoVo;
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java
index 87e96302d..118cba1a0 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java
@@ -1,15 +1,14 @@
 package com.iformall.mapper;
 
-import java.util.List;
-
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.dto.WxCUserBasicInfoDto;
 import com.iformall.domain.po.WxCUser;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.UserCountVo;
 import com.iformall.domain.vo.UserStructureVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface WxCUserMapper extends CommonMapper {
 
 	List findList(WxCUser record);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserTagsMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserTagsMapper.java
index 8deb54655..d795a1eac 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserTagsMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserTagsMapper.java
@@ -1,12 +1,12 @@
 package com.iformall.mapper;
 
-import java.util.List;
-
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxCUserTags;
 import com.iformall.domain.vo.CUserTagNewIdVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface WxCUserTagsMapper extends CommonMapper {
 
 	WxCUserTags selectById(@Param("id")Long id,@Param("tenantId")String tenantId);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java
index 248621d9e..2c1368624 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java
@@ -3,14 +3,12 @@ package com.iformall.mapper;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxCarCmdLog;
 import com.iformall.domain.vo.MarkingSceneDataVo;
+import org.apache.ibatis.annotations.Param;
 
-import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.ibatis.annotations.Param;
-
 /**
  * @author gongbiao
  */
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCarPayOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCarPayOrderMapper.java
index 6e023097d..6efbddc3f 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxCarPayOrderMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxCarPayOrderMapper.java
@@ -1,11 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
-
-import org.apache.ibatis.annotations.Param;
-
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxCarPayOrder;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface WxCarPayOrderMapper extends CommonMapper {
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCarPayRecordMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCarPayRecordMapper.java
index df924d643..61a75b555 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxCarPayRecordMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxCarPayRecordMapper.java
@@ -2,6 +2,7 @@ package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxCarPayRecord;
+
 import java.util.List;
 
 /**
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCardInfoMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCardInfoMapper.java
index d6c01c9e2..61a0d6006 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxCardInfoMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxCardInfoMapper.java
@@ -2,7 +2,6 @@ package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxCardInfo;
-import com.iformall.domain.vo.WxCardVo;
 
 import java.util.List;
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java
index ef469d544..454324ad9 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java
@@ -1,11 +1,13 @@
 package com.iformall.mapper;
 
-import java.math.BigDecimal;
-import java.util.*;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxCardSpend;
 import com.iformall.domain.vo.WxCardSpendVo;
 
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
 public interface WxCardSpendMapper extends CommonMapper {
 
 	List findList(WxCardSpend wxCardSpend);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCardTransferInfoMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCardTransferInfoMapper.java
index 5a8044a68..d26f32c89 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxCardTransferInfoMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxCardTransferInfoMapper.java
@@ -1,13 +1,12 @@
 package com.iformall.mapper;
 
-import java.util.Date;
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxCardTransferInfo;
 import com.iformall.domain.vo.WxCardCVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
 
 public interface WxCardTransferInfoMapper extends CommonMapper {
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCashOutMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCashOutMapper.java
index 092a73532..22215b5f6 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxCashOutMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxCashOutMapper.java
@@ -2,11 +2,10 @@ package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxCashOut;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-import org.apache.ibatis.annotations.Param;
-
 public interface WxCashOutMapper extends CommonMapper {
 
 	WxCashOut selectById(@Param("id")Long id,@Param("tenantId")String tenantId);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxComponentVerifyTicketMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxComponentVerifyTicketMapper.java
index db9f2055f..30b96c449 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxComponentVerifyTicketMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxComponentVerifyTicketMapper.java
@@ -1,9 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxComponentVerifyTicket;
 
+import java.util.List;
+
 public interface WxComponentVerifyTicketMapper extends CommonMapper {
 
 	List findList(WxComponentVerifyTicket wxComponentVerifyTicket);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponActionLogMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponActionLogMapper.java
index 2771c8190..65f94bd05 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponActionLogMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponActionLogMapper.java
@@ -1,15 +1,18 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.dto.MarkingCouponDataReportDto;
-import com.iformall.domain.po.base.TenantEntity;
+import com.iformall.domain.po.WxCouponActionLog;
 import com.iformall.domain.vo.MarkingSceneDataReportTVo;
 import com.iformall.domain.vo.MarkingSceneDataReportVo;
 import com.iformall.domain.vo.MarkingSceneDataVo;
 import com.iformall.domain.vo.WxCouponActionLogVo;
 import org.apache.ibatis.annotations.Param;
-import com.iformall.domain.po.WxCouponActionLog;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public interface WxCouponActionLogMapper extends CommonMapper {
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponBatchItemMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponBatchItemMapper.java
index ae9f0eb36..068f60d95 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponBatchItemMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponBatchItemMapper.java
@@ -2,9 +2,10 @@ package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxCouponBatchItem;
-import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface WxCouponBatchItemMapper extends CommonMapper {
 	
 	List findList(WxCouponBatchItem record);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponBatchMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponBatchMapper.java
index 6cf245201..72c2731f8 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponBatchMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponBatchMapper.java
@@ -2,10 +2,10 @@ package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxCouponBatch;
-import java.util.List;
-
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface WxCouponBatchMapper extends CommonMapper {
 	
 	List findList(WxCouponBatch record);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponCarMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponCarMapper.java
index d188258c3..066b5a20b 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponCarMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponCarMapper.java
@@ -1,10 +1,11 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
-import org.apache.ibatis.annotations.Param;
-import com.iformall.domain.vo.WxCouponCarVo;
 import com.iformall.domain.po.WxCouponCar;
+import com.iformall.domain.vo.WxCouponCarVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface WxCouponCarMapper extends CommonMapper {
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponChannelMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponChannelMapper.java
index ac3f78028..b201dcc50 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponChannelMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponChannelMapper.java
@@ -1,13 +1,14 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
-import com.iformall.domain.po.WxTopic;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.WxCouponChannel;
+import com.iformall.domain.po.WxTopic;
 import com.iformall.domain.vo.TtCouponChannelVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
+import java.util.List;
+
 public interface WxCouponChannelMapper extends CommonMapper {
 
 	WxCouponChannel selectById(@Param("id")Long id,@Param("tenantId")String tenantId);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMallMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMallMapper.java
index a71c617c8..a561086c7 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMallMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMallMapper.java
@@ -3,12 +3,8 @@ package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxCouponMall;
-import com.iformall.domain.po.base.TenantEntity;
 
 import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Param;
 
 public interface WxCouponMallMapper extends CommonMapper {
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java
index 7c7d7cfbc..d976f36d6 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java
@@ -1,14 +1,15 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
+import com.iformall.domain.po.WxCoupon;
 import com.iformall.domain.po.WxTopic;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.TtCouponVo;
 import com.iformall.domain.vo.WxCouponCVo;
 import com.iformall.domain.vo.WxCouponStatisVo;
 import org.apache.ibatis.annotations.Param;
-import com.iformall.domain.po.WxCoupon;
+
+import java.util.List;
 
 public interface WxCouponMapper extends CommonMapper {
 	List findPressData(@Param("tenantEntitys")List tenantEntitys, @Param("wxCoupon")WxCoupon wxCoupon);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java
index 84922262f..7e3124514 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java
@@ -3,14 +3,10 @@ package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxCouponMerchant;
-import com.iformall.domain.po.WxMerchant;
 import com.iformall.domain.vo.WxMerchantProductVo;
-import com.iformall.domain.vo.WxMerchantVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Param;
 
 public interface WxCouponMerchantMapper extends CommonMapper {
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderReservationMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderReservationMapper.java
index 13c5b1d4f..2e5a85b34 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderReservationMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderReservationMapper.java
@@ -1,17 +1,10 @@
 package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
-import com.iformall.domain.dto.MarkingCouponDataReportDto;
-import com.iformall.domain.po.WxCouponOrder;
 import com.iformall.domain.po.WxCouponOrderReservation;
-import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.domain.vo.*;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 public interface WxCouponOrderReservationMapper extends CommonMapper {
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponPasswordMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponPasswordMapper.java
index 1e6fed9f3..8f45354fd 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponPasswordMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponPasswordMapper.java
@@ -3,12 +3,11 @@ package com.iformall.mapper;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxCouponPassword;
 import com.iformall.domain.vo.WxCouponPasswordCountInfoVO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
 
-import org.apache.ibatis.annotations.Param;
-
 public interface WxCouponPasswordMapper extends CommonMapper {
 
 	List findList(WxCouponPassword wxCouponPassword);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponPresentMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponPresentMapper.java
index aefc18519..a804ba3be 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponPresentMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponPresentMapper.java
@@ -1,7 +1,6 @@
 package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
-import com.iformall.domain.po.WxCouponPassword;
 import com.iformall.domain.po.WxCouponPresent;
 
 import java.util.List;
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponSendConfigMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponSendConfigMapper.java
index e930091a7..1b4580d02 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponSendConfigMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponSendConfigMapper.java
@@ -1,9 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxCouponSendConfig;
 
+import java.util.List;
+
 public interface WxCouponSendConfigMapper extends CommonMapper {
 
 	List findList(WxCouponSendConfig wxCouponSendConfig);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponSendMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponSendMapper.java
index ab5b5b5de..d5a115eb3 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponSendMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponSendMapper.java
@@ -1,10 +1,11 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxCouponSend;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface WxCouponSendMapper extends CommonMapper {
 
 	WxCouponSend selectById(@Param("id")Long id,@Param("tenantId")String tenantId);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponTypeMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponTypeMapper.java
index ed1b85949..f39d09228 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponTypeMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponTypeMapper.java
@@ -1,9 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxCouponType;
 
+import java.util.List;
+
 public interface WxCouponTypeMapper extends CommonMapper {
 
 	List findList(WxCouponType wxCouponType);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java
index c55e7b8df..00110463b 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java
@@ -3,12 +3,8 @@ package com.iformall.mapper;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxCreditHistory;
 import com.iformall.domain.vo.MerchantCreditRankingVo;
-import com.iformall.domain.vo.WxCreditHistoryNewIdVo;
-import com.iformall.domain.vo.WxCreditHistoryVo;
-import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.Date;
 import java.util.List;
 
 public interface WxCreditHistoryMapper extends CommonMapper{
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxDateAmountRecordMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxDateAmountRecordMapper.java
index 78b6b8d38..c4cfa3e5f 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxDateAmountRecordMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxDateAmountRecordMapper.java
@@ -4,7 +4,6 @@ import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxDateAmountRecord;
 
 import java.util.List;
-import java.util.Map;
 
 public interface WxDateAmountRecordMapper extends CommonMapper {
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxFlowConfigMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxFlowConfigMapper.java
index 5b1780316..87846d8cc 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxFlowConfigMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxFlowConfigMapper.java
@@ -2,6 +2,7 @@ package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxFlowConfig;
+
 import java.util.List;
 
 /**
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxFlowRecordMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxFlowRecordMapper.java
index 55b05bd15..d64120053 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxFlowRecordMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxFlowRecordMapper.java
@@ -2,6 +2,7 @@ package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxFlowRecord;
+
 import java.util.List;
 
 public interface WxFlowRecordMapper extends CommonMapper {
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxGameMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxGameMapper.java
index 0a8aa3374..dc23b7df7 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxGameMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxGameMapper.java
@@ -1,10 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
-import org.apache.ibatis.annotations.Param;
 import com.iformall.domain.po.WxGame;
 
+import java.util.List;
+
 public interface WxGameMapper extends CommonMapper {
 
 	List findList(WxGame wxGame);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxGameTemplateMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxGameTemplateMapper.java
index baa60269d..e8c810b2f 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxGameTemplateMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxGameTemplateMapper.java
@@ -1,10 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
-import org.apache.ibatis.annotations.Param;
 import com.iformall.domain.po.WxGameTemplate;
 
+import java.util.List;
+
 public interface WxGameTemplateMapper extends CommonMapper {
 
 	List findList(WxGameTemplate wxGameTemplate);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxLevelConfigMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxLevelConfigMapper.java
index 8174b70cb..b6f1823ca 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxLevelConfigMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxLevelConfigMapper.java
@@ -1,9 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
-import org.apache.ibatis.annotations.Param;
 import com.iformall.domain.po.WxLevelConfig;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface WxLevelConfigMapper extends CommonMapper {
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMallBuildingMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMallBuildingMapper.java
index 559bf8934..765b0f767 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxMallBuildingMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxMallBuildingMapper.java
@@ -1,9 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxMallBuilding;
 
+import java.util.List;
+
 public interface WxMallBuildingMapper extends CommonMapper {
 
 	List findList(WxMallBuilding wxMallBuilding);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMallDisposeMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMallDisposeMapper.java
index 7b6ef875b..3703bcca2 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxMallDisposeMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxMallDisposeMapper.java
@@ -1,9 +1,7 @@
 package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
-import com.iformall.domain.po.WxMall;
 import com.iformall.domain.po.WxMallDispose;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.WxMallDisposeVo;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMallFloorMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMallFloorMapper.java
index c7c1e87dd..e3f577c30 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxMallFloorMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxMallFloorMapper.java
@@ -1,9 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxMallFloor;
 
+import java.util.List;
+
 public interface WxMallFloorMapper extends CommonMapper {
 
 	List findList(WxMallFloor wxMallFloor);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMallMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMallMapper.java
index 502d43285..22d064a84 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxMallMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxMallMapper.java
@@ -3,7 +3,6 @@ package com.iformall.mapper;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxMall;
 import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.plugin.autoTenantId.TenantInfo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMallNoticeContactMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMallNoticeContactMapper.java
index 64e824370..aade5c270 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxMallNoticeContactMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxMallNoticeContactMapper.java
@@ -2,7 +2,6 @@ package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxMallNoticeContact;
-import com.iformall.domain.po.WxMallVersion;
 import com.iformall.domain.po.base.TenantEntity;
 
 import java.util.List;
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMallOcrModelMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMallOcrModelMapper.java
index 2a5b55eeb..8fcb53a7a 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxMallOcrModelMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxMallOcrModelMapper.java
@@ -2,11 +2,10 @@ package com.iformall.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.iformall.domain.po.WxMallOcrModel;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
-import org.apache.ibatis.annotations.Mapper;
-
 @Mapper
 public interface WxMallOcrModelMapper extends BaseMapper {
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantBUserMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantBUserMapper.java
index b911c6a8b..396c08a43 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantBUserMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantBUserMapper.java
@@ -1,11 +1,12 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxMerchantBUser;
 import com.iformall.domain.vo.WxMerchantBuInfoVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface WxMerchantBUserMapper extends CommonMapper {
 
 	List findList(WxMerchantBUser wxMerchantBUser);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java
index 7b0f6e395..69849971a 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java
@@ -1,8 +1,8 @@
 package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
-import com.iformall.domain.po.WxMerchant;
 import com.iformall.domain.dto.WxMerchantDto;
+import com.iformall.domain.po.WxMerchant;
 import com.iformall.domain.po.base.TenantEntity;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantOcrModelMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantOcrModelMapper.java
index 51766acda..a688a9d27 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantOcrModelMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantOcrModelMapper.java
@@ -2,11 +2,10 @@ package com.iformall.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.iformall.domain.po.WxMerchantOcrModel;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
-import org.apache.ibatis.annotations.Mapper;
-
 @Mapper
 public interface WxMerchantOcrModelMapper extends BaseMapper {
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantScoreRulesMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantScoreRulesMapper.java
index 258aeac3b..59f5d9eb9 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantScoreRulesMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantScoreRulesMapper.java
@@ -2,7 +2,6 @@ package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxMerchantScoreRules;
-import com.iformall.domain.po.WxScoreRules;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantShopMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantShopMapper.java
index f64afb42d..4b481b3cf 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantShopMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantShopMapper.java
@@ -1,11 +1,11 @@
 package com.iformall.mapper;
 
-import java.util.*;
-
-import org.apache.ibatis.annotations.Param;
-
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxMerchantShop;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 public interface WxMerchantShopMapper extends CommonMapper {
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantSubsidyMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantSubsidyMapper.java
index e5bdfcc27..47798f6ab 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantSubsidyMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantSubsidyMapper.java
@@ -1,13 +1,13 @@
 package com.iformall.mapper;
 
-import java.math.BigDecimal;
-import java.util.*;
-
-import org.apache.ibatis.annotations.Param;
-
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxMerchantSubsidy;
 import com.iformall.domain.vo.WxMerchantSubsidyVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
 
 public interface WxMerchantSubsidyMapper extends CommonMapper {
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantTradeDailyHistoryMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantTradeDailyHistoryMapper.java
index 48625657f..137dd723b 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantTradeDailyHistoryMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantTradeDailyHistoryMapper.java
@@ -1,9 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxMerchantTradeDailyHistory;
 
+import java.util.List;
+
 public interface WxMerchantTradeDailyHistoryMapper extends CommonMapper {
 
 	List findList(WxMerchantTradeDailyHistory wxMerchantTradeDailyHistory);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantTradeDailyMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantTradeDailyMapper.java
index ace974000..51e226953 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantTradeDailyMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantTradeDailyMapper.java
@@ -1,9 +1,9 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxMerchantTradeDaily;
-import com.iformall.domain.vo.WxMerchantTradeDailyVo;
+
+import java.util.List;
 
 public interface WxMerchantTradeDailyMapper extends CommonMapper {
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMiniappThemeMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMiniappThemeMapper.java
index 8a006eed0..6afb6714e 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxMiniappThemeMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxMiniappThemeMapper.java
@@ -2,7 +2,6 @@ package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxMiniappTheme;
-import com.iformall.domain.po.WxMiniappThemeDeploy;
 import com.iformall.domain.po.WxMiniappThemeValue;
 import com.iformall.domain.po.WxThemeMall;
 import org.apache.ibatis.annotations.Param;
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMsgConfigMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMsgConfigMapper.java
index 34abdd490..4ee98d525 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxMsgConfigMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxMsgConfigMapper.java
@@ -1,9 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxMsgConfig;
 
+import java.util.List;
+
 public interface WxMsgConfigMapper extends CommonMapper {
 
 	List findList(WxMsgConfig wxMsgConfig);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMsgMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMsgMapper.java
index c270f1db8..c0506fa6f 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxMsgMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxMsgMapper.java
@@ -1,9 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.msg.WxMsg;
 
+import java.util.List;
+
 public interface WxMsgMapper extends CommonMapper {
 
 	List findList(WxMsg wxMsg);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMsgModelMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMsgModelMapper.java
index 7cab4cad9..7beeb38e2 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxMsgModelMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxMsgModelMapper.java
@@ -1,9 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxMsgModel;
 
+import java.util.List;
+
 public interface WxMsgModelMapper extends CommonMapper {
 
 	List findList(WxMsgModel wxMsgModel);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMsgSignatureMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMsgSignatureMapper.java
index a1672aa00..ada3852db 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxMsgSignatureMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxMsgSignatureMapper.java
@@ -1,9 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxMsgSignature;
 
+import java.util.List;
+
 public interface WxMsgSignatureMapper extends CommonMapper {
 
 	List findList(WxMsgSignature wxMsgSignature);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMsgValidationcodeModelMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMsgValidationcodeModelMapper.java
index cb9666305..03129c9ef 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxMsgValidationcodeModelMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxMsgValidationcodeModelMapper.java
@@ -1,10 +1,11 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxMsgValidationcodeModel;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface WxMsgValidationcodeModelMapper extends CommonMapper {
 
 	void wxMsgValidationcodeModelInit(@Param(value="initSql") String initSql);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMsgValidationcodeModelTenantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMsgValidationcodeModelTenantMapper.java
index a27a0c17c..6f2ab5fb5 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxMsgValidationcodeModelTenantMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxMsgValidationcodeModelTenantMapper.java
@@ -1,11 +1,9 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
-import com.iformall.domain.po.WxMsgValidationcodeModel;
 import com.iformall.domain.po.WxMsgValidationcodeModelTenant;
 
-import org.apache.ibatis.annotations.Param;
+import java.util.List;
 
 public interface WxMsgValidationcodeModelTenantMapper extends CommonMapper {
 	
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxOcrModelMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxOcrModelMapper.java
index d2a5bdbfc..7bffa7749 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxOcrModelMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxOcrModelMapper.java
@@ -2,11 +2,10 @@ package com.iformall.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.iformall.domain.po.WxOcrModel;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
-import org.apache.ibatis.annotations.Mapper;
-
 @Mapper
 public interface WxOcrModelMapper extends BaseMapper {
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxOrderGroupMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxOrderGroupMapper.java
index 6d01e9965..26f14fce5 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxOrderGroupMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxOrderGroupMapper.java
@@ -7,12 +7,11 @@ import com.iformall.domain.po.WxOrderGroup;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.WxCouponStatisVo;
 import com.iformall.domain.vo.WxOrderGroupMarketing;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
 
-import org.apache.ibatis.annotations.Param;
-
 /**
  * @author gongbiao
  */
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java
index 81a4796fc..4d7adf803 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java
@@ -3,15 +3,13 @@ package com.iformall.mapper;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.dto.WxOrderReportDto;
 import com.iformall.domain.po.WxOrder;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.*;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.ibatis.annotations.Param;
-
 public interface WxOrderMapper extends CommonMapper {
 
 	WxOrder selectById(@Param("id")Long id,@Param("tenantId")String tenantId);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxOrderPressMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxOrderPressMapper.java
index 59fc01ef5..4cede5920 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxOrderPressMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxOrderPressMapper.java
@@ -1,12 +1,11 @@
 package com.iformall.mapper;
 
-import java.util.*;
-
-import org.apache.ibatis.annotations.Param;
-
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxOrderPress;
-import com.iformall.domain.vo.WxOrderPressVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 public interface WxOrderPressMapper extends CommonMapper {
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxParkMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxParkMapper.java
index 2460df2b1..a839164f9 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxParkMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxParkMapper.java
@@ -1,9 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxPark;
 
+import java.util.List;
+
 public interface WxParkMapper extends CommonMapper {
 
 	List findList(WxPark wxPark);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxPayAccountMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxPayAccountMapper.java
index 1e3b7bdd7..a57c42609 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxPayAccountMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxPayAccountMapper.java
@@ -1,9 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxPayAccount;
 
+import java.util.List;
+
 public interface WxPayAccountMapper extends CommonMapper {
 
 	List findList(WxPayAccount wxPayAccount);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxPayOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxPayOrderMapper.java
index aa55ee85d..3f27a8865 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxPayOrderMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxPayOrderMapper.java
@@ -1,12 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
-
-import org.apache.ibatis.annotations.Param;
-
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxPayOrder;
-import com.iformall.domain.vo.WxPayOrderVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface WxPayOrderMapper extends CommonMapper {
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxPressBatchItemMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxPressBatchItemMapper.java
index f318f4a16..90396a39b 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxPressBatchItemMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxPressBatchItemMapper.java
@@ -2,11 +2,10 @@ package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxPressBatchItem;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-import org.apache.ibatis.annotations.Param;
-
 public interface WxPressBatchItemMapper extends CommonMapper {
 	
 	List findList(WxPressBatchItem record);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxPressBatchMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxPressBatchMapper.java
index 5dff9197e..912d59362 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxPressBatchMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxPressBatchMapper.java
@@ -2,10 +2,10 @@ package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxPressBatch;
-import java.util.List;
-
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface WxPressBatchMapper extends CommonMapper {
 	
 	List findList(WxPressBatch record);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxProfitPaymentReceiverMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxProfitPaymentReceiverMapper.java
index c36e7b2e4..0bb0e5d99 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxProfitPaymentReceiverMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxProfitPaymentReceiverMapper.java
@@ -2,7 +2,6 @@ package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxProfitPaymentReceiver;
-import com.iformall.domain.po.WxProfitSharingReceiver;
 
 import java.util.List;
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxProfitSharingOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxProfitSharingOrderMapper.java
index 9e0f6777e..09e1a49c4 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxProfitSharingOrderMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxProfitSharingOrderMapper.java
@@ -5,12 +5,11 @@ import com.iformall.domain.po.WxProfitSharingOrder;
 import com.iformall.domain.vo.WxProfitSharingOrderDetailsVo;
 import com.iformall.domain.vo.WxProfitSharingOrderQueryVo;
 import com.iformall.domain.vo.WxProfitSharingOrderVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
 
-import org.apache.ibatis.annotations.Param;
-
 public interface WxProfitSharingOrderMapper extends CommonMapper {
 
 	List findList(WxProfitSharingOrder wxProfitSharingOrder);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxProfitSharingReceiverApplyMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxProfitSharingReceiverApplyMapper.java
index 925811575..468afd1d1 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxProfitSharingReceiverApplyMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxProfitSharingReceiverApplyMapper.java
@@ -1,8 +1,6 @@
 package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
-import com.iformall.common.ResultData;
-import com.iformall.domain.po.WxProfitSharingReceiver;
 import com.iformall.domain.po.WxProfitSharingReceiverApply;
 import com.iformall.domain.vo.WxMerchantReceiverApplyVo;
 import org.apache.ibatis.annotations.Param;
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxProfitSharingReceiverMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxProfitSharingReceiverMapper.java
index 6d238fcfc..d9c0f9bd5 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxProfitSharingReceiverMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxProfitSharingReceiverMapper.java
@@ -1,9 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxProfitSharingReceiver;
 
+import java.util.List;
+
 public interface WxProfitSharingReceiverMapper extends CommonMapper {
 
 	List findList(WxProfitSharingReceiver wxProfitSharingReceiver);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxProfitSharingResultMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxProfitSharingResultMapper.java
index 902ed70e1..5ccfa7db7 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxProfitSharingResultMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxProfitSharingResultMapper.java
@@ -1,10 +1,11 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxProfitSharingResult;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface WxProfitSharingResultMapper extends CommonMapper {
 
 	List findList(WxProfitSharingResult wxProfitSharingResult);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java
index 1e340e752..575a2d678 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java
@@ -2,14 +2,10 @@ package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxBillProperty;
-import com.iformall.domain.po.WxBillRent;
 import com.iformall.domain.po.WxPropertyContract;
 import com.iformall.domain.po.WxRentContract;
 
 import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Param;
 
 /**
  * @author gongbiao
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxRefundOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxRefundOrderMapper.java
index 55ad73d18..d38238824 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxRefundOrderMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxRefundOrderMapper.java
@@ -1,11 +1,11 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxRefundOrder;
-import com.iformall.domain.po.base.TenantEntity;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface WxRefundOrderMapper extends CommonMapper {
 
 	List findList(WxRefundOrder wxRefundOrder);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java
index 092b2e593..d1a09a8f9 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java
@@ -6,6 +6,7 @@ import com.iformall.domain.po.WxBusiness;
 import com.iformall.domain.po.WxRentContract;
 import com.iformall.domain.vo.WxRentPropertyContractVo;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 import java.util.Map;
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxScoreHistoryMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxScoreHistoryMapper.java
index bef3feb90..2b99dd55f 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxScoreHistoryMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxScoreHistoryMapper.java
@@ -1,11 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
-
-import org.apache.ibatis.annotations.Param;
-
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxScoreHistory;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface WxScoreHistoryMapper extends CommonMapper {
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxScoreRulesMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxScoreRulesMapper.java
index 9bd38764e..a4293ac33 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxScoreRulesMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxScoreRulesMapper.java
@@ -1,9 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxScoreRules;
 
+import java.util.List;
+
 public interface WxScoreRulesMapper extends CommonMapper {
 
 	List findList(WxScoreRules wxScoreRules);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxScreenAdMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxScreenAdMapper.java
index 4f40dad8f..8929affe3 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxScreenAdMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxScreenAdMapper.java
@@ -4,7 +4,6 @@ import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxScreenAd;
 import com.iformall.domain.po.base.TenantEntity;
 
-
 import java.util.List;
 
 public interface WxScreenAdMapper extends CommonMapper {
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java
index a7ffee9cc..fc91eba9b 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java
@@ -5,8 +5,6 @@ import com.iformall.domain.po.WxShop;
 import com.iformall.domain.vo.WxShopVo;
 import org.apache.ibatis.annotations.Param;
 
-import java.io.Serializable;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxSubsidyMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxSubsidyMapper.java
index 67adbdf13..d06c4209c 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxSubsidyMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxSubsidyMapper.java
@@ -1,10 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
-import org.apache.ibatis.annotations.Param;
 import com.iformall.domain.po.WxSubsidy;
 
+import java.util.List;
+
 public interface WxSubsidyMapper extends CommonMapper {
 
 	List findList(WxSubsidy wxSubsidy);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxTagsMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxTagsMapper.java
index fd5870fba..6ea28a1cd 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxTagsMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxTagsMapper.java
@@ -2,10 +2,10 @@ package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxTags;
-import java.util.List;
-
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface WxTagsMapper extends CommonMapper {
 
 	List findList(WxTags wxTags);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxTemplateMsgMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxTemplateMsgMapper.java
index 7d2adf57d..6b9b74f05 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxTemplateMsgMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxTemplateMsgMapper.java
@@ -1,9 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxTemplateMsg;
 
+import java.util.List;
+
 public interface WxTemplateMsgMapper extends CommonMapper {
 
 	List findList(WxTemplateMsg wxTemplateMsg);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxThemeMallMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxThemeMallMapper.java
index 44caf0c27..5ad616416 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxThemeMallMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxThemeMallMapper.java
@@ -1,13 +1,8 @@
 package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
-import com.iformall.domain.po.WxMiniappTheme;
-import com.iformall.domain.po.WxMiniappThemeDeploy;
-import com.iformall.domain.po.WxMiniappThemeValue;
 import com.iformall.domain.po.WxThemeMall;
 
-import java.util.List;
-
 /**
  * @author
  */
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxTopicMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxTopicMapper.java
index 02d021600..c05486190 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxTopicMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxTopicMapper.java
@@ -1,8 +1,8 @@
 package com.iformall.mapper;
 
 import com.iformall.common.CommonMapper;
-import com.iformall.domain.po.WxCoupon;
 import com.iformall.domain.po.WxTopic;
+
 import java.util.List;
 
 public interface WxTopicMapper extends CommonMapper {
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxUserChannelMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxUserChannelMapper.java
index f7cab3433..632ce7a5c 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxUserChannelMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxUserChannelMapper.java
@@ -1,9 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxUserChannel;
 
+import java.util.List;
+
 public interface WxUserChannelMapper extends CommonMapper {
 
 	List findList(WxUserChannel wxUserChannel);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxUserVisitMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxUserVisitMapper.java
index 336f2a293..c5e605eed 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxUserVisitMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxUserVisitMapper.java
@@ -5,7 +5,6 @@ import com.iformall.domain.dto.MarkingCouponDataReportDto;
 import com.iformall.domain.po.WxUserVisit;
 import com.iformall.domain.vo.TouchUsersReportVo;
 
-import java.util.HashMap;
 import java.util.List;
 
 public interface WxUserVisitMapper extends CommonMapper {
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxWeappBasicSetMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxWeappBasicSetMapper.java
index 2376a2d61..a52fb263b 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxWeappBasicSetMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxWeappBasicSetMapper.java
@@ -1,9 +1,10 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxWeappBasicSet;
 
+import java.util.List;
+
 public interface WxWeappBasicSetMapper extends CommonMapper {
 
 	List findList(WxWeappBasicSet wxWeappBasicSet);
diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxWeappExtSetMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxWeappExtSetMapper.java
index a3d31050f..a7ed12f06 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxWeappExtSetMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxWeappExtSetMapper.java
@@ -1,10 +1,11 @@
 package com.iformall.mapper;
 
-import java.util.*;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxWeappExtSet;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface WxWeappExtSetMapper extends CommonMapper {
 
 	List findList(WxWeappExtSet wxWeappReleaseSet);
diff --git a/mallinkService/src/main/java/com/iformall/mq/impl/AliyunRocketMqMessageProducer.java b/mallinkService/src/main/java/com/iformall/mq/impl/AliyunRocketMqMessageProducer.java
index e539e831d..0788360dc 100644
--- a/mallinkService/src/main/java/com/iformall/mq/impl/AliyunRocketMqMessageProducer.java
+++ b/mallinkService/src/main/java/com/iformall/mq/impl/AliyunRocketMqMessageProducer.java
@@ -1,29 +1,23 @@
 package com.iformall.mq.impl;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.annotation.PostConstruct;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Profile;
-import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSON;
-import com.aliyun.openservices.ons.api.Message;
-import com.aliyun.openservices.ons.api.ONSFactory;
-import com.aliyun.openservices.ons.api.Producer;
-import com.aliyun.openservices.ons.api.PropertyKeyConst;
-import com.aliyun.openservices.ons.api.SendResult;
+import com.aliyun.openservices.ons.api.*;
 import com.iformall.domain.po.msg.BaseMsg;
 import com.iformall.enums.EnumMsgMqTopic;
 import com.iformall.mq.MQConfig;
 import com.iformall.mq.MqBaseProducer;
 import com.iformall.utils.JsonUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PostConstruct;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
 
 
 /**
diff --git a/mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java b/mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java
index 1ca6b9e00..7318ef0d5 100644
--- a/mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java
+++ b/mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java
@@ -10,8 +10,8 @@ import com.iformall.utils.JsonUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.amqp.rabbit.connection.CorrelationData;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
diff --git a/mallinkService/src/main/java/com/iformall/mq/impl/RocketMqMessageProducer.java b/mallinkService/src/main/java/com/iformall/mq/impl/RocketMqMessageProducer.java
index 4953951c5..4717e8a0d 100644
--- a/mallinkService/src/main/java/com/iformall/mq/impl/RocketMqMessageProducer.java
+++ b/mallinkService/src/main/java/com/iformall/mq/impl/RocketMqMessageProducer.java
@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
+
 import javax.annotation.PostConstruct;
 import java.util.UUID;
 
diff --git a/mallinkService/src/main/java/com/iformall/pay/WxCashOutPV3.java b/mallinkService/src/main/java/com/iformall/pay/WxCashOutPV3.java
index eb2186fc0..cf9c54e71 100644
--- a/mallinkService/src/main/java/com/iformall/pay/WxCashOutPV3.java
+++ b/mallinkService/src/main/java/com/iformall/pay/WxCashOutPV3.java
@@ -1,9 +1,9 @@
 package com.iformall.pay;
 
-import java.util.List;
-
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Created by Stormeye on 2018/8/10.
  */
diff --git a/mallinkService/src/main/java/com/iformall/pay/WxPay.java b/mallinkService/src/main/java/com/iformall/pay/WxPay.java
index d95755537..fcc111336 100644
--- a/mallinkService/src/main/java/com/iformall/pay/WxPay.java
+++ b/mallinkService/src/main/java/com/iformall/pay/WxPay.java
@@ -1,23 +1,12 @@
 package com.iformall.pay;
 
-import java.security.cert.X509Certificate;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.crypto.IllegalBlockSizeException;
-
-import com.alibaba.fastjson.JSON;
-import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils;
-import com.github.binarywang.wxpay.config.WxPayConfig;
-import com.github.binarywang.wxpay.exception.WxPayException;
-import com.github.binarywang.wxpay.service.WxPayService;
-import com.github.binarywang.wxpay.v3.util.RsaCryptoUtil;
-import com.iformall.domain.po.WxPayAccount;
 import com.iformall.utils.HttpUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.HashMap;
+import java.util.Map;
+
 public class WxPay {
 	protected static Logger log = LoggerFactory.getLogger(WxPay.class);
 
diff --git a/mallinkService/src/main/java/com/iformall/pay/WxPayV3.java b/mallinkService/src/main/java/com/iformall/pay/WxPayV3.java
index b6aacc88c..42608dc5e 100644
--- a/mallinkService/src/main/java/com/iformall/pay/WxPayV3.java
+++ b/mallinkService/src/main/java/com/iformall/pay/WxPayV3.java
@@ -1,27 +1,14 @@
 package com.iformall.pay;
 
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.StandardCharsets;
-import java.security.GeneralSecurityException;
-import java.security.cert.X509Certificate;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.crypto.IllegalBlockSizeException;
 import com.alibaba.fastjson.JSON;
 import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils;
 import com.github.binarywang.wxpay.config.WxPayConfig;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.github.binarywang.wxpay.v3.auth.PrivateKeySigner;
-import com.github.binarywang.wxpay.v3.auth.Signer.SignatureResult;
 import com.github.binarywang.wxpay.v3.util.AesUtils;
 import com.github.binarywang.wxpay.v3.util.RsaCryptoUtil;
 import com.iformall.service.pay.service.pay.wx.sft.entity.SFTCombineCloseReq;
-import com.iformall.service.pay.service.pay.wx.sft.entity.SFTCombinePayCommonMiniAppReq;
-import com.iformall.service.pay.service.pay.wx.sft.entity.SFTPayCommonMiniAppReq;
 import com.iformall.service.pay.service.pay.wx.sft.entity.SFTPayQueryReq;
 import com.iformall.service.pay.service.pay.wx.v3.entity.V3CombinePayCommonMiniAppReq;
 import com.iformall.service.pay.service.pay.wx.v3.entity.V3PayCommonMiniAppReq;
@@ -30,11 +17,19 @@ import com.iformall.service.pay.service.refund.wx.v3.entity.V3PayRefundReq;
 import com.iformall.service.pay.service.share.wx.v3.entity.V3PayShareQueryReq;
 import com.iformall.service.pay.service.share.wx.v3.entity.V3PayShareReq;
 import com.iformall.service.pay.service.share.wx.v3.entity.V3PayShareUnfreezeReq;
-import com.iformall.utils.MapUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.crypto.IllegalBlockSizeException;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+import java.security.GeneralSecurityException;
+import java.security.cert.X509Certificate;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 public class WxPayV3 {
 	protected static Logger log = LoggerFactory.getLogger(WxPayV3.class);
 
diff --git a/mallinkService/src/main/java/com/iformall/pay/WxPayV3SFT.java b/mallinkService/src/main/java/com/iformall/pay/WxPayV3SFT.java
index 410c95a67..83a50d853 100644
--- a/mallinkService/src/main/java/com/iformall/pay/WxPayV3SFT.java
+++ b/mallinkService/src/main/java/com/iformall/pay/WxPayV3SFT.java
@@ -1,20 +1,12 @@
 package com.iformall.pay;
 
-import java.security.cert.X509Certificate;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.crypto.IllegalBlockSizeException;
 import com.alibaba.fastjson.JSON;
-import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.WxPayService;
-import com.github.binarywang.wxpay.v3.util.RsaCryptoUtil;
 import com.iformall.service.pay.service.pay.wx.sft.entity.SFTCombineCloseReq;
 import com.iformall.service.pay.service.pay.wx.sft.entity.SFTCombinePayCommonMiniAppReq;
 import com.iformall.service.pay.service.pay.wx.sft.entity.SFTPayCommonMiniAppReq;
 import com.iformall.service.pay.service.pay.wx.sft.entity.SFTPayQueryReq;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/mallinkService/src/main/java/com/iformall/pay/WxProfitSharing.java b/mallinkService/src/main/java/com/iformall/pay/WxProfitSharing.java
index b49405b91..d02229f72 100644
--- a/mallinkService/src/main/java/com/iformall/pay/WxProfitSharing.java
+++ b/mallinkService/src/main/java/com/iformall/pay/WxProfitSharing.java
@@ -1,11 +1,11 @@
 package com.iformall.pay;
 
-import java.util.Map;
-
 import com.iformall.utils.HttpUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Map;
+
 public class WxProfitSharing {
 	protected static Logger log = LoggerFactory.getLogger(WxProfitSharing.class);
 
diff --git a/mallinkService/src/main/java/com/iformall/service/ExcelService.java b/mallinkService/src/main/java/com/iformall/service/ExcelService.java
index 908af060c..35baa79c8 100644
--- a/mallinkService/src/main/java/com/iformall/service/ExcelService.java
+++ b/mallinkService/src/main/java/com/iformall/service/ExcelService.java
@@ -9,7 +9,6 @@ import cn.afterturn.easypoi.excel.entity.ImportParams;
 import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
 import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
 import cn.afterturn.easypoi.handler.inter.IExcelExportServer;
-
 import com.iformall.common.ErrorCode;
 import com.iformall.exception.MallinkException;
 import org.apache.commons.lang3.StringUtils;
diff --git a/mallinkService/src/main/java/com/iformall/service/MallResourceService.java b/mallinkService/src/main/java/com/iformall/service/MallResourceService.java
index 7043f265b..5ea1b3534 100644
--- a/mallinkService/src/main/java/com/iformall/service/MallResourceService.java
+++ b/mallinkService/src/main/java/com/iformall/service/MallResourceService.java
@@ -1,6 +1,5 @@
 package com.iformall.service;
 
-import java.util.*;
 import com.github.pagehelper.PageInfo;
 import com.iformall.domain.po.MallResource;
 
diff --git a/mallinkService/src/main/java/com/iformall/service/MallUserRoleService.java b/mallinkService/src/main/java/com/iformall/service/MallUserRoleService.java
index decae7a99..1801ab648 100644
--- a/mallinkService/src/main/java/com/iformall/service/MallUserRoleService.java
+++ b/mallinkService/src/main/java/com/iformall/service/MallUserRoleService.java
@@ -1,7 +1,6 @@
 package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
-import com.iformall.domain.po.MallPermission;
 import com.iformall.domain.po.MallUserInfo;
 import com.iformall.domain.po.MallUserRole;
 
diff --git a/mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java b/mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java
index 72889438a..3fb2136d8 100644
--- a/mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java
+++ b/mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java
@@ -1,14 +1,14 @@
 package com.iformall.service;
 
-import java.util.*;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.github.pagehelper.PageInfo;
 import com.iformall.domain.dto.NeuPosUpdatePayDto;
 import com.iformall.domain.po.NeuPosOrderMasterExt;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
 public interface NeuPosOrderService {
 
 	/**
diff --git a/mallinkService/src/main/java/com/iformall/service/PosActionLogService.java b/mallinkService/src/main/java/com/iformall/service/PosActionLogService.java
index 76b2ef539..9598f0ccd 100644
--- a/mallinkService/src/main/java/com/iformall/service/PosActionLogService.java
+++ b/mallinkService/src/main/java/com/iformall/service/PosActionLogService.java
@@ -1,6 +1,5 @@
 package com.iformall.service;
 
-import java.util.*;
 import com.github.pagehelper.PageInfo;
 import com.iformall.domain.po.PosActionLog;
 
diff --git a/mallinkService/src/main/java/com/iformall/service/PosOrderService.java b/mallinkService/src/main/java/com/iformall/service/PosOrderService.java
index 711aa2bee..cbe4aac09 100644
--- a/mallinkService/src/main/java/com/iformall/service/PosOrderService.java
+++ b/mallinkService/src/main/java/com/iformall/service/PosOrderService.java
@@ -1,6 +1,5 @@
 package com.iformall.service;
 
-import java.util.*;
 import com.github.pagehelper.PageInfo;
 import com.iformall.domain.po.PosOrder;
 
diff --git a/mallinkService/src/main/java/com/iformall/service/QrCodeService.java b/mallinkService/src/main/java/com/iformall/service/QrCodeService.java
index 77c02da08..9695944a7 100644
--- a/mallinkService/src/main/java/com/iformall/service/QrCodeService.java
+++ b/mallinkService/src/main/java/com/iformall/service/QrCodeService.java
@@ -3,11 +3,10 @@ package com.iformall.service;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.enums.EnumAppPlat;
-import com.iformall.enums.EnumPayVersion;
-import com.iformall.enums.EnumPayWay;
 import com.iformall.exception.MallinkException;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
diff --git a/mallinkService/src/main/java/com/iformall/service/RedisService.java b/mallinkService/src/main/java/com/iformall/service/RedisService.java
index d1bd09801..0ce492ce7 100644
--- a/mallinkService/src/main/java/com/iformall/service/RedisService.java
+++ b/mallinkService/src/main/java/com/iformall/service/RedisService.java
@@ -1,8 +1,6 @@
 package com.iformall.service;
 
 import java.util.Collection;
-import java.util.List;
-import java.util.Set;
 
 public interface RedisService {
 
diff --git a/mallinkService/src/main/java/com/iformall/service/SellerAgentService.java b/mallinkService/src/main/java/com/iformall/service/SellerAgentService.java
index 7c365523e..eeb92b3c0 100644
--- a/mallinkService/src/main/java/com/iformall/service/SellerAgentService.java
+++ b/mallinkService/src/main/java/com/iformall/service/SellerAgentService.java
@@ -1,11 +1,11 @@
 package com.iformall.service;
 
-import java.util.*;
-
 import com.github.pagehelper.PageInfo;
 import com.iformall.domain.po.SellerAgent;
 import com.iformall.domain.po.SellerAgentAccount;
 
+import java.util.List;
+
 public interface SellerAgentService {
 
 	PageInfo listAsPage(SellerAgent record, Integer pageIndex, Integer pageSize);
diff --git a/mallinkService/src/main/java/com/iformall/service/SysGaoDeService.java b/mallinkService/src/main/java/com/iformall/service/SysGaoDeService.java
index 1445e34fb..c05a8a77c 100644
--- a/mallinkService/src/main/java/com/iformall/service/SysGaoDeService.java
+++ b/mallinkService/src/main/java/com/iformall/service/SysGaoDeService.java
@@ -1,11 +1,10 @@
 package com.iformall.service;
 
+import com.iformall.domain.vo.GaodeCityTree;
+
 import java.util.List;
 import java.util.Map;
 
-import com.iformall.domain.po.SysGaodeCity;
-import com.iformall.domain.vo.GaodeCityTree;
-
 public interface SysGaoDeService {
 
     /**
diff --git a/mallinkService/src/main/java/com/iformall/service/SysNoticeService.java b/mallinkService/src/main/java/com/iformall/service/SysNoticeService.java
index a725b49d8..1ef56a59f 100644
--- a/mallinkService/src/main/java/com/iformall/service/SysNoticeService.java
+++ b/mallinkService/src/main/java/com/iformall/service/SysNoticeService.java
@@ -1,8 +1,8 @@
 package com.iformall.service;
 
-import java.util.*;
-
 import com.iformall.domain.po.SysNotice;
+
+import java.util.List;
 public interface SysNoticeService {
 
     List selectList(SysNotice notice) ;
diff --git a/mallinkService/src/main/java/com/iformall/service/TtCUserService.java b/mallinkService/src/main/java/com/iformall/service/TtCUserService.java
index 01072f450..0bab66c60 100644
--- a/mallinkService/src/main/java/com/iformall/service/TtCUserService.java
+++ b/mallinkService/src/main/java/com/iformall/service/TtCUserService.java
@@ -2,9 +2,8 @@ package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
 import com.iformall.domain.dto.WxCUserBasicInfoDto;
-import com.iformall.domain.po.tt.TtCUser;
 import com.iformall.domain.po.WxCUserFrom;
-import com.iformall.domain.po.base.TenantEntity;
+import com.iformall.domain.po.tt.TtCUser;
 import com.iformall.domain.vo.UserCountVo;
 
 import java.util.List;
diff --git a/mallinkService/src/main/java/com/iformall/service/TtGoodsCategoryService.java b/mallinkService/src/main/java/com/iformall/service/TtGoodsCategoryService.java
index 63fbee43b..46f72c467 100644
--- a/mallinkService/src/main/java/com/iformall/service/TtGoodsCategoryService.java
+++ b/mallinkService/src/main/java/com/iformall/service/TtGoodsCategoryService.java
@@ -1,7 +1,5 @@
 package com.iformall.service;
 
-import com.iformall.common.ErrorCode;
-import com.iformall.common.ResultData;
 import com.iformall.domain.po.TtGoodsCategory;
 import com.iformall.domain.po.TtGoodsCategoryNew;
 import com.iformall.domain.po.WxCoupon;
diff --git a/mallinkService/src/main/java/com/iformall/service/TtMallGoodsCategoryService.java b/mallinkService/src/main/java/com/iformall/service/TtMallGoodsCategoryService.java
index cd0aea9dc..6dcdb5aee 100644
--- a/mallinkService/src/main/java/com/iformall/service/TtMallGoodsCategoryService.java
+++ b/mallinkService/src/main/java/com/iformall/service/TtMallGoodsCategoryService.java
@@ -1,8 +1,5 @@
 package com.iformall.service;
 
-import com.iformall.common.ErrorCode;
-import com.iformall.domain.po.TtGoodsCategory;
-import com.iformall.domain.po.TtMallGoodsCategory;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.TtMallGoodsCategoryVo;
 
diff --git a/mallinkService/src/main/java/com/iformall/service/TtMallImService.java b/mallinkService/src/main/java/com/iformall/service/TtMallImService.java
index 7ebdde33b..f01bf24b8 100644
--- a/mallinkService/src/main/java/com/iformall/service/TtMallImService.java
+++ b/mallinkService/src/main/java/com/iformall/service/TtMallImService.java
@@ -2,7 +2,6 @@ package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
 import com.iformall.domain.po.TtMallIm;
-import com.iformall.domain.po.base.TenantEntity;
 
 import java.util.List;
 
diff --git a/mallinkService/src/main/java/com/iformall/service/TtMerchantPoiService.java b/mallinkService/src/main/java/com/iformall/service/TtMerchantPoiService.java
index b623e4b65..f5f0a4a7a 100644
--- a/mallinkService/src/main/java/com/iformall/service/TtMerchantPoiService.java
+++ b/mallinkService/src/main/java/com/iformall/service/TtMerchantPoiService.java
@@ -11,11 +11,10 @@ import com.iformall.domain.vo.MerchantPoiTNew;
 import com.iformall.douyin.web.api.goodlifesaas.TtGoodLifeSaasService;
 import com.iformall.douyin.web.api.web.TtWebService;
 
-import java.util.List;
-import java.util.Map;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author gongbiao
diff --git a/mallinkService/src/main/java/com/iformall/service/TtOrderPushErrorService.java b/mallinkService/src/main/java/com/iformall/service/TtOrderPushErrorService.java
index cd5f4413c..25e3ba51b 100644
--- a/mallinkService/src/main/java/com/iformall/service/TtOrderPushErrorService.java
+++ b/mallinkService/src/main/java/com/iformall/service/TtOrderPushErrorService.java
@@ -1,7 +1,6 @@
 package com.iformall.service;
 
 
-import com.iformall.domain.po.WxBatchOrder;
 import com.iformall.domain.po.base.TenantEntity;
 
 /**
diff --git a/mallinkService/src/main/java/com/iformall/service/UserBasicInfoAddressService.java b/mallinkService/src/main/java/com/iformall/service/UserBasicInfoAddressService.java
index 87f1f4031..178295e18 100644
--- a/mallinkService/src/main/java/com/iformall/service/UserBasicInfoAddressService.java
+++ b/mallinkService/src/main/java/com/iformall/service/UserBasicInfoAddressService.java
@@ -1,8 +1,7 @@
 package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
-import com.iformall.common.ResultData;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.UserBasicInfoAddress;
 
 public interface UserBasicInfoAddressService {
 
diff --git a/mallinkService/src/main/java/com/iformall/service/WxActivityJoinService.java b/mallinkService/src/main/java/com/iformall/service/WxActivityJoinService.java
index 6117a4c83..8bd04bab5 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxActivityJoinService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxActivityJoinService.java
@@ -4,7 +4,6 @@ import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.WxActivity;
 import com.iformall.domain.po.WxActivityJoin;
-import com.iformall.domain.po.base.TenantEntity;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/mallinkService/src/main/java/com/iformall/service/WxActivityService.java b/mallinkService/src/main/java/com/iformall/service/WxActivityService.java
index 6b6cbb110..58e1730d9 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxActivityService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxActivityService.java
@@ -3,7 +3,6 @@ package com.iformall.service;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.WxActivity;
-import com.iformall.enums.EnumPayWay;
 
 import javax.servlet.http.HttpServletResponse;
 
diff --git a/mallinkService/src/main/java/com/iformall/service/WxAppinfoService.java b/mallinkService/src/main/java/com/iformall/service/WxAppinfoService.java
index fece4aa9b..f6cc938cb 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxAppinfoService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxAppinfoService.java
@@ -6,10 +6,7 @@ import com.iformall.domain.po.WxCoupon;
 import com.iformall.domain.po.WxProjectConfig;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.enums.EnumAppPlat;
-import com.iformall.enums.EnumPayWay;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 public interface WxAppinfoService {
diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java b/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java
index b4ae24519..6495d3943 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java
@@ -8,7 +8,6 @@ import com.iformall.domain.vo.WxBillDailyVo;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Map;
 
 /**
  * @author gongbiao
diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java b/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java
index 8257bc710..9f3f239fe 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java
@@ -7,7 +7,6 @@ import com.iformall.domain.po.WxBillOtherDeposit;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Map;
 
 /**
  * @author gongbiao
diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillOtherService.java b/mallinkService/src/main/java/com/iformall/service/WxBillOtherService.java
index 42e42ae6e..216466b5b 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxBillOtherService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxBillOtherService.java
@@ -7,7 +7,6 @@ import com.iformall.domain.po.WxBillOther;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Map;
 
 /**
  * @author gongbiao
diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java
index 9f318ed2a..652ddde0b 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java
@@ -6,8 +6,6 @@ import com.iformall.domain.po.MallUserInfo;
 import com.iformall.domain.po.WxBillPropertyDeposit;
 import com.iformall.domain.po.WxPayAccountBill;
 
-import java.util.Map;
-
 /**
  * @author gongbiao
  */
diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java
index a4e80fdb1..2a649b898 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java
@@ -3,8 +3,8 @@ package com.iformall.service;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.MallUserInfo;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.WxBillProperty;
+import com.iformall.domain.po.base.TenantEntity;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillRentManageService.java b/mallinkService/src/main/java/com/iformall/service/WxBillRentManageService.java
index b2566560f..dde2d3dab 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxBillRentManageService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxBillRentManageService.java
@@ -1,16 +1,14 @@
 package com.iformall.service;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.MallUserInfo;
-import com.iformall.domain.po.WxBillDeposit;
-import com.iformall.domain.po.WxBillRent;
 import com.iformall.domain.po.WxBillRentManage;
 import com.iformall.domain.po.WxPayAccountBill;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 public interface WxBillRentManageService {
 
 	/**
diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java
index d2e471766..0bd8346d5 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java
@@ -1,6 +1,5 @@
 package com.iformall.service;
 
-import java.util.*;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.MallUserInfo;
diff --git a/mallinkService/src/main/java/com/iformall/service/WxBrandService.java b/mallinkService/src/main/java/com/iformall/service/WxBrandService.java
index bfdca9471..dc49b8fb8 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxBrandService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxBrandService.java
@@ -2,8 +2,8 @@ package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.WxBrand;
+import com.iformall.domain.po.base.TenantEntity;
 
 import java.io.Serializable;
 import java.util.Collection;
diff --git a/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java
index fd14706e0..834dd9888 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java
@@ -2,7 +2,6 @@ package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.AliBusinessCircleOrder;
 import com.iformall.domain.po.BusinessCircleBase;
 import com.iformall.domain.po.WxBusinessCircleOrder;
 import com.iformall.domain.po.base.TenantEntity;
diff --git a/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java b/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java
index d363d3ecb..8ac1d1ce6 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java
@@ -2,8 +2,8 @@ package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.WxBusiness;
+import com.iformall.domain.po.base.TenantEntity;
 
 import java.io.Serializable;
 import java.util.Collection;
diff --git a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicChildService.java b/mallinkService/src/main/java/com/iformall/service/WxCUserBasicChildService.java
index 73bb11955..7b1f4f929 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicChildService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxCUserBasicChildService.java
@@ -1,7 +1,8 @@
 package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.WxCUserBasicChild;
+
 import java.util.List;
 
 public interface WxCUserBasicChildService {
diff --git a/mallinkService/src/main/java/com/iformall/service/WxCUserCarService.java b/mallinkService/src/main/java/com/iformall/service/WxCUserCarService.java
index 6d882e5f1..3866e3355 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxCUserCarService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxCUserCarService.java
@@ -3,7 +3,6 @@ package com.iformall.service;
 import com.github.pagehelper.PageInfo;
 import com.iformall.domain.dto.WxCUserBasicInfoDto;
 import com.iformall.domain.po.WxCUserCar;
-import com.iformall.domain.po.base.TenantEntity;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/mallinkService/src/main/java/com/iformall/service/WxCUserFromBService.java b/mallinkService/src/main/java/com/iformall/service/WxCUserFromBService.java
index 2f9e8e7a8..1a1b43e15 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxCUserFromBService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxCUserFromBService.java
@@ -1,7 +1,6 @@
 package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
-import com.iformall.common.ResultData;
 import com.iformall.domain.dto.WxCUserFromBDto;
 import com.iformall.domain.po.WxCUserFromB;
 
diff --git a/mallinkService/src/main/java/com/iformall/service/WxCUserService.java b/mallinkService/src/main/java/com/iformall/service/WxCUserService.java
index c5b94719b..227d159d5 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxCUserService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxCUserService.java
@@ -5,9 +5,7 @@ import com.iformall.domain.dto.WxCUserBasicInfoDto;
 import com.iformall.domain.po.WxAuthorizerInfo;
 import com.iformall.domain.po.WxCUser;
 import com.iformall.domain.po.WxCUserFrom;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.UserCountVo;
-import com.iformall.enums.EnumScoreType;
 import me.chanjar.weixin.mp.bean.result.WxMpUser;
 
 import java.util.List;
diff --git a/mallinkService/src/main/java/com/iformall/service/WxCampaignService.java b/mallinkService/src/main/java/com/iformall/service/WxCampaignService.java
index f6ec52e41..85738976e 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxCampaignService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxCampaignService.java
@@ -4,10 +4,6 @@ import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.WxCampaign;
 import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.enums.EnumAppPlat;
-import com.iformall.enums.EnumCampaignProductType;
-import com.iformall.enums.EnumPayWay;
-import com.iformall.enums.EnumProjectPlat;
 
 import javax.servlet.http.HttpServletResponse;
 
diff --git a/mallinkService/src/main/java/com/iformall/service/WxCarCmdLogService.java b/mallinkService/src/main/java/com/iformall/service/WxCarCmdLogService.java
index fb35ff9a6..3280cc868 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxCarCmdLogService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxCarCmdLogService.java
@@ -2,11 +2,8 @@ package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
 import com.iformall.domain.po.WxCarCmdLog;
-import org.apache.ibatis.annotations.Param;
 
-import java.math.BigDecimal;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 public interface WxCarCmdLogService {
diff --git a/mallinkService/src/main/java/com/iformall/service/WxCardDailyLogService.java b/mallinkService/src/main/java/com/iformall/service/WxCardDailyLogService.java
index 33c6f6ada..c1dac34c6 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxCardDailyLogService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxCardDailyLogService.java
@@ -1,7 +1,7 @@
 package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.WxCardDailyLog;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java b/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java
index 479b7fd3d..5e11d0844 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java
@@ -7,15 +7,12 @@ import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.PromotionCalc;
 import com.iformall.domain.vo.WxCardSpendMerchantVo;
 import com.iformall.domain.vo.WxCardSpendVo;
-import com.iformall.enums.EnumPayWay;
 import com.iformall.exception.MallinkException;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import java.math.BigDecimal;
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 
 public interface WxCardSpendService {
diff --git a/mallinkService/src/main/java/com/iformall/service/WxCashOutService.java b/mallinkService/src/main/java/com/iformall/service/WxCashOutService.java
index 9fce75a33..6a51b7477 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxCashOutService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxCashOutService.java
@@ -2,7 +2,9 @@ package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.WxCashOut;
+import com.iformall.domain.po.WxMerchant;
+import com.iformall.domain.po.WxMerchantBUser;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.enums.EnumPayWay;
 import com.iformall.exception.MallinkException;
diff --git a/mallinkService/src/main/java/com/iformall/service/WxChartDataService.java b/mallinkService/src/main/java/com/iformall/service/WxChartDataService.java
index 73fa73887..0a0ee0d02 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxChartDataService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxChartDataService.java
@@ -1,7 +1,6 @@
 package com.iformall.service;
 
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.WxChartDataEntity;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.enums.EnumChartType;
 
diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponActionLogService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponActionLogService.java
index 24eb363f5..6024645d0 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxCouponActionLogService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxCouponActionLogService.java
@@ -2,8 +2,8 @@ package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
 import com.iformall.domain.dto.MarkingCouponDataReportDto;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.WxCouponActionLog;
+import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.MarkingSceneDataReportVo;
 import com.iformall.domain.vo.MarkingSceneDataVo;
 import com.iformall.domain.vo.WxCouponActionLogVo;
diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponBatchService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponBatchService.java
index 3a0eb4468..0b7de920c 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxCouponBatchService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxCouponBatchService.java
@@ -1,27 +1,12 @@
 package com.iformall.service;
 
-import java.util.*;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.github.pagehelper.PageInfo;
-import com.iformall.common.ResultData;
-import com.iformall.domain.po.TtCouponChannelPoi;
-import com.iformall.domain.po.WxAppinfo;
 import com.iformall.domain.po.WxCoupon;
 import com.iformall.domain.po.WxCouponBatch;
 import com.iformall.domain.po.WxCouponBatchItem;
-import com.iformall.domain.po.WxOrder;
-import com.iformall.domain.po.WxPressBatch;
-import com.iformall.domain.po.WxPressBatchItem;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.CouponBatchVo;
-import com.iformall.domain.vo.CouponPressBatchVo;
-import com.iformall.domain.vo.TtCouponVo;
-import com.iformall.domain.vo.WxCouponCVo;
-import com.iformall.domain.vo.WxCouponStatisVo;
-import com.iformall.domain.vo.WxMerchantVo;
+
+import java.util.List;
 
 public interface WxCouponBatchService {
 
diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponCarService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponCarService.java
index b8938b309..bcd411417 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxCouponCarService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxCouponCarService.java
@@ -1,7 +1,6 @@
 package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
-import com.iformall.domain.po.WxCoupon;
 import com.iformall.domain.po.WxCouponCar;
 import com.iformall.domain.vo.WxCouponCarVo;
 
diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java
index 7465ead86..2a0e19b61 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java
@@ -2,14 +2,13 @@ package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.WxCoupon;
 import com.iformall.domain.po.WxCouponChannel;
+import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.TtCouponChannelVo;
 import com.iformall.domain.vo.WxCouponCVo;
 import com.iformall.domain.vo.WxCouponChannelAddVo;
 import com.iformall.domain.vo.WxCouponChannelVo;
-import com.iformall.enums.EnumPayWay;
 
 import java.util.Date;
 import java.util.List;
diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponMallService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponMallService.java
index 5fb18b377..f58f7b671 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxCouponMallService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxCouponMallService.java
@@ -1,22 +1,9 @@
 package com.iformall.service;
 
-import java.util.*;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.github.pagehelper.PageInfo;
-import com.iformall.common.ResultData;
-import com.iformall.domain.po.TtCouponChannelPoi;
-import com.iformall.domain.po.WxAppinfo;
-import com.iformall.domain.po.WxCoupon;
 import com.iformall.domain.po.WxCouponMall;
-import com.iformall.domain.po.WxMerchant;
-import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.domain.vo.TtCouponVo;
-import com.iformall.domain.vo.WxCouponCVo;
-import com.iformall.domain.vo.WxCouponStatisVo;
-import com.iformall.domain.vo.WxMerchantVo;
+
+import java.util.List;
 
 public interface WxCouponMallService {
 
diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderReservationService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderReservationService.java
index 0743c318c..b4b9b5829 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderReservationService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderReservationService.java
@@ -1,9 +1,9 @@
 package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
-import com.iformall.common.ErrorCode;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.WxCouponOrder;
+import com.iformall.domain.po.WxCouponOrderReservation;
 import com.iformall.enums.EnumCouponOrderReservationStatus;
 
 public interface WxCouponOrderReservationService {
diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java
index 1ae3add87..fee13d1f1 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java
@@ -14,7 +14,6 @@ import com.iformall.service.order.entity.WxComposeOrder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponSendService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponSendService.java
index 386316a64..341d2fe51 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxCouponSendService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxCouponSendService.java
@@ -1,15 +1,15 @@
 package com.iformall.service;
 
-import java.util.List;
-
 import com.github.pagehelper.PageInfo;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.WxCouponSend;
+import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.WxCouponSendVo;
 import com.iformall.enums.EnumCouponSendSendType;
 import com.iformall.enums.EnumPayVersion;
 import com.iformall.enums.EnumPayWay;
 
+import java.util.List;
+
 public interface WxCouponSendService {
 
 	/**
diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java
index a2c461dde..ae945ef7f 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java
@@ -1,19 +1,20 @@
 package com.iformall.service;
 
-import java.util.*;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.github.pagehelper.PageInfo;
-import com.iformall.common.ErrorCode;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.MallUserInfo;
+import com.iformall.domain.po.WxCoupon;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.WxCouponCVo;
 import com.iformall.domain.vo.WxCouponStatisVo;
 import com.iformall.domain.vo.WxMerchantVo;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
 public interface WxCouponService {
 
     ResultData list(TenantEntity tenantEntity,WxCoupon wxCoupon, Integer pageNum, Integer pageSize);
diff --git a/mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java b/mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java
index c1e5beea6..88f723efe 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java
@@ -3,15 +3,14 @@ package com.iformall.service;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.WxCUserBasicInfo;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.WxCreditHistory;
+import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.MerchantCreditRankingVo;
 import com.iformall.domain.vo.WxCreditHistoryVo;
 import com.iformall.enums.EnumAppPlat;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Date;
 import java.util.Map;
 
 public interface WxCreditHistoryService {
diff --git a/mallinkService/src/main/java/com/iformall/service/WxCustomizeModuleService.java b/mallinkService/src/main/java/com/iformall/service/WxCustomizeModuleService.java
index 1a8d8508b..ac1e4fab1 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxCustomizeModuleService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxCustomizeModuleService.java
@@ -2,7 +2,8 @@ package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.WxAppinfo;
+import com.iformall.domain.po.WxCustomizeModule;
 
 import java.util.List;
 
diff --git a/mallinkService/src/main/java/com/iformall/service/WxFlowRecordService.java b/mallinkService/src/main/java/com/iformall/service/WxFlowRecordService.java
index ea07ec8f3..577a1f5bb 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxFlowRecordService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxFlowRecordService.java
@@ -1,6 +1,7 @@
 package com.iformall.service;
 
 import com.iformall.domain.po.WxFlowRecord;
+
 import java.util.List;
 
 /**
diff --git a/mallinkService/src/main/java/com/iformall/service/WxFlowService.java b/mallinkService/src/main/java/com/iformall/service/WxFlowService.java
index ee30d3a33..41a54c05e 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxFlowService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxFlowService.java
@@ -2,10 +2,10 @@ package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.WxFlowConfig;
 import com.iformall.domain.po.WxFlowModel;
 import com.iformall.domain.po.WxFlowRecord;
+import com.iformall.domain.po.base.TenantEntity;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
diff --git a/mallinkService/src/main/java/com/iformall/service/WxGameService.java b/mallinkService/src/main/java/com/iformall/service/WxGameService.java
index 18d470c55..d71819809 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxGameService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxGameService.java
@@ -3,9 +3,7 @@ package com.iformall.service;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.WxGame;
-import com.iformall.domain.po.WxGameActionLog;
 import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.enums.EnumPayWay;
 
 public interface WxGameService {
 
diff --git a/mallinkService/src/main/java/com/iformall/service/WxMallBuildingService.java b/mallinkService/src/main/java/com/iformall/service/WxMallBuildingService.java
index 33c1ae0fc..22f5cc731 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxMallBuildingService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxMallBuildingService.java
@@ -3,9 +3,9 @@ package com.iformall.service;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
 import com.iformall.domain.dto.WxMallBuildingFloorDto;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.WxMallBuilding;
 import com.iformall.domain.po.WxMallFloor;
+import com.iformall.domain.po.base.TenantEntity;
 
 import java.util.Map;
 
diff --git a/mallinkService/src/main/java/com/iformall/service/WxMallFloorService.java b/mallinkService/src/main/java/com/iformall/service/WxMallFloorService.java
index bd1a806b8..56c735829 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxMallFloorService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxMallFloorService.java
@@ -2,8 +2,8 @@ package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.WxMallFloor;
+import com.iformall.domain.po.base.TenantEntity;
 
 import java.util.Map;
 
diff --git a/mallinkService/src/main/java/com/iformall/service/WxMallService.java b/mallinkService/src/main/java/com/iformall/service/WxMallService.java
index 121f84a68..455da9387 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxMallService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxMallService.java
@@ -2,11 +2,10 @@ package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
+import com.iformall.domain.po.WxMall;
 import com.iformall.domain.po.WxMallNoticeContact;
 import com.iformall.domain.po.WxProjectConfig;
 import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.domain.po.WxMall;
-import com.iformall.domain.po.WxMallVersion;
 import com.iformall.enums.EnumDouyinApplicationVersion;
 
 import java.util.List;
diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantBUserService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantBUserService.java
index e022fd049..4ee67178d 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxMerchantBUserService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantBUserService.java
@@ -2,12 +2,11 @@ package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.WxMerchantBUser;
+import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.WxMerchantBuInfoVo;
 
 import java.util.List;
-import java.util.Map;
 
 public interface WxMerchantBUserService {
 
diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantScoreRulesService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantScoreRulesService.java
index a13c89af8..032d0feec 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxMerchantScoreRulesService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantScoreRulesService.java
@@ -1,9 +1,6 @@
 package com.iformall.service;
 
 import com.iformall.domain.po.WxMerchantScoreRules;
-import com.iformall.domain.po.base.TenantEntity;
-
-import java.util.List;
 
 public interface WxMerchantScoreRulesService {
 
diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java
index 010911baa..0919c0232 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java
@@ -4,17 +4,14 @@ import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
 import com.iformall.domain.dto.WxMerchantDto;
 import com.iformall.domain.po.MallUserInfo;
-import com.iformall.domain.po.WxBusinessCircleOrder;
+import com.iformall.domain.po.WxMerchant;
 import com.iformall.domain.po.WxMerchantCorp;
 import com.iformall.domain.po.WxPark;
 import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.domain.po.WxMerchant;
 import com.iformall.domain.vo.WxMerchantSimpleVo;
 import com.iformall.domain.vo.WxMerchantTradeDetailVo;
 import com.iformall.domain.vo.WxMerchantTradeVo;
 import com.iformall.domain.vo.WxMerchantVo;
-
-import org.apache.ibatis.annotations.Param;
 import org.springframework.web.bind.annotation.ModelAttribute;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java
index b34bdc1ed..401830616 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java
@@ -2,7 +2,6 @@ package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.MallUserInfo;
 import com.iformall.domain.po.WxMerchantBUser;
 import com.iformall.domain.po.WxMerchantTradeDaily;
diff --git a/mallinkService/src/main/java/com/iformall/service/WxMiniappThemeService.java b/mallinkService/src/main/java/com/iformall/service/WxMiniappThemeService.java
index dd82e2e20..b72e4e226 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxMiniappThemeService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxMiniappThemeService.java
@@ -1,7 +1,9 @@
 package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.WxMiniappTheme;
+import com.iformall.domain.po.WxMiniappThemeValue;
+import com.iformall.domain.po.WxThemeMall;
 
 import java.util.List;
 
diff --git a/mallinkService/src/main/java/com/iformall/service/WxMsgCallbackService.java b/mallinkService/src/main/java/com/iformall/service/WxMsgCallbackService.java
index 154e9b9c0..915c8d16b 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxMsgCallbackService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxMsgCallbackService.java
@@ -1,9 +1,10 @@
 package com.iformall.service;
 
-import java.util.*;
 import com.github.pagehelper.PageInfo;
 import com.iformall.domain.po.WxMsgCallback;
 
+import java.util.Map;
+
 public interface WxMsgCallbackService {
 
 	/**
diff --git a/mallinkService/src/main/java/com/iformall/service/WxMsgConfigService.java b/mallinkService/src/main/java/com/iformall/service/WxMsgConfigService.java
index c352ede2a..e51bbef90 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxMsgConfigService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxMsgConfigService.java
@@ -5,8 +5,6 @@ import com.iformall.domain.po.WxMsgConfig;
 import com.iformall.domain.po.WxProjectConfig;
 import com.iformall.domain.po.base.TenantEntity;
 
-import java.util.List;
-
 public interface WxMsgConfigService {
 
     /**
diff --git a/mallinkService/src/main/java/com/iformall/service/WxMsgModelService.java b/mallinkService/src/main/java/com/iformall/service/WxMsgModelService.java
index b74e62b09..8ea718987 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxMsgModelService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxMsgModelService.java
@@ -2,8 +2,8 @@ package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.WxMsgModel;
+import com.iformall.domain.po.base.TenantEntity;
 
 public interface WxMsgModelService {
 
diff --git a/mallinkService/src/main/java/com/iformall/service/WxMsgRecordService.java b/mallinkService/src/main/java/com/iformall/service/WxMsgRecordService.java
index c9e186d9b..476e4aa57 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxMsgRecordService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxMsgRecordService.java
@@ -2,6 +2,7 @@ package com.iformall.service;
 
 import com.iformall.domain.po.msg.BaseMsg;
 import com.iformall.domain.po.msg.WxMsgRecord;
+
 import java.util.List;
 
 public interface WxMsgRecordService {
diff --git a/mallinkService/src/main/java/com/iformall/service/WxMsgService.java b/mallinkService/src/main/java/com/iformall/service/WxMsgService.java
index 629cedaf0..593e448e7 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxMsgService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxMsgService.java
@@ -3,8 +3,8 @@ package com.iformall.service;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.WxCouponInject;
-import com.iformall.domain.po.msg.WxMsg;
 import com.iformall.domain.po.WxMsgConfig;
+import com.iformall.domain.po.msg.WxMsg;
 
 public interface WxMsgService {
 
diff --git a/mallinkService/src/main/java/com/iformall/service/WxMsgSignatureService.java b/mallinkService/src/main/java/com/iformall/service/WxMsgSignatureService.java
index d74e4b655..b70091ae0 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxMsgSignatureService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxMsgSignatureService.java
@@ -2,8 +2,8 @@ package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.WxMsgSignature;
+import com.iformall.domain.po.base.TenantEntity;
 
 public interface WxMsgSignatureService {
 
diff --git a/mallinkService/src/main/java/com/iformall/service/WxMsgValidationcodeModelService.java b/mallinkService/src/main/java/com/iformall/service/WxMsgValidationcodeModelService.java
index 6a9a1122d..21be8e768 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxMsgValidationcodeModelService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxMsgValidationcodeModelService.java
@@ -3,7 +3,6 @@ package com.iformall.service;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.WxMsgValidationcodeModel;
-import com.iformall.domain.po.WxProjectConfig;
 
 import java.util.List;
 
diff --git a/mallinkService/src/main/java/com/iformall/service/WxOcrService.java b/mallinkService/src/main/java/com/iformall/service/WxOcrService.java
index e5e81d5af..250556a52 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxOcrService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxOcrService.java
@@ -2,15 +2,9 @@ package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.WxActivity;
 import com.iformall.domain.po.WxMallOcrModel;
 import com.iformall.domain.po.WxMerchantOcrModel;
 import com.iformall.domain.po.WxOcrModel;
-import com.iformall.enums.EnumPayWay;
-
-import java.util.List;
-
-import javax.servlet.http.HttpServletResponse;
 
 /**
  * @author gongbiao
diff --git a/mallinkService/src/main/java/com/iformall/service/WxOrderGroupService.java b/mallinkService/src/main/java/com/iformall/service/WxOrderGroupService.java
index 835d1b4f8..62207b1bc 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxOrderGroupService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxOrderGroupService.java
@@ -8,11 +8,10 @@ import com.iformall.domain.po.WxOrderGroup;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.WxOrderGroupMarketing;
 
-import java.util.List;
-import java.util.Map;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author gongbiao
diff --git a/mallinkService/src/main/java/com/iformall/service/WxOrderPressService.java b/mallinkService/src/main/java/com/iformall/service/WxOrderPressService.java
index 6f85f196a..184e6ba05 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxOrderPressService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxOrderPressService.java
@@ -1,8 +1,6 @@
 package com.iformall.service;
 
-import java.util.*;
 import com.github.pagehelper.PageInfo;
-import com.iformall.domain.po.WxCUser;
 import com.iformall.domain.po.WxCoupon;
 import com.iformall.domain.po.WxOrder;
 import com.iformall.domain.po.WxOrderPress;
diff --git a/mallinkService/src/main/java/com/iformall/service/WxOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxOrderService.java
index 48216c1c7..9b5b108ba 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxOrderService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxOrderService.java
@@ -1,18 +1,8 @@
 package com.iformall.service;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.github.pagehelper.PageInfo;
-import com.iformall.common.ErrorCode;
 import com.iformall.common.ResultData;
 import com.iformall.domain.dto.OrderComposeSaveDto;
-import com.iformall.domain.dto.OrderSaveDto;
-import com.iformall.domain.dto.PlatPushOrderSaveDto;
 import com.iformall.domain.po.*;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.WxCouponSendVo;
@@ -26,6 +16,12 @@ import com.iformall.enums.EnumPayVersion;
 import com.iformall.enums.EnumPayWay;
 import com.iformall.service.order.entity.WxComposeOrder;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
 public interface WxOrderService {
 
 	/**
diff --git a/mallinkService/src/main/java/com/iformall/service/WxPayAccountBillService.java b/mallinkService/src/main/java/com/iformall/service/WxPayAccountBillService.java
index 76a237c92..f4b037e5b 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxPayAccountBillService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxPayAccountBillService.java
@@ -1,9 +1,8 @@
 package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
-import com.iformall.domain.po.WxPayAccount;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.WxPayAccountBill;
+import com.iformall.domain.po.base.TenantEntity;
 
 public interface WxPayAccountBillService {
 
diff --git a/mallinkService/src/main/java/com/iformall/service/WxPayAccountService.java b/mallinkService/src/main/java/com/iformall/service/WxPayAccountService.java
index d3ccf7f3b..bd3ee3838 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxPayAccountService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxPayAccountService.java
@@ -2,9 +2,7 @@ package com.iformall.service;
 
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.github.pagehelper.PageInfo;
-import com.iformall.domain.po.WxAppinfo;
 import com.iformall.domain.po.WxPayAccount;
-import com.iformall.domain.po.WxProjectConfig;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.enums.EnumAppPlat;
 
diff --git a/mallinkService/src/main/java/com/iformall/service/WxPayOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxPayOrderService.java
index 9729e2818..f8d0f4880 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxPayOrderService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxPayOrderService.java
@@ -1,22 +1,10 @@
 package com.iformall.service;
 
-import java.util.*;
-
 import com.github.pagehelper.PageInfo;
-import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.WxAppinfo;
-import com.iformall.domain.po.WxCUserBasicInfo;
-import com.iformall.domain.po.WxBatchOrder;
-import com.iformall.domain.po.WxCoupon;
-import com.iformall.domain.po.WxMerchantBUser;
-import com.iformall.domain.po.WxOrder;
-import com.iformall.domain.po.WxPayAccount;
-import com.iformall.domain.po.WxPayOrder;
+import com.iformall.domain.po.*;
 import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.enums.EnumComposeOrder;
-import com.iformall.enums.EnumPayShare;
 import com.iformall.enums.EnumPayVersion;
 import com.iformall.enums.EnumPayWay;
 import com.iformall.service.order.entity.WxComposeOrder;
@@ -24,6 +12,9 @@ import com.iformall.service.pay.entity.PayExtraParam;
 import com.iformall.service.pay.service.pay.entity.PayAdapterResult;
 import com.iformall.service.pay.service.pay.entity.PayQueryAdapterResult;
 
+import java.util.List;
+import java.util.Map;
+
 public interface WxPayOrderService {
 
 	public void handleSuccessOrder(WxPayOrder oldRecord,WxComposeOrder composeOrder,PayQueryAdapterResult queryResult,boolean isScheduleTask,boolean isOneChildOrder);
diff --git a/mallinkService/src/main/java/com/iformall/service/WxPowerBillAutoConfigService.java b/mallinkService/src/main/java/com/iformall/service/WxPowerBillAutoConfigService.java
index 351437f85..d6f437a23 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxPowerBillAutoConfigService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxPowerBillAutoConfigService.java
@@ -2,8 +2,8 @@ package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.WxPowerBillAutoConfig;
+import com.iformall.domain.po.base.TenantEntity;
 
 /**
  * @author gongbiao
diff --git a/mallinkService/src/main/java/com/iformall/service/WxPressBatchService.java b/mallinkService/src/main/java/com/iformall/service/WxPressBatchService.java
index 77c5cc581..759ef3c0d 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxPressBatchService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxPressBatchService.java
@@ -1,24 +1,14 @@
 package com.iformall.service;
 
-import java.util.*;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.TtCouponChannelPoi;
-import com.iformall.domain.po.WxAppinfo;
 import com.iformall.domain.po.WxCoupon;
 import com.iformall.domain.po.WxOrder;
 import com.iformall.domain.po.WxPressBatch;
 import com.iformall.domain.po.WxPressBatchItem;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.CouponPressBatchVo;
-import com.iformall.domain.vo.TtCouponVo;
-import com.iformall.domain.vo.WxCouponCVo;
-import com.iformall.domain.vo.WxCouponStatisVo;
-import com.iformall.domain.vo.WxMerchantVo;
+
+import java.util.List;
 
 public interface WxPressBatchService {
 
diff --git a/mallinkService/src/main/java/com/iformall/service/WxProfitPaymentReceiverService.java b/mallinkService/src/main/java/com/iformall/service/WxProfitPaymentReceiverService.java
index c80250e3c..e388613ec 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxProfitPaymentReceiverService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxProfitPaymentReceiverService.java
@@ -4,13 +4,8 @@ import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.WxMerchant;
 import com.iformall.domain.po.WxProfitPaymentReceiver;
-import com.iformall.domain.po.WxProfitSharingReceiver;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.enums.EnumAppPlat;
-import com.iformall.enums.EnumProfitPaymentReceiverType;
-import com.iformall.enums.EnumProfitSharingType;
-
-import java.util.List;
 
 public interface WxProfitPaymentReceiverService {
 
diff --git a/mallinkService/src/main/java/com/iformall/service/WxProfitSharingOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxProfitSharingOrderService.java
index 5784a3c7a..8afe029e8 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxProfitSharingOrderService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxProfitSharingOrderService.java
@@ -4,18 +4,15 @@ package com.iformall.service;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
 import com.iformall.domain.dto.WxSharingOrderDto;
-import com.iformall.domain.po.WxMerchant;
 import com.iformall.domain.po.WxPayOrder;
 import com.iformall.domain.po.WxProfitSharingOrder;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.WxProfitSharingOrderQueryVo;
 import com.iformall.domain.vo.WxProfitSharingOrderVo;
-import com.iformall.enums.EnumPayWay;
-
-import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
 
 public interface WxProfitSharingOrderService {
 
diff --git a/mallinkService/src/main/java/com/iformall/service/WxProfitSharingReceiverService.java b/mallinkService/src/main/java/com/iformall/service/WxProfitSharingReceiverService.java
index a70448736..ad59d4608 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxProfitSharingReceiverService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxProfitSharingReceiverService.java
@@ -6,8 +6,6 @@ import com.iformall.domain.po.WxMerchant;
 import com.iformall.domain.po.WxProfitSharingReceiver;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.enums.EnumAppPlat;
-import com.iformall.enums.EnumPayWay;
-import com.iformall.enums.EnumProfitSharingType;
 
 import java.util.List;
 
diff --git a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java
index 98812db7b..94a95ad83 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java
@@ -2,20 +2,12 @@ package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.MallUserInfo;
-import com.iformall.domain.po.WxBillProperty;
-import com.iformall.domain.po.WxBillRent;
-import com.iformall.domain.po.WxMall;
-import com.iformall.domain.po.WxMerchant;
-import com.iformall.domain.po.WxPropertyContract;
-import com.iformall.domain.po.WxRentContract;
+import com.iformall.domain.po.*;
 import com.iformall.domain.po.base.TenantEntity;
+import org.apache.ibatis.annotations.Param;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
-import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
 import java.util.Map;
 
diff --git a/mallinkService/src/main/java/com/iformall/service/WxQuestionOneselfService.java b/mallinkService/src/main/java/com/iformall/service/WxQuestionOneselfService.java
index b57eef087..831348c27 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxQuestionOneselfService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxQuestionOneselfService.java
@@ -1,9 +1,7 @@
 package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
-import com.iformall.common.ErrorCode;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.WxActivity;
 import com.iformall.domain.po.WxQuestionOneself;
 
 import java.util.List;
diff --git a/mallinkService/src/main/java/com/iformall/service/WxQuestionOneselfUserService.java b/mallinkService/src/main/java/com/iformall/service/WxQuestionOneselfUserService.java
index d61c61fa4..551a273bc 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxQuestionOneselfUserService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxQuestionOneselfUserService.java
@@ -1,7 +1,6 @@
 package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
-import com.iformall.common.ErrorCode;
 import com.iformall.domain.po.WxQuestionOneselfUser;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java
index 26c528015..90cd171f3 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java
@@ -2,12 +2,14 @@ package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.MallUserInfo;
+import com.iformall.domain.po.WxBillRent;
+import com.iformall.domain.po.WxMall;
+import com.iformall.domain.po.WxRentContract;
 import com.iformall.domain.po.base.TenantEntity;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
diff --git a/mallinkService/src/main/java/com/iformall/service/WxScreenAdService.java b/mallinkService/src/main/java/com/iformall/service/WxScreenAdService.java
index dfcc1a7ab..622bb0bce 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxScreenAdService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxScreenAdService.java
@@ -3,8 +3,8 @@ package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.WxScreenAd;
+import com.iformall.domain.po.base.TenantEntity;
 
 import java.util.List;
 
diff --git a/mallinkService/src/main/java/com/iformall/service/WxShopService.java b/mallinkService/src/main/java/com/iformall/service/WxShopService.java
index 76df4fba5..bca27efeb 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxShopService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxShopService.java
@@ -1,10 +1,6 @@
 package com.iformall.service;
 
-import java.io.Serializable;
-import java.util.*;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.WxShop;
@@ -13,6 +9,10 @@ import com.iformall.domain.vo.WxShopVo;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 
 public interface WxShopService {
 
diff --git a/mallinkService/src/main/java/com/iformall/service/WxSubsidyService.java b/mallinkService/src/main/java/com/iformall/service/WxSubsidyService.java
index fdbfd7083..56f2749c4 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxSubsidyService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxSubsidyService.java
@@ -1,12 +1,7 @@
 package com.iformall.service;
 
 import com.github.pagehelper.PageInfo;
-import com.iformall.common.ResultData;
-import com.iformall.domain.po.MallUserInfo;
 import com.iformall.domain.po.WxSubsidy;
-import com.iformall.enums.EnumPayWay;
-
-import java.util.Map;
 
 public interface WxSubsidyService {
 
diff --git a/mallinkService/src/main/java/com/iformall/service/WxTagsService.java b/mallinkService/src/main/java/com/iformall/service/WxTagsService.java
index 7d25acabc..f2435f8ce 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxTagsService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxTagsService.java
@@ -1,11 +1,12 @@
 package com.iformall.service;
 
-import java.util.*;
 import com.github.pagehelper.PageInfo;
 import com.iformall.domain.po.WxTags;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.WxTagsGroupVo;
 
+import java.util.List;
+
 public interface WxTagsService {
 
 	/**
diff --git a/mallinkService/src/main/java/com/iformall/service/WxTopicService.java b/mallinkService/src/main/java/com/iformall/service/WxTopicService.java
index 4ae3d61cf..dc942dbe1 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxTopicService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxTopicService.java
@@ -3,7 +3,6 @@ package com.iformall.service;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.WxTopic;
-import com.iformall.enums.EnumPayWay;
 
 import java.util.List;
 
diff --git a/mallinkService/src/main/java/com/iformall/service/WxUserChannelService.java b/mallinkService/src/main/java/com/iformall/service/WxUserChannelService.java
index b6a72b035..7201eff39 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxUserChannelService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxUserChannelService.java
@@ -1,9 +1,10 @@
 package com.iformall.service;
 
-import java.util.*;
 import com.github.pagehelper.PageInfo;
 import com.iformall.domain.po.WxUserChannel;
 
+import java.util.List;
+
 public interface WxUserChannelService {
 
 	/**
diff --git a/mallinkService/src/main/java/com/iformall/service/WxUserVisitService.java b/mallinkService/src/main/java/com/iformall/service/WxUserVisitService.java
index be01ac50f..efbd291a6 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxUserVisitService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxUserVisitService.java
@@ -1,12 +1,12 @@
 package com.iformall.service;
 
-import java.util.*;
 import com.github.pagehelper.PageInfo;
 import com.iformall.domain.dto.MarkingCouponDataReportDto;
 import com.iformall.domain.po.WxUserVisit;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.TouchUsersReportVo;
 
+import java.util.List;
+
 public interface WxUserVisitService {
 
 	/**
diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/BasicCUserService.java b/mallinkService/src/main/java/com/iformall/service/cuser/BasicCUserService.java
index 4ec71e105..d75ef77e4 100644
--- a/mallinkService/src/main/java/com/iformall/service/cuser/BasicCUserService.java
+++ b/mallinkService/src/main/java/com/iformall/service/cuser/BasicCUserService.java
@@ -10,8 +10,6 @@ import com.iformall.enums.*;
 import com.iformall.exception.MallinkException;
 import com.iformall.mq.MqBaseProducer;
 import com.iformall.service.*;
-import com.iformall.service.cuser.tt.TtCUserServiceAdapter;
-import com.iformall.service.cuser.wx.WxCUserServiceAdapter;
 import com.iformall.utils.Constant;
 import com.iformall.utils.RedisCacheUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -23,8 +21,6 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 @Service
 public class BasicCUserService {
diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/CUserServiceApapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/CUserServiceApapter.java
index b0f06a5ea..136d81520 100644
--- a/mallinkService/src/main/java/com/iformall/service/cuser/CUserServiceApapter.java
+++ b/mallinkService/src/main/java/com/iformall/service/cuser/CUserServiceApapter.java
@@ -6,7 +6,6 @@ import com.iformall.domain.po.CUser;
 import com.iformall.domain.po.WxAppinfo;
 import com.iformall.domain.po.WxCUserFrom;
 import com.iformall.domain.po.base.BaseCUserEntity;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.UserCountVo;
 import com.iformall.domain.vo.UserStructureVo;
 
diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/CUserServiceFactory.java b/mallinkService/src/main/java/com/iformall/service/cuser/CUserServiceFactory.java
index 6048e8fa6..3b848c357 100644
--- a/mallinkService/src/main/java/com/iformall/service/cuser/CUserServiceFactory.java
+++ b/mallinkService/src/main/java/com/iformall/service/cuser/CUserServiceFactory.java
@@ -1,18 +1,17 @@
 package com.iformall.service.cuser;
 
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import com.iformall.enums.*;
+import com.iformall.enums.EnumAppPlat;
 import com.iformall.service.cuser.tt.TtBUserServiceAdapter;
 import com.iformall.service.cuser.tt.TtCUserServiceAdapter;
 import com.iformall.service.cuser.wx.WxBUserServiceAdapter;
+import com.iformall.service.cuser.wx.WxCUserServiceAdapter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.iformall.service.cuser.wx.WxCUserServiceAdapter;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 @Service
 public class CUserServiceFactory {
diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtBUserServiceAdapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtBUserServiceAdapter.java
index 0ba5d77cf..d56ba4127 100644
--- a/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtBUserServiceAdapter.java
+++ b/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtBUserServiceAdapter.java
@@ -6,9 +6,11 @@ import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
 import com.iformall.domain.dto.WxCUserBasicInfoDto;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.CUser;
+import com.iformall.domain.po.TtBuser;
+import com.iformall.domain.po.WxAppinfo;
+import com.iformall.domain.po.WxCUserFrom;
 import com.iformall.domain.po.base.BaseCUserEntity;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.UserCountVo;
 import com.iformall.domain.vo.UserStructureVo;
 import com.iformall.douyin.miniapp.api.TtMaService;
@@ -19,10 +21,8 @@ import com.iformall.service.WxAppinfoService;
 import com.iformall.service.cuser.BasicCUserService;
 import com.iformall.service.cuser.CUserServiceApapter;
 import com.iformall.service.wechat.FmOpenService;
-import com.iformall.utils.Constant;
 import com.iformall.utils.MaUtil;
 import lombok.SneakyThrows;
-import me.chanjar.weixin.common.error.WxErrorException;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java
index 56d69ebaf..dc5575a43 100644
--- a/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java
+++ b/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java
@@ -7,16 +7,16 @@ import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
 import com.iformall.common.ResultData;
 import com.iformall.domain.dto.WxCUserBasicInfoDto;
-import com.iformall.domain.po.*;
-import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.domain.po.tt.TtCUser;
+import com.iformall.domain.po.CUser;
+import com.iformall.domain.po.WxAppinfo;
+import com.iformall.domain.po.WxCUserBasicInfo;
+import com.iformall.domain.po.WxCUserFrom;
 import com.iformall.domain.po.base.BaseCUserEntity;
+import com.iformall.domain.po.tt.TtCUser;
 import com.iformall.domain.vo.UserCountVo;
 import com.iformall.domain.vo.UserStructureVo;
 import com.iformall.douyin.miniapp.api.TtMaService;
 import com.iformall.enums.EnumAppPlat;
-import com.iformall.enums.EnumAssignTagsTrigger;
-import com.iformall.enums.EnumPayVersion;
 import com.iformall.enums.EnumYesOrNo;
 import com.iformall.exception.MallinkException;
 import com.iformall.mapper.TtCUserMapper;
@@ -28,9 +28,7 @@ import com.iformall.service.cuser.BasicCUserService;
 import com.iformall.service.cuser.CUserServiceApapter;
 import com.iformall.utils.Constant;
 import com.iformall.utils.MaUtil;
-import com.iformall.utils.sign.AppUtils;
 import lombok.SneakyThrows;
-import me.chanjar.weixin.common.error.WxErrorException;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxBUserServiceAdapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxBUserServiceAdapter.java
index 539a08736..ff1b8e785 100644
--- a/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxBUserServiceAdapter.java
+++ b/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxBUserServiceAdapter.java
@@ -7,9 +7,11 @@ import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
 import com.iformall.domain.dto.WxCUserBasicInfoDto;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.CUser;
+import com.iformall.domain.po.WxAppinfo;
+import com.iformall.domain.po.WxBuser;
+import com.iformall.domain.po.WxCUserFrom;
 import com.iformall.domain.po.base.BaseCUserEntity;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.UserCountVo;
 import com.iformall.domain.vo.UserStructureVo;
 import com.iformall.enums.EnumAppPlat;
diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java
index 3aca98cfd..3132392e2 100644
--- a/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java
+++ b/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java
@@ -4,29 +4,28 @@ import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
+import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
 import com.iformall.common.ResultData;
 import com.iformall.domain.dto.WxCUserBasicInfoDto;
 import com.iformall.domain.po.*;
-import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.domain.po.tt.TtCUser;
+import com.iformall.domain.po.base.BaseCUserEntity;
 import com.iformall.domain.vo.UserCountVo;
 import com.iformall.domain.vo.UserStructureVo;
 import com.iformall.enums.EnumAppPlat;
-import com.iformall.enums.EnumAssignTagsTrigger;
-import com.iformall.enums.EnumPayVersion;
 import com.iformall.enums.EnumYesOrNo;
+import com.iformall.exception.MallinkException;
 import com.iformall.mapper.WxAppinfoMapper;
-import com.iformall.mapper.WxMallMapper;
+import com.iformall.mapper.WxCUserMapper;
 import com.iformall.service.WxAppinfoService;
 import com.iformall.service.WxCUserBasicInfoService;
 import com.iformall.service.WxCUserTagsService;
 import com.iformall.service.WxMallService;
 import com.iformall.service.cuser.BasicCUserService;
+import com.iformall.service.cuser.CUserServiceApapter;
 import com.iformall.service.wechat.FmOpenService;
 import com.iformall.utils.Constant;
 import com.iformall.utils.MaUtil;
-import com.iformall.utils.sign.AppUtils;
 import lombok.SneakyThrows;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.apache.commons.lang3.StringUtils;
@@ -35,12 +34,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.iformall.common.ErrorCode;
-import com.iformall.domain.po.base.BaseCUserEntity;
-import com.iformall.exception.MallinkException;
-import com.iformall.mapper.WxCUserMapper;
-import com.iformall.service.cuser.CUserServiceApapter;
-
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
diff --git a/mallinkService/src/main/java/com/iformall/service/excel/WxCardDataExporter.java b/mallinkService/src/main/java/com/iformall/service/excel/WxCardDataExporter.java
index 8683131ff..78a206690 100644
--- a/mallinkService/src/main/java/com/iformall/service/excel/WxCardDataExporter.java
+++ b/mallinkService/src/main/java/com/iformall/service/excel/WxCardDataExporter.java
@@ -1,21 +1,19 @@
 package com.iformall.service.excel;
 
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.beanutils.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
+import cn.afterturn.easypoi.handler.inter.IExcelExportServer;
 import com.iformall.domain.po.WxCoupon;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.WxCouponStatisVo;
 import com.iformall.domain.vo.excel.WxCardData;
 import com.iformall.mapper.WxCouponMapper;
+import org.apache.commons.beanutils.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
-import cn.afterturn.easypoi.handler.inter.IExcelExportServer;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 营销数据- 卡营销数据导出
diff --git a/mallinkService/src/main/java/com/iformall/service/excel/WxCouponDataExporter.java b/mallinkService/src/main/java/com/iformall/service/excel/WxCouponDataExporter.java
index 593c00fd9..674392a21 100644
--- a/mallinkService/src/main/java/com/iformall/service/excel/WxCouponDataExporter.java
+++ b/mallinkService/src/main/java/com/iformall/service/excel/WxCouponDataExporter.java
@@ -1,21 +1,19 @@
 package com.iformall.service.excel;
 
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.beanutils.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
+import cn.afterturn.easypoi.handler.inter.IExcelExportServer;
 import com.iformall.domain.po.WxCoupon;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.WxCouponStatisVo;
 import com.iformall.domain.vo.excel.WxCouponData;
 import com.iformall.mapper.WxCouponMapper;
+import org.apache.commons.beanutils.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
-import cn.afterturn.easypoi.handler.inter.IExcelExportServer;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 营销数据- 券营销数据导出
diff --git a/mallinkService/src/main/java/com/iformall/service/excel/WxOrderGroupDataExporter.java b/mallinkService/src/main/java/com/iformall/service/excel/WxOrderGroupDataExporter.java
index bf3eb790b..45078a32f 100644
--- a/mallinkService/src/main/java/com/iformall/service/excel/WxOrderGroupDataExporter.java
+++ b/mallinkService/src/main/java/com/iformall/service/excel/WxOrderGroupDataExporter.java
@@ -1,20 +1,15 @@
 package com.iformall.service.excel;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.iformall.domain.po.WxCoupon;
+import cn.afterturn.easypoi.handler.inter.IExcelExportServer;
 import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.domain.vo.WxCouponStatisVo;
 import com.iformall.domain.vo.WxOrderGroupMarketing;
-import com.iformall.mapper.WxCouponMapper;
 import com.iformall.mapper.WxOrderGroupMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
-import cn.afterturn.easypoi.handler.inter.IExcelExportServer;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 营销数据- 卡营销数据导出
diff --git a/mallinkService/src/main/java/com/iformall/service/excel/WxPressDataExporter.java b/mallinkService/src/main/java/com/iformall/service/excel/WxPressDataExporter.java
index ace7f5d4c..7fc072485 100644
--- a/mallinkService/src/main/java/com/iformall/service/excel/WxPressDataExporter.java
+++ b/mallinkService/src/main/java/com/iformall/service/excel/WxPressDataExporter.java
@@ -1,22 +1,19 @@
 package com.iformall.service.excel;
 
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.beanutils.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
+import cn.afterturn.easypoi.handler.inter.IExcelExportServer;
 import com.iformall.domain.po.WxCoupon;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.WxCouponStatisVo;
-import com.iformall.domain.vo.excel.WxCouponData;
 import com.iformall.domain.vo.excel.WxPressData;
 import com.iformall.mapper.WxCouponMapper;
+import org.apache.commons.beanutils.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
-import cn.afterturn.easypoi.handler.inter.IExcelExportServer;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 营销数据- 卡营销数据导出
diff --git a/mallinkService/src/main/java/com/iformall/service/helper/WxCUserTagsServiceHelper.java b/mallinkService/src/main/java/com/iformall/service/helper/WxCUserTagsServiceHelper.java
index a5d3c94d8..8ada7167a 100644
--- a/mallinkService/src/main/java/com/iformall/service/helper/WxCUserTagsServiceHelper.java
+++ b/mallinkService/src/main/java/com/iformall/service/helper/WxCUserTagsServiceHelper.java
@@ -1,28 +1,19 @@
 package com.iformall.service.helper;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.iformall.common.IdWorker;
 import com.iformall.domain.po.*;
 import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.domain.vo.WxCUserBasicTagVo;
 import com.iformall.enums.*;
 import com.iformall.mapper.*;
 import com.iformall.service.WxCUserTagsService;
-import com.iformall.service.WxTagsService;
-import com.iformall.service.tags.TagsDeveloper;
 import com.iformall.utils.DateUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Pattern;
diff --git a/mallinkService/src/main/java/com/iformall/service/helper/WxOrderServiceHelper.java b/mallinkService/src/main/java/com/iformall/service/helper/WxOrderServiceHelper.java
index 5fdafb22b..5fd12a9fd 100644
--- a/mallinkService/src/main/java/com/iformall/service/helper/WxOrderServiceHelper.java
+++ b/mallinkService/src/main/java/com/iformall/service/helper/WxOrderServiceHelper.java
@@ -1,20 +1,17 @@
 package com.iformall.service.helper;
 
-import com.iformall.enums.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-
 import com.iformall.common.ErrorCode;
 import com.iformall.domain.po.WxCoupon;
-import com.iformall.domain.po.WxCouponChannel;
-import com.iformall.domain.po.base.TenantEntity;
+import com.iformall.enums.EnumCacheKey;
 import com.iformall.exception.MallinkException;
 import com.iformall.service.WxCouponChannelService;
 import com.iformall.service.WxCouponService;
 import com.iformall.utils.RedisLock;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
 
 @Service
 public class WxOrderServiceHelper {
diff --git a/mallinkService/src/main/java/com/iformall/service/helper/WxPayOrderServiceHelper.java b/mallinkService/src/main/java/com/iformall/service/helper/WxPayOrderServiceHelper.java
index 3ee645d43..0ab14b194 100644
--- a/mallinkService/src/main/java/com/iformall/service/helper/WxPayOrderServiceHelper.java
+++ b/mallinkService/src/main/java/com/iformall/service/helper/WxPayOrderServiceHelper.java
@@ -1,22 +1,12 @@
 package com.iformall.service.helper;
 
-import java.util.Date;
-import java.util.Map;
-
-import com.iformall.enums.*;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.iformall.common.ErrorCode;
-import com.iformall.common.Result;
-import com.iformall.common.ResultData;
 import com.iformall.domain.po.WxAppinfo;
-import com.iformall.domain.po.WxBatchOrder;
-import com.iformall.domain.po.WxMerchantBUser;
-import com.iformall.domain.po.WxOrder;
 import com.iformall.domain.po.WxPayAccount;
 import com.iformall.domain.po.WxPayOrder;
+import com.iformall.enums.EnumPayMchType;
+import com.iformall.enums.EnumPayMode;
+import com.iformall.enums.EnumPayStatus;
 import com.iformall.exception.MallinkException;
 import com.iformall.pay.WxPay;
 import com.iformall.pay.WxPayOrderQ;
@@ -24,6 +14,11 @@ import com.iformall.pay.WxPayOrderSQ;
 import com.iformall.pay.WxPayment;
 import com.iformall.utils.BeanUtils;
 import com.iformall.utils.Utility;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Map;
 
 public class WxPayOrderServiceHelper {
 
diff --git a/mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java b/mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java
index 27b6bd8f4..e16ae3360 100644
--- a/mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java
+++ b/mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java
@@ -1,13 +1,11 @@
 package com.iformall.service.helper;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.iformall.domain.po.WxRentContract;
+import com.iformall.enums.*;
+import com.iformall.service.impl.WxRentContractServiceImpl;
+import com.iformall.utils.DateUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.joda.time.Months;
@@ -16,17 +14,13 @@ import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.iformall.domain.po.WxRentContract;
-import com.iformall.enums.EnumMissTimeType;
-import com.iformall.enums.EnumPriceUnit;
-import com.iformall.enums.EnumRentContractAdjustPeriod;
-import com.iformall.enums.EnumRentContractAdjustRatioWay;
-import com.iformall.enums.EnumRentContractRentInputWay;
-import com.iformall.enums.EnumRentContractType;
-import com.iformall.service.impl.WxRentContractServiceImpl;
-import com.iformall.utils.DateUtils;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
 
 public class WxRentContractHelper {
 
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/AliPayCUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/AliPayCUserServiceImpl.java
index 26a7de4ef..cb72d8850 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/AliPayCUserServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/AliPayCUserServiceImpl.java
@@ -3,13 +3,10 @@ package com.iformall.service.impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.IdWorker;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.AliPayCUser;
 import com.iformall.domain.po.base.BaseCUserEntity;
 import com.iformall.mapper.AliPayCUserMapper;
-import com.iformall.service.*;
-
-import java.util.Date;
-
+import com.iformall.service.AliPayCUserService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +14,8 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+
 @Service
 public class AliPayCUserServiceImpl implements AliPayCUserService {
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/CUserTokenServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/CUserTokenServiceImpl.java
index 89abbd1b4..0276d7cba 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/CUserTokenServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/CUserTokenServiceImpl.java
@@ -9,7 +9,6 @@ import com.iformall.service.CUserTokenService;
 import com.iformall.service.cuser.CUserServiceFactory;
 import com.iformall.utils.Constant;
 import com.iformall.utils.RedisCacheUtils;
-
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java
index f57030ab2..04c96cf96 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java
@@ -1,6 +1,5 @@
 package com.iformall.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -26,6 +25,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
+
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/FengNiaoMapServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/FengNiaoMapServiceImpl.java
index 023b1faaa..4c366d90c 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/FengNiaoMapServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/FengNiaoMapServiceImpl.java
@@ -3,7 +3,6 @@ package com.iformall.service.impl;
 import com.iformall.domain.po.FengNiaoMapConfig;
 import com.iformall.mapper.FengNiaoMapConfigMapper;
 import com.iformall.service.FengNiaoMapService;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/JmSportOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/JmSportOrderServiceImpl.java
index c800200e4..a55948eaf 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/JmSportOrderServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/JmSportOrderServiceImpl.java
@@ -4,8 +4,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.IdWorker;
 import com.iformall.domain.po.JmSportOrder;
-import com.iformall.domain.po.MemCouponFromDsp;
-import com.iformall.mapper.*;
+import com.iformall.mapper.JmSportOrderMapper;
 import com.iformall.service.JmSportOrderService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallCooUserInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallCooUserInfoServiceImpl.java
index ebb1e3a1a..96fc112cf 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/MallCooUserInfoServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/MallCooUserInfoServiceImpl.java
@@ -12,9 +12,13 @@ import com.iformall.mallcoo.MallcooHelper;
 import com.iformall.mallcoo.McUserInfo;
 import com.iformall.mallcoo.biImport.BuyGroup;
 import com.iformall.mallcoo.biImport.VerifyGroup;
-import com.iformall.mapper.*;
+import com.iformall.mapper.MallCooUserInfoMapper;
+import com.iformall.mapper.TtMerchantPoiMapper;
+import com.iformall.mapper.WxCUserBasicInfoMapper;
+import com.iformall.mapper.WxThirdPartyConfigMapper;
 import com.iformall.mq.MqBaseProducer;
-import com.iformall.service.*;
+import com.iformall.service.MallCooUserInfoService;
+import com.iformall.service.WxMallService;
 import com.iformall.service.pay.service.pay.douyin.v2.miniApp.EnumTtPayChannel;
 import com.iformall.utils.DateUtils;
 import org.apache.commons.lang3.StringUtils;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java
index be7a8a668..22763e339 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java
@@ -2,16 +2,14 @@ package com.iformall.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-
 import com.iformall.common.IdWorker;
-import com.iformall.domain.po.WxLogicPermission;
-import com.iformall.domain.po.base.BaseEntity;
 import com.iformall.domain.po.MallPermission;
 import com.iformall.domain.po.MallUserInfo;
+import com.iformall.domain.po.WxLogicPermission;
 import com.iformall.domain.po.WxMall;
+import com.iformall.domain.po.base.BaseEntity;
 import com.iformall.enums.EnumMenuType;
 import com.iformall.enums.EnumPermissionType;
 import com.iformall.enums.EnumUserAdmin;
@@ -26,7 +24,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 import static java.util.stream.Collectors.toList;
 
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallResourceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallResourceServiceImpl.java
index 85d34d0de..a3d681de6 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/MallResourceServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/MallResourceServiceImpl.java
@@ -2,12 +2,12 @@ package com.iformall.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.iformall.common.IdWorker;
 import com.iformall.domain.po.MallResource;
 import com.iformall.mapper.MallResourceMapper;
 import com.iformall.service.MallResourceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.iformall.common.IdWorker;
 
 @Service
 public class MallResourceServiceImpl implements MallResourceService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallUserActionServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallUserActionServiceImpl.java
index 04794a58c..539d64e02 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/MallUserActionServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/MallUserActionServiceImpl.java
@@ -2,6 +2,7 @@ package com.iformall.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.iformall.common.IdWorker;
 import com.iformall.domain.po.MallUserAction;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.MallUserActionVo;
@@ -9,7 +10,6 @@ import com.iformall.mapper.MallUserActionMapper;
 import com.iformall.service.MallUserActionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.iformall.common.IdWorker;
 
 import java.util.Date;
 
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java
index e2e41be9f..6cc067deb 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java
@@ -14,7 +14,6 @@ import com.iformall.domain.vo.MallUserInfoVo;
 import com.iformall.enums.EnumMallUserStatus;
 import com.iformall.exception.MallinkException;
 import com.iformall.mapper.*;
-import com.iformall.service.MallRoleService;
 import com.iformall.service.MallUserInfoService;
 import com.iformall.service.WxMallService;
 import com.iformall.utils.PasswordHelper;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java
index d746c80b4..bfcb8ff6b 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java
@@ -2,14 +2,12 @@ package com.iformall.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.iformall.common.ErrorCode;
 import com.iformall.domain.dto.MarkingCouponDataReportDto;
 import com.iformall.domain.dto.WxOrderReportDto;
 import com.iformall.domain.po.*;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.*;
 import com.iformall.enums.*;
-import com.iformall.exception.MallinkException;
 import com.iformall.mapper.*;
 import com.iformall.service.ExcelService;
 import com.iformall.service.MarkingDataReportService;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MemCouponFromDspServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MemCouponFromDspServiceImpl.java
index f8f8c6db3..386b8830d 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/MemCouponFromDspServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/MemCouponFromDspServiceImpl.java
@@ -3,8 +3,8 @@ package com.iformall.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.iformall.common.IdWorker;
 import com.iformall.domain.po.MemCouponFromDsp;
-import com.iformall.domain.po.WxCUser;
 import com.iformall.domain.po.WxCUserBasicInfo;
 import com.iformall.domain.po.WxCoupon;
 import com.iformall.domain.po.base.TenantEntity;
@@ -20,7 +20,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.iformall.common.IdWorker;
 
 import java.util.Date;
 import java.util.List;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java
index 480016e46..6ac65e74c 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java
@@ -1,32 +1,22 @@
 package com.iformall.service.impl;
 
+import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.iformall.domain.dto.NeuPosUpdatePayDto;
 import com.iformall.domain.po.NeuPosOrderMasterExt;
-import com.iformall.domain.vo.WxCouponOrderBVo;
 import com.iformall.mapper.NeuPosOrderMasterExtMapper;
 import com.iformall.service.ExcelService;
 import com.iformall.service.NeuPosOrderService;
-
-import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 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 javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
+
 @Service
 public class NeuPosOrderServiceImpl implements NeuPosOrderService {
 	
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/OrderSnapshotServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/OrderSnapshotServiceImpl.java
index 7488878b7..9f81c2f58 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/OrderSnapshotServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/OrderSnapshotServiceImpl.java
@@ -4,7 +4,9 @@ import com.alibaba.fastjson.JSON;
 import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.OrderSnapshot;
+import com.iformall.domain.po.WxCoupon;
+import com.iformall.domain.po.WxOrder;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.WxMerchantVo;
 import com.iformall.enums.EnumCouponType;
@@ -12,11 +14,11 @@ import com.iformall.enums.EnumMerchantStatus;
 import com.iformall.mapper.OrderSnapshotMapper;
 import com.iformall.mapper.WxCouponMapper;
 import com.iformall.mapper.WxOrderMapper;
-import com.iformall.service.*;
+import com.iformall.service.OrderSnapshotService;
+import com.iformall.service.WxMerchantService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/PosActionLogServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/PosActionLogServiceImpl.java
index d5776c453..8a3589f76 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/PosActionLogServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/PosActionLogServiceImpl.java
@@ -1,14 +1,13 @@
 package com.iformall.service.impl;
 
-import java.util.*;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.iformall.common.IdWorker;
 import com.iformall.domain.po.PosActionLog;
 import com.iformall.mapper.PosActionLogMapper;
 import com.iformall.service.PosActionLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.iformall.common.IdWorker;
 
 @Service
 public class PosActionLogServiceImpl implements PosActionLogService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/PosCouponOrderVerifyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/PosCouponOrderVerifyServiceImpl.java
index b101297b5..506a8ff73 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/PosCouponOrderVerifyServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/PosCouponOrderVerifyServiceImpl.java
@@ -2,12 +2,12 @@ package com.iformall.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.iformall.common.IdWorker;
 import com.iformall.domain.po.PosCouponOrderVerify;
 import com.iformall.mapper.PosCouponOrderVerifyMapper;
 import com.iformall.service.PosCouponOrderVerifyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.iformall.common.IdWorker;
 
 import java.util.List;
 
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/PosMallConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/PosMallConfigServiceImpl.java
index e72eb105c..3922af131 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/PosMallConfigServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/PosMallConfigServiceImpl.java
@@ -2,13 +2,13 @@ package com.iformall.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.iformall.common.IdWorker;
 import com.iformall.domain.po.PosMallConfig;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.mapper.PosMallConfigMapper;
 import com.iformall.service.PosMallConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.iformall.common.IdWorker;
 
 @Service
 public class PosMallConfigServiceImpl implements PosMallConfigService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/PosOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/PosOrderServiceImpl.java
index ad8d3b873..3d6d8d700 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/PosOrderServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/PosOrderServiceImpl.java
@@ -2,12 +2,12 @@ package com.iformall.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.iformall.common.IdWorker;
 import com.iformall.domain.po.PosOrder;
 import com.iformall.mapper.PosOrderMapper;
 import com.iformall.service.PosOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.iformall.common.IdWorker;
 
 @Service
 public class PosOrderServiceImpl implements PosOrderService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/PosPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/PosPayOrderServiceImpl.java
index 4e0072515..b1f01180e 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/PosPayOrderServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/PosPayOrderServiceImpl.java
@@ -1,14 +1,15 @@
 package com.iformall.service.impl;
 
-import java.util.*;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.iformall.common.IdWorker;
 import com.iformall.domain.po.PosPayOrder;
 import com.iformall.mapper.PosPayOrderMapper;
 import com.iformall.service.PosPayOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.iformall.common.IdWorker;
+
+import java.util.List;
 
 @Service
 public class PosPayOrderServiceImpl implements PosPayOrderService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/QrCodeServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/QrCodeServiceImpl.java
index d394d5ce5..7e59ccc1b 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/QrCodeServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/QrCodeServiceImpl.java
@@ -3,12 +3,10 @@ package com.iformall.service.impl;
 import com.iformall.common.ErrorCode;
 import com.iformall.common.Result;
 import com.iformall.common.ResultData;
+import com.iformall.domain.po.WxAppinfo;
 import com.iformall.domain.po.WxPayAccount;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.enums.EnumAppPlat;
-import com.iformall.enums.EnumPayVersion;
-import com.iformall.enums.EnumPayWay;
-import com.iformall.domain.po.WxAppinfo;
 import com.iformall.exception.MallinkException;
 import com.iformall.file.aliyun.AliyunOSS;
 import com.iformall.service.QrCodeService;
@@ -22,10 +20,14 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;
 
 /**
  * @author luozukai
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/RedisServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/RedisServiceImpl.java
index 4d3a905ee..3b270d357 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/RedisServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/RedisServiceImpl.java
@@ -11,8 +11,6 @@ import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 
 import java.util.Collection;
-import java.util.List;
-import java.util.Set;
 
 @Slf4j
 @Service
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/SellerAgentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/SellerAgentServiceImpl.java
index 5fafe4bee..b0338684c 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/SellerAgentServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/SellerAgentServiceImpl.java
@@ -1,18 +1,12 @@
 package com.iformall.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.iformall.common.Result;
-import com.iformall.common.ResultData;
-import com.iformall.domain.po.*;
-import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.domain.vo.CouponPressBatchVo;
-import com.iformall.enums.EnumPressBatchStatus;
-import com.iformall.enums.EnumYesOrNo;
-import com.iformall.exception.MallinkException;
-import com.iformall.mapper.*;
-import com.iformall.service.*;
+import com.iformall.domain.po.SellerAgent;
+import com.iformall.domain.po.SellerAgentAccount;
+import com.iformall.mapper.SellerAgentAccountMapper;
+import com.iformall.mapper.SellerAgentMapper;
+import com.iformall.service.SellerAgentService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +14,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class SellerAgentServiceImpl implements SellerAgentService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/SysConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/SysConfigServiceImpl.java
index ccb7c42c9..85aee19bc 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/SysConfigServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/SysConfigServiceImpl.java
@@ -1,6 +1,8 @@
 package com.iformall.service.impl;
 
-import java.util.*;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.iformall.common.IdWorker;
 import com.iformall.domain.po.SysConfig;
 import com.iformall.domain.po.SysConfigValue;
 import com.iformall.domain.po.base.TenantEntity;
@@ -8,15 +10,13 @@ import com.iformall.mapper.SysConfigMapper;
 import com.iformall.mapper.SysConfigValueMapper;
 import com.iformall.service.SysConfigService;
 import com.iformall.utils.RedisCacheUtils;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.iformall.common.IdWorker;
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class SysConfigServiceImpl implements SysConfigService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/SysGaoDeServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/SysGaoDeServiceImpl.java
index 15a57495c..28f41ddd7 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/SysGaoDeServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/SysGaoDeServiceImpl.java
@@ -1,8 +1,6 @@
 package com.iformall.service.impl;
 
-import java.util.*;
 import com.iformall.domain.po.SysGaodeCity;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.GaodeCityTree;
 import com.iformall.enums.EnumDelStatus;
 import com.iformall.enums.EnumGaodeCityType;
@@ -15,6 +13,11 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 @Service
 public class SysGaoDeServiceImpl implements SysGaoDeService {
 	
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/SysMonitorServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/SysMonitorServiceImpl.java
index 51a6ffd97..54e8afde0 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/SysMonitorServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/SysMonitorServiceImpl.java
@@ -1,14 +1,15 @@
 package com.iformall.service.impl;
 
-import java.util.*;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.iformall.common.IdWorker;
 import com.iformall.domain.po.SysMonitor;
 import com.iformall.mapper.SysMonitorMapper;
 import com.iformall.service.SysMonitorService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.iformall.common.IdWorker;
+
+import java.util.List;
 
 @Service
 public class SysMonitorServiceImpl implements SysMonitorService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/SysNoticeServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/SysNoticeServiceImpl.java
index fa6ad169b..94f89c461 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/SysNoticeServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/SysNoticeServiceImpl.java
@@ -3,12 +3,12 @@ package com.iformall.service.impl;
 import com.iformall.domain.po.SysNotice;
 import com.iformall.mapper.SysNoticeMapper;
 import com.iformall.service.SysNoticeService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import java.util.*;
+
+import java.util.List;
 
 @Service
 public class SysNoticeServiceImpl implements SysNoticeService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/TtCUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/TtCUserServiceImpl.java
index 60db2ed6d..f22320c0e 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/TtCUserServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/TtCUserServiceImpl.java
@@ -5,18 +5,20 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.IdWorker;
 import com.iformall.domain.dto.WxCUserBasicInfoDto;
-import com.iformall.domain.po.tt.TtCUser;
 import com.iformall.domain.po.WxCUserBasicInfo;
 import com.iformall.domain.po.WxCUserFrom;
 import com.iformall.domain.po.base.BaseCUserEntity;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.msg.FmInsideCLoginMsg;
+import com.iformall.domain.po.tt.TtCUser;
 import com.iformall.domain.vo.UserCountVo;
 import com.iformall.enums.*;
 import com.iformall.exception.MallinkException;
 import com.iformall.mapper.TtCUserMapper;
 import com.iformall.mq.MqBaseProducer;
-import com.iformall.service.*;
+import com.iformall.service.TtCUserService;
+import com.iformall.service.WxCUserBasicInfoService;
+import com.iformall.service.WxCUserTagsService;
+import com.iformall.service.WxScoreRulesService;
 import com.iformall.utils.Constant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java
index c56d02bd6..ed7fa2f23 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java
@@ -8,7 +8,6 @@ import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.*;
-import com.iformall.domain.po.base.BaseEntity;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.douyin.web.api.goodlifesaas.TtGoodLifeSaasService;
 import com.iformall.douyin.web.api.web.TtWebService;
@@ -37,7 +36,6 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 
 @Service
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/TtGoodsCategoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/TtGoodsCategoryServiceImpl.java
index 7c572da3b..88010602a 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/TtGoodsCategoryServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/TtGoodsCategoryServiceImpl.java
@@ -2,12 +2,9 @@ package com.iformall.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.github.binarywang.wxpay.bean.bank.BankingResult;
 import com.iformall.common.ErrorCode;
-import com.iformall.common.ResultData;
 import com.iformall.domain.po.TtGoodsCategory;
 import com.iformall.domain.po.TtGoodsCategoryNew;
-import com.iformall.domain.po.WxAppinfo;
 import com.iformall.domain.po.WxCoupon;
 import com.iformall.domain.po.base.BaseEntity;
 import com.iformall.domain.po.base.TenantEntity;
@@ -15,7 +12,9 @@ import com.iformall.douyin.web.api.goodlifesaas.TtGoodLifeSaasService;
 import com.iformall.douyin.web.api.web.TtWebService;
 import com.iformall.douyin.web.bean.GoodsCategory;
 import com.iformall.douyin.web.bean.GoodsTemplateGet;
-import com.iformall.enums.*;
+import com.iformall.enums.EnumCouponValidType;
+import com.iformall.enums.EnumDouyinApplicationVersion;
+import com.iformall.enums.EnumYesOrNo;
 import com.iformall.exception.MallinkException;
 import com.iformall.mapper.TtGoodsCategoryMapper;
 import com.iformall.mapper.TtGoodsCategoryNewMapper;
@@ -25,7 +24,6 @@ import com.iformall.service.WxAppinfoService;
 import com.iformall.service.WxMallService;
 import com.iformall.utils.DateUtils;
 import com.iformall.utils.RedisCacheUtils;
-import com.microsoft.schemas.vml.STExt;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -33,7 +31,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/TtMallGoodsCategoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/TtMallGoodsCategoryServiceImpl.java
index 0f9e4f475..38735d07d 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/TtMallGoodsCategoryServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/TtMallGoodsCategoryServiceImpl.java
@@ -10,7 +10,6 @@ import com.iformall.enums.EnumYesOrNo;
 import com.iformall.mapper.TtGoodsCategoryMapper;
 import com.iformall.mapper.TtMallGoodsCategoryMapper;
 import com.iformall.service.TtMallGoodsCategoryService;
-import com.iformall.service.TtMerchantPoiService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/TtMallImServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/TtMallImServiceImpl.java
index 146815eef..a747e3d57 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/TtMallImServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/TtMallImServiceImpl.java
@@ -15,10 +15,8 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Service
 public class TtMallImServiceImpl implements TtMallImService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java
index 2f6b3765d..4d0d44886 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java
@@ -15,15 +15,19 @@ import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.GaoDePoiInfo;
 import com.iformall.domain.vo.MerchantPoiT;
 import com.iformall.domain.vo.MerchantPoiTNew;
-import com.iformall.domain.vo.WxCardPriceTemplate;
 import com.iformall.douyin.web.api.basic.TtBasicService;
 import com.iformall.douyin.web.api.goodlifesaas.TtGoodLifeSaasService;
 import com.iformall.douyin.web.api.web.TtWebService;
-import com.iformall.douyin.web.bean.*;
+import com.iformall.douyin.web.bean.TtSupplierMatch;
+import com.iformall.douyin.web.bean.TtSupplierMatchList;
+import com.iformall.douyin.web.bean.TtSupplierSync;
+import com.iformall.douyin.web.bean.TtSupplierSyncQuery;
 import com.iformall.enums.*;
 import com.iformall.exception.MallinkException;
 import com.iformall.mapper.*;
-import com.iformall.service.*;
+import com.iformall.service.ExcelService;
+import com.iformall.service.TtMerchantPoiService;
+import com.iformall.service.WxAppinfoService;
 import com.iformall.utils.Constant;
 import com.iformall.utils.HttpUtil;
 import com.iformall.utils.MaUtil;
@@ -35,12 +39,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.util.*;
 
 /**
  * @author gongbiao
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/TtOrderPushErrorServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/TtOrderPushErrorServiceImpl.java
index 4f8e8c91f..71888ecf8 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/TtOrderPushErrorServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/TtOrderPushErrorServiceImpl.java
@@ -2,7 +2,7 @@ package com.iformall.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.iformall.common.IdWorker;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.TtOrderPushError;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.mapper.TtOrderPushErrorMapper;
 import com.iformall.service.TtOrderPushErrorService;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/UserBasicInfoAddressServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/UserBasicInfoAddressServiceImpl.java
index f37b36ff5..f8bf4f958 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/UserBasicInfoAddressServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/UserBasicInfoAddressServiceImpl.java
@@ -5,12 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.IdWorker;
-import com.iformall.common.ResultData;
-import com.iformall.domain.po.*;
-import com.iformall.enums.EnumCarVendor;
+import com.iformall.domain.po.UserBasicInfoAddress;
 import com.iformall.enums.EnumYesOrNo;
-import com.iformall.mapper.*;
-import com.iformall.service.*;
+import com.iformall.mapper.UserBasicInfoAddressMapper;
+import com.iformall.service.UserBasicInfoAddressService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java
index fa5ec4002..2ccd576d1 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java
@@ -8,7 +8,10 @@ import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
 import com.iformall.common.Result;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.WxActivity;
+import com.iformall.domain.po.WxActivityJoin;
+import com.iformall.domain.po.WxCUserBasicInfo;
+import com.iformall.domain.po.WxCreditHistory;
 import com.iformall.domain.po.msg.WxMsgRecord;
 import com.iformall.domain.vo.WxActivityJoinQuestionAnswer;
 import com.iformall.enums.*;
@@ -18,7 +21,6 @@ import com.iformall.mq.MqBaseProducer;
 import com.iformall.service.ExcelService;
 import com.iformall.service.WxActivityJoinService;
 import com.iformall.service.WxCreditHistoryService;
-import com.iformall.service.WxScoreHistoryService;
 import com.iformall.service.WxScoreRulesService;
 import com.iformall.utils.DateUtils;
 import com.iformall.utils.RedisLock;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java
index 7e5fe355c..26abc1dd4 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java
@@ -11,24 +11,19 @@ import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.enums.EnumAppPlat;
 import com.iformall.enums.EnumAppType;
 import com.iformall.enums.EnumCouponType;
-import com.iformall.enums.EnumPayWay;
 import com.iformall.mapper.WxAppinfoMapper;
 import com.iformall.service.WxAppinfoService;
 import com.iformall.service.WxMallService;
 import com.iformall.utils.Constant;
 import com.iformall.utils.RedisCacheUtils;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 @Service
 public class WxAppinfoServiceImpl implements WxAppinfoService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java
index 870b344bb..acb4877f3 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.IdWorker;
-import com.iformall.domain.po.WxAppinfo;
 import com.iformall.domain.po.WxAuthorizerInfo;
 import com.iformall.domain.po.WxProjectConfig;
 import com.iformall.domain.po.WxWeappExtSet;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java
index 014ebb89e..a7eb6fa4c 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java
@@ -7,7 +7,10 @@ import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
 import com.iformall.common.Result;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.MallUserInfo;
+import com.iformall.domain.po.WxBillAction;
+import com.iformall.domain.po.WxBillOtherDeposit;
+import com.iformall.domain.po.WxPayAccountBill;
 import com.iformall.enums.*;
 import com.iformall.exception.MallinkException;
 import com.iformall.mapper.WxBillOtherDepositMapper;
@@ -27,7 +30,10 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author gongbiao
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java
index 8fe040f62..076008e48 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java
@@ -7,7 +7,10 @@ import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
 import com.iformall.common.Result;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.MallUserInfo;
+import com.iformall.domain.po.WxBillAction;
+import com.iformall.domain.po.WxBillOther;
+import com.iformall.domain.po.WxPayAccountBill;
 import com.iformall.enums.*;
 import com.iformall.exception.MallinkException;
 import com.iformall.mapper.WxBillOtherMapper;
@@ -27,7 +30,10 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author gongbiao
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java
index a45b8667f..6f15d9a76 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java
@@ -9,27 +9,17 @@ import com.iformall.common.Result;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.MallUserInfo;
 import com.iformall.domain.po.WxBillAction;
-import com.iformall.domain.po.WxBillDeposit;
-import com.iformall.domain.po.WxBillRent;
 import com.iformall.domain.po.WxBillRentManage;
 import com.iformall.domain.po.WxPayAccountBill;
-import com.iformall.enums.EnumBillAction;
-import com.iformall.enums.EnumBillDailyStatus;
-import com.iformall.enums.EnumBillPayWay;
-import com.iformall.enums.EnumBillRentStatus;
-import com.iformall.enums.EnumDelStatus;
-import com.iformall.enums.EnumRentShopType;
+import com.iformall.enums.*;
 import com.iformall.exception.MallinkException;
 import com.iformall.mapper.WxBillActionMapper;
-import com.iformall.mapper.WxBillDepositMapper;
 import com.iformall.mapper.WxBillRentManageMapper;
 import com.iformall.service.ExcelService;
 import com.iformall.service.WxBillActionService;
-import com.iformall.service.WxBillDepositService;
 import com.iformall.service.WxBillRentManageService;
 import com.iformall.service.WxPayAccountBillService;
 import com.iformall.utils.DateUtils;
-
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -37,17 +27,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author gongbiao
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java
index c229fa02e..1b81beb6a 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java
@@ -8,7 +8,6 @@ import com.iformall.common.IdWorker;
 import com.iformall.common.Result;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.*;
-import com.iformall.domain.po.base.BaseEntity;
 import com.iformall.domain.vo.RatioVo;
 import com.iformall.enums.*;
 import com.iformall.exception.MallinkException;
@@ -25,6 +24,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleRecordServiceImpl.java
index c54b65534..38da45f9d 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleRecordServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleRecordServiceImpl.java
@@ -9,7 +9,6 @@ import com.iformall.domain.po.WxBillSettleRecord;
 import com.iformall.domain.po.WxMerchantBUser;
 import com.iformall.enums.EnumSettleRecordWay;
 import com.iformall.enums.EnumSettleStatus;
-import com.iformall.enums.EnumSettleWay;
 import com.iformall.mapper.WxBillSettleMapper;
 import com.iformall.mapper.WxBillSettleRecordMapper;
 import com.iformall.mapper.WxMerchantBUserMapper;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java
index ef31a6d9f..b7392d76e 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java
@@ -6,12 +6,9 @@ import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
 import com.iformall.common.Result;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.WxBrand;
-import com.iformall.domain.po.WxBusiness;
-import com.iformall.domain.po.WxShop;
+import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.enums.EnumDelFlag;
-import com.iformall.enums.EnumYesOrNo;
 import com.iformall.exception.MallinkException;
 import com.iformall.mapper.WxBrandMapper;
 import com.iformall.service.WxBrandService;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java
index 622b42bda..19d041a0d 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java
@@ -39,7 +39,6 @@ import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Service
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java
index fd530b69f..da205a943 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java
@@ -3,9 +3,11 @@ package com.iformall.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.iformall.common.IdWorker;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.WxBusiness;
+import com.iformall.domain.po.WxPropertyContract;
+import com.iformall.domain.po.WxRentContract;
+import com.iformall.domain.po.WxScoreRules;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.enums.*;
 import com.iformall.mapper.WxBusinessMapper;
@@ -26,12 +28,7 @@ import org.springframework.stereotype.Service;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 public class WxBusinessServiceImpl implements WxBusinessService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicChildServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicChildServiceImpl.java
index 4216a3648..bae7a18f2 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicChildServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicChildServiceImpl.java
@@ -4,15 +4,17 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.IdWorker;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.WxCUserBasicChild;
 import com.iformall.mapper.WxCUserBasicChildMapper;
-import com.iformall.service.*;
+import com.iformall.service.WxCUserBasicChildService;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import java.util.*;
+
+import java.util.Date;
+import java.util.List;
 
 @Service
 @Slf4j
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java
index 0a0668096..d5d3f9cf8 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java
@@ -1,10 +1,9 @@
 package com.iformall.service.impl;
 
+import cn.afterturn.easypoi.handler.inter.IExcelExportServer;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.IdWorker;
@@ -20,9 +19,6 @@ import com.iformall.enums.*;
 import com.iformall.mapper.*;
 import com.iformall.mq.MqBaseProducer;
 import com.iformall.service.*;
-
-import cn.afterturn.easypoi.handler.inter.IExcelExportServer;
-
 import org.apache.commons.compress.utils.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicSignServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicSignServiceImpl.java
index 29228d4e4..5e57936f1 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicSignServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicSignServiceImpl.java
@@ -26,8 +26,6 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
-import static java.util.Calendar.DAY_OF_MONTH;
-
 @Service
 @Slf4j
 public class WxCUserBasicSignServiceImpl implements WxCUserBasicSignService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserFromServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserFromServiceImpl.java
index 93f091bb0..75130cb40 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserFromServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserFromServiceImpl.java
@@ -3,15 +3,21 @@ package com.iformall.service.impl;
 import cn.afterturn.easypoi.handler.inter.IExcelExportServer;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
-import com.iformall.common.ResultData;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.WxCUserBasicInfo;
+import com.iformall.domain.po.WxCUserFrom;
+import com.iformall.domain.po.WxCreditHistory;
+import com.iformall.domain.po.WxMerchant;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.WxCUserFromVo;
 import com.iformall.enums.*;
-import com.iformall.mapper.*;
-import com.iformall.service.*;
+import com.iformall.mapper.WxCUserBasicInfoMapper;
+import com.iformall.mapper.WxCUserFromMapper;
+import com.iformall.mapper.WxMerchantMapper;
+import com.iformall.service.ExcelService;
+import com.iformall.service.WxCUserBasicInfoService;
+import com.iformall.service.WxCUserFromService;
+import com.iformall.service.WxCreditHistoryService;
 import com.iformall.service.cuser.CUserServiceFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
@@ -22,7 +28,9 @@ import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 @Service
 @Slf4j
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java
index c4d82a40f..5eb61a6be 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java
@@ -5,7 +5,10 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.IdWorker;
 import com.iformall.domain.dto.WxCUserBasicInfoDto;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.WxAuthorizerInfo;
+import com.iformall.domain.po.WxCUser;
+import com.iformall.domain.po.WxCUserBasicInfo;
+import com.iformall.domain.po.WxCUserFrom;
 import com.iformall.domain.po.base.BaseCUserEntity;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.msg.FmInsideCLoginMsg;
@@ -13,7 +16,6 @@ import com.iformall.domain.vo.UserCountVo;
 import com.iformall.enums.*;
 import com.iformall.exception.MallinkException;
 import com.iformall.mapper.WxCUserMapper;
-import com.iformall.mapper.WxMallMapper;
 import com.iformall.mq.MqBaseProducer;
 import com.iformall.service.*;
 import com.iformall.utils.Constant;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java
index 121fd3086..fb2c4d344 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java
@@ -10,24 +10,23 @@ import com.iformall.domain.dto.WxCUserBasicInfoDto;
 import com.iformall.domain.po.*;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.WxCUserBasicTagVo;
-import com.iformall.enums.*;
-import com.iformall.mapper.*;
+import com.iformall.enums.EnumAssignTagsTrigger;
+import com.iformall.enums.EnumTag;
+import com.iformall.enums.EnumTagType;
+import com.iformall.mapper.WxCUserBasicInfoMapper;
+import com.iformall.mapper.WxCUserCarMapper;
+import com.iformall.mapper.WxCUserTagsMapper;
+import com.iformall.mapper.WxTagsMapper;
 import com.iformall.service.WxCUserTagsService;
-import com.iformall.service.WxTagsService;
 import com.iformall.service.helper.WxCUserTagsServiceHelper;
 import com.iformall.service.tags.TagsDeveloper;
-import com.iformall.utils.DateUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 @Service
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java
index 81b2a7c41..4135f9a08 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java
@@ -9,7 +9,6 @@ import com.iformall.common.Result;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.*;
 import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.domain.vo.WxCouponChannelVo;
 import com.iformall.enums.*;
 import com.iformall.exception.MallinkException;
 import com.iformall.mapper.WxActivityMapper;
@@ -20,7 +19,6 @@ import com.iformall.service.QrCodeService;
 import com.iformall.service.WxCampaignService;
 import com.iformall.service.WxCouponChannelService;
 import com.iformall.service.WxCouponService;
-import com.iformall.utils.Constant;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java
index 82baf1d27..6930c7507 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java
@@ -2,11 +2,11 @@ package com.iformall.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.iformall.common.IdWorker;
 import com.iformall.domain.po.WxCarCmdLog;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.enums.EnumCarCmd;
 import com.iformall.mapper.WxCarCmdLogMapper;
-import com.iformall.mapper.WxMallMapper;
 import com.iformall.service.WxBusinessCircleOrderService;
 import com.iformall.service.WxCarCmdLogService;
 import com.iformall.service.WxMallService;
@@ -15,7 +15,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.iformall.common.IdWorker;
 
 import java.math.BigDecimal;
 import java.util.HashMap;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCarPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCarPayOrderServiceImpl.java
index dfdf54994..16fe6ec36 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCarPayOrderServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCarPayOrderServiceImpl.java
@@ -1,11 +1,11 @@
 package com.iformall.service.impl;
 
+import com.iformall.mapper.WxCarPayOrderMapper;
+import com.iformall.service.WxCarPayOrderService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.iformall.mapper.WxCarPayOrderMapper;
-import com.iformall.service.WxCarPayOrderService;
 
 @Service
 public class WxCarPayOrderServiceImpl implements WxCarPayOrderService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardDailyLogServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardDailyLogServiceImpl.java
index 608472373..0c92319b1 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardDailyLogServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardDailyLogServiceImpl.java
@@ -3,11 +3,13 @@ package com.iformall.service.impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.IdWorker;
-import com.iformall.domain.po.*;
-import com.iformall.domain.vo.WxCardVo;
+import com.iformall.domain.po.WxCardDailyLog;
+import com.iformall.domain.po.WxCoupon;
 import com.iformall.enums.EnumOperateLogType;
-import com.iformall.mapper.*;
-import com.iformall.service.*;
+import com.iformall.mapper.WxCardDailyLogMapper;
+import com.iformall.service.ExcelService;
+import com.iformall.service.WxCardDailyLogService;
+import com.iformall.service.WxCouponService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -17,7 +19,10 @@ import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @Service
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardInfoServiceImpl.java
index 44d145ee4..967c27910 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardInfoServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardInfoServiceImpl.java
@@ -18,7 +18,6 @@ import com.iformall.service.*;
 import com.iformall.utils.Constant;
 import com.iformall.utils.DateUtils;
 import com.iformall.utils.RedisLock;
-
 import org.apache.commons.beanutils.BeanUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -30,14 +29,9 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 public class WxCardInfoServiceImpl implements WxCardInfoService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java
index 3872c8d5e..083545574 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java
@@ -7,7 +7,6 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
-import com.iformall.common.Result;
 import com.iformall.common.ResultData;
 import com.iformall.domain.dto.WxSharingOrderDto;
 import com.iformall.domain.po.*;
@@ -16,15 +15,12 @@ import com.iformall.domain.po.msg.WxMsg;
 import com.iformall.domain.vo.PromotionCalc;
 import com.iformall.domain.vo.WxCardSpendMerchantVo;
 import com.iformall.domain.vo.WxCardSpendVo;
-import com.iformall.domain.vo.WxCardVo;
 import com.iformall.enums.*;
 import com.iformall.exception.MallinkException;
 import com.iformall.mapper.*;
 import com.iformall.service.*;
 import com.iformall.utils.Constant;
 import com.iformall.utils.PayUtils;
-import com.iformall.utils.RedisLock;
-
 import org.apache.commons.beanutils.BeanUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -36,15 +32,10 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 public class WxCardSpendServiceImpl implements WxCardSpendService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCashOutServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCashOutServiceImpl.java
index 86c7926b0..22acb208f 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCashOutServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCashOutServiceImpl.java
@@ -9,29 +9,19 @@ import com.iformall.common.ResultData;
 import com.iformall.domain.po.*;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.msg.FmInsideCashOutMsg;
-import com.iformall.domain.po.msg.FmInsideCouponVerifyMsg;
-import com.iformall.enums.EnumCashOut;
-import com.iformall.enums.EnumCashOutStatus;
-import com.iformall.enums.EnumFlowKey;
-import com.iformall.enums.EnumMsgMqKey;
-import com.iformall.enums.EnumMsgMqTag;
-import com.iformall.enums.EnumMsgMqTopic;
-import com.iformall.enums.EnumMsgRecordType;
-import com.iformall.enums.EnumPayWay;
+import com.iformall.enums.*;
 import com.iformall.exception.MallinkException;
-import com.iformall.mapper.*;
+import com.iformall.mapper.WxCashOutMapper;
+import com.iformall.mapper.WxMallMapper;
+import com.iformall.mapper.WxMerchantMapper;
 import com.iformall.mq.MqBaseProducer;
-import com.iformall.service.*;
+import com.iformall.service.WxAppinfoService;
+import com.iformall.service.WxCashOutService;
+import com.iformall.service.WxFlowService;
+import com.iformall.service.WxPayAccountService;
 import com.iformall.service.pay.PayServiceFactory;
 import com.iformall.service.pay.service.cashout.entity.CashOutAdapterResult;
 import com.iformall.utils.RedisLock;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,6 +30,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.*;
+
 @Service
 public class WxCashOutServiceImpl implements WxCashOutService {
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java
index 518ddaf19..6668dcee4 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java
@@ -1,16 +1,13 @@
 package com.iformall.service.impl;
 
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.stream.Collectors;
-
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ErrorCode;
+import com.iformall.common.IdWorker;
 import com.iformall.domain.dto.MarkingCouponDataReportDto;
+import com.iformall.domain.po.WxCouponActionLog;
 import com.iformall.domain.po.base.BaseEntity;
 import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.domain.po.WxCouponActionLog;
 import com.iformall.domain.vo.MarkingSceneDataReportTVo;
 import com.iformall.domain.vo.MarkingSceneDataReportVo;
 import com.iformall.domain.vo.MarkingSceneDataVo;
@@ -23,9 +20,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.iformall.common.IdWorker;
 import org.springframework.util.CollectionUtils;
 
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
 @Service
 public class WxCouponActionLogServiceImpl implements WxCouponActionLogService {
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponBatchServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponBatchServiceImpl.java
index 8121f8f8e..fd5d1499f 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponBatchServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponBatchServiceImpl.java
@@ -1,23 +1,21 @@
 package com.iformall.service.impl;
 
 import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.IdWorker;
 import com.iformall.common.Result;
-import com.iformall.common.ResultData;
-import com.iformall.domain.po.*;
-import com.iformall.domain.po.base.TenantEntity;
+import com.iformall.domain.po.WxCoupon;
+import com.iformall.domain.po.WxCouponBatch;
+import com.iformall.domain.po.WxCouponBatchItem;
 import com.iformall.domain.vo.CouponBatchVo;
-import com.iformall.domain.vo.CouponPressBatchVo;
-import com.iformall.enums.EnumOrderStatus;
-import com.iformall.enums.EnumOrderType;
 import com.iformall.enums.EnumPressBatchStatus;
-import com.iformall.enums.EnumYesOrNo;
 import com.iformall.exception.MallinkException;
-import com.iformall.mapper.*;
-import com.iformall.service.*;
+import com.iformall.mapper.WxCouponBatchItemMapper;
+import com.iformall.mapper.WxCouponBatchMapper;
+import com.iformall.mapper.WxCouponMapper;
+import com.iformall.mapper.WxCouponOrderMapper;
+import com.iformall.service.WxCouponBatchService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +23,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class WxCouponBatchServiceImpl implements WxCouponBatchService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java
index 905fee4e0..ad5a2b5f4 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java
@@ -9,7 +9,10 @@ import com.iformall.common.ResultData;
 import com.iformall.domain.po.*;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.msg.FmInsideProductPushMsg;
-import com.iformall.domain.vo.*;
+import com.iformall.domain.vo.TtCouponChannelVo;
+import com.iformall.domain.vo.WxCouponCVo;
+import com.iformall.domain.vo.WxCouponChannelAddVo;
+import com.iformall.domain.vo.WxCouponChannelVo;
 import com.iformall.enums.*;
 import com.iformall.exception.MallinkException;
 import com.iformall.mapper.*;
@@ -17,8 +20,6 @@ import com.iformall.mq.MqBaseProducer;
 import com.iformall.service.*;
 import com.iformall.service.pay.PayServiceFactory;
 import com.iformall.utils.Constant;
-import com.iformall.utils.RedisLock;
-
 import org.apache.commons.beanutils.BeanUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponMallServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponMallServiceImpl.java
index 50e16b9b4..12073d8b0 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponMallServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponMallServiceImpl.java
@@ -4,21 +4,19 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ErrorCode;
 import com.iformall.domain.po.*;
-import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.enums.EnumAppPlat;
-import com.iformall.enums.EnumCouponChannelStatus;
-import com.iformall.enums.EnumCouponMallStatus;
-import com.iformall.enums.EnumCouponMerchantStatus;
-import com.iformall.enums.EnumCouponType;
-import com.iformall.enums.EnumSpuSyncStatus;
+import com.iformall.enums.*;
 import com.iformall.exception.MallinkException;
 import com.iformall.mapper.*;
-import com.iformall.service.*;
+import com.iformall.service.WxCouponMallService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class WxCouponMallServiceImpl implements WxCouponMallService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderReservationServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderReservationServiceImpl.java
index f2cddf068..6b90e6a10 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderReservationServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderReservationServiceImpl.java
@@ -2,18 +2,24 @@ package com.iformall.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.iformall.common.*;
+import com.iformall.common.ErrorCode;
+import com.iformall.common.IdWorker;
+import com.iformall.common.ResultData;
 import com.iformall.domain.po.*;
-import com.iformall.enums.*;
+import com.iformall.enums.EnumCouponOrderReservationStatus;
+import com.iformall.enums.EnumCouponOrderStatus;
+import com.iformall.enums.EnumCouponType;
+import com.iformall.enums.EnumMerchantAdmin;
 import com.iformall.mapper.*;
-import com.iformall.service.*;
-import org.apache.commons.collections.CollectionUtils;
+import com.iformall.service.WxCouponOrderReservationService;
+import com.iformall.service.WxMerchantRelationService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import java.util.*;
-import java.util.stream.Collectors;
+
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class WxCouponOrderReservationServiceImpl implements WxCouponOrderReservationService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
index afca5e74a..63a5b738c 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
@@ -7,11 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
-import com.iformall.common.ErrorCode;
-import com.iformall.common.IdWorker;
-import com.iformall.common.Result;
-import com.iformall.common.ResultData;
-import com.iformall.common.SysConfigConstant;
+import com.iformall.common.*;
 import com.iformall.domain.dto.WxSharingOrderDto;
 import com.iformall.domain.po.*;
 import com.iformall.domain.po.base.TenantEntity;
@@ -35,7 +31,6 @@ import com.iformall.service.pay.service.share.PayShareAdapterService;
 import com.iformall.utils.Constant;
 import com.iformall.utils.DateUtils;
 import com.iformall.utils.RedisLock;
-
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -50,7 +45,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
 import java.text.ParseException;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java
index 5335a25a7..c401f83b3 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java
@@ -2,21 +2,20 @@ package com.iformall.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.*;
 import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.enums.*;
 import com.iformall.domain.vo.WxCardPriceTemplate;
 import com.iformall.domain.vo.WxCouponPasswordCountInfoVO;
 import com.iformall.domain.vo.WxCouponPasswordVo;
-import com.iformall.common.ErrorCode;
+import com.iformall.enums.*;
 import com.iformall.exception.MallinkException;
 import com.iformall.mapper.WxCardInfoMapper;
 import com.iformall.mapper.WxCouponMapper;
 import com.iformall.mapper.WxCouponPasswordMapper;
 import com.iformall.service.*;
-
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,14 +28,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 @Service
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPresentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPresentServiceImpl.java
index 21fe05c9c..2652efd62 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPresentServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPresentServiceImpl.java
@@ -7,8 +7,8 @@ import com.iformall.common.ResultData;
 import com.iformall.domain.po.WxAppinfo;
 import com.iformall.domain.po.WxCouponPassword;
 import com.iformall.domain.po.WxCouponPresent;
-import com.iformall.domain.po.msg.WxMsgRecord;
 import com.iformall.domain.po.base.TenantEntity;
+import com.iformall.domain.po.msg.WxMsgRecord;
 import com.iformall.enums.*;
 import com.iformall.mapper.WxCouponPasswordMapper;
 import com.iformall.mapper.WxCouponPresentMapper;
@@ -16,7 +16,6 @@ import com.iformall.mq.MqBaseProducer;
 import com.iformall.service.WxAppinfoService;
 import com.iformall.service.WxCouponPresentService;
 import com.iformall.service.msg.impl.SendSmsServiceImpl;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java
index 0a4d39ccf..6ccfd334f 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java
@@ -4,15 +4,11 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.google.common.collect.Lists;
 import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
 import com.iformall.domain.po.*;
 import com.iformall.domain.po.base.BaseEntity;
 import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.domain.po.msg.AppUniformMsg;
-import com.iformall.domain.po.msg.MpAppMsg;
-import com.iformall.domain.po.msg.WxMsg;
 import com.iformall.domain.po.msg.WxMsgRecord;
 import com.iformall.domain.vo.WxCouponSendVo;
 import com.iformall.enums.*;
@@ -20,9 +16,7 @@ import com.iformall.exception.MallinkException;
 import com.iformall.mapper.*;
 import com.iformall.mq.MqBaseProducer;
 import com.iformall.service.*;
-import com.iformall.utils.Constant;
 import com.iformall.utils.DateUtils;
-
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -35,7 +29,6 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.lang.reflect.InvocationTargetException;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 @Service
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java
index 60a18cb9d..209465fd4 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java
@@ -3,7 +3,6 @@ package com.iformall.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -31,7 +30,6 @@ import com.iformall.service.*;
 import com.iformall.service.excel.WxCardDataExporter;
 import com.iformall.service.excel.WxCouponDataExporter;
 import com.iformall.service.excel.WxPressDataExporter;
-
 import com.iformall.service.pay.PayServiceFactory;
 import com.iformall.service.pay.service.share.PayShareAdapterService;
 import com.iformall.utils.Constant;
@@ -50,13 +48,12 @@ import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import static java.util.stream.Collectors.toList;
 
 
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponTypeServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponTypeServiceImpl.java
index ca83f54ea..fbe6d3b93 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponTypeServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponTypeServiceImpl.java
@@ -2,6 +2,7 @@ package com.iformall.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.iformall.common.IdWorker;
 import com.iformall.domain.po.WxCouponType;
 import com.iformall.mapper.WxCouponTypeMapper;
 import com.iformall.service.WxCouponTypeService;
@@ -9,7 +10,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.iformall.common.IdWorker;
 
 @Service
 public class WxCouponTypeServiceImpl implements WxCouponTypeService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java
index a64050fa1..c847f01b4 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java
@@ -2,7 +2,6 @@ package com.iformall.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Maps;
@@ -20,13 +19,8 @@ import com.iformall.exception.MallinkException;
 import com.iformall.mapper.*;
 import com.iformall.mq.MqBaseProducer;
 import com.iformall.service.*;
-import com.iformall.utils.Constant;
-import com.iformall.utils.CreditUtil;
-import com.iformall.utils.DateUtils;
-import com.iformall.utils.RedisLock;
-import com.iformall.utils.UserUtil;
+import com.iformall.utils.*;
 import lombok.extern.slf4j.Slf4j;
-
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,15 +32,9 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCuserFloatingLayerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCuserFloatingLayerServiceImpl.java
index 9120097a2..f3cdde272 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCuserFloatingLayerServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCuserFloatingLayerServiceImpl.java
@@ -2,7 +2,6 @@ package com.iformall.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.iformall.common.IdWorker;
-import com.iformall.domain.po.WxAppinfo;
 import com.iformall.domain.po.WxCUser;
 import com.iformall.domain.po.WxCuserFloatingLayer;
 import com.iformall.domain.po.WxFloatingLayer;
@@ -13,8 +12,6 @@ import com.iformall.mapper.WxCUserMapper;
 import com.iformall.mapper.WxCuserFloatingLayerMapper;
 import com.iformall.mapper.WxFloatingLayerMapper;
 import com.iformall.service.WxCuserFloatingLayerService;
-
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCustomizeModuleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCustomizeModuleServiceImpl.java
index 2b8ec2294..49c6aab06 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCustomizeModuleServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCustomizeModuleServiceImpl.java
@@ -4,7 +4,10 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.IdWorker;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.WxAppinfo;
+import com.iformall.domain.po.WxCustomizeModule;
+import com.iformall.domain.po.WxMiniappTheme;
+import com.iformall.domain.po.WxThemeMall;
 import com.iformall.enums.EnumYesOrNo;
 import com.iformall.mapper.WxCustomizeModuleMapper;
 import com.iformall.service.WxAppinfoService;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxDateAmountRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxDateAmountRecordServiceImpl.java
index 60a8d5517..3eebb7c9b 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxDateAmountRecordServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxDateAmountRecordServiceImpl.java
@@ -1,8 +1,8 @@
 package com.iformall.service.impl;
 
-import java.util.*;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.iformall.common.IdWorker;
 import com.iformall.domain.po.WxDateAmountRecord;
 import com.iformall.mapper.WxDateAmountRecordMapper;
 import com.iformall.service.WxDateAmountRecordService;
@@ -10,7 +10,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.iformall.common.IdWorker;
+
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class WxDateAmountRecordServiceImpl implements WxDateAmountRecordService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java
index be3370a2f..e245a0221 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java
@@ -5,10 +5,8 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
-
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.WxDevice;
-import com.iformall.enums.EnumDeviceStatus;
 import com.iformall.enums.EnumDeviceType;
 import com.iformall.mapper.WxDeviceMapper;
 import com.iformall.service.WxDeviceService;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowConfigServiceImpl.java
index 338e0d1f3..b68935c0c 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowConfigServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowConfigServiceImpl.java
@@ -1,12 +1,8 @@
 package com.iformall.service.impl;
 
-import com.iformall.common.IdWorker;
 import com.iformall.domain.po.WxFlowConfig;
-import com.iformall.domain.po.WxWiWideInfo;
 import com.iformall.mapper.WxFlowConfigMapper;
-import com.iformall.mapper.WxWiwideInfoMapper;
 import com.iformall.service.WxFlowConfigService;
-import com.iformall.service.WxWiWideInfoService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowRecordServiceImpl.java
index 081d7c974..d7137783f 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowRecordServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowRecordServiceImpl.java
@@ -6,6 +6,7 @@ import com.iformall.mapper.WxFlowRecordMapper;
 import com.iformall.service.WxFlowRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import java.util.List;
 
 /**
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java
index d0bec4d44..0d5fc6df9 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java
@@ -25,8 +25,8 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
-import org.flowable.bpmn.model.*;
 import org.flowable.bpmn.model.Process;
+import org.flowable.bpmn.model.*;
 import org.flowable.common.engine.api.FlowableIllegalArgumentException;
 import org.flowable.engine.ProcessEngine;
 import org.flowable.engine.RepositoryService;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java
index e8d7b4dea..5fc600668 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java
@@ -25,8 +25,6 @@ import com.iformall.mapper.WxGameMapper;
 import com.iformall.service.*;
 import com.iformall.service.order.entity.WxComposeOrder;
 import com.iformall.utils.Constant;
-import com.iformall.utils.RedisCacheUtils;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,7 +39,6 @@ import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 import static org.springframework.transaction.annotation.Propagation.REQUIRED;
-import static org.springframework.transaction.annotation.Propagation.REQUIRES_NEW;
 
 @Service
 public class WxGameServiceImpl implements WxGameService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxGooagooServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxGooagooServiceImpl.java
index e27536a74..908acc607 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxGooagooServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxGooagooServiceImpl.java
@@ -10,7 +10,7 @@ import com.iformall.domain.po.WxThirdPartyConfig;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.enums.EnumThirdPartyConfigType;
 import com.iformall.mapper.WxThirdPartyConfigMapper;
-import com.iformall.service.*;
+import com.iformall.service.WxGooagooService;
 import com.iformall.utils.DateUtils;
 import com.iformall.utils.HttpUtil;
 import com.iformall.utils.sign.SignUtils;
@@ -19,7 +19,10 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 
 /**
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxGroupServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxGroupServiceImpl.java
index 3e0c50bd4..078fa50d5 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxGroupServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxGroupServiceImpl.java
@@ -1,6 +1,5 @@
 package com.iformall.service.impl;
 
-import java.util.*;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.iformall.domain.po.WxGroup;
@@ -11,6 +10,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.UUID;
+
 @Service
 public class WxGroupServiceImpl implements WxGroupService {
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java
index 43fc67742..7787898d4 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java
@@ -6,11 +6,9 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.IdWorker;
 import com.iformall.domain.dto.WxCUserBasicInfoDto;
-import com.iformall.domain.po.WxAppinfo;
-import com.iformall.domain.po.WxCUserBasicInfo;
-import com.iformall.domain.po.base.BaseEntity;
 import com.iformall.domain.po.WxLevelConfig;
 import com.iformall.domain.po.WxLevelMerchant;
+import com.iformall.domain.po.base.BaseEntity;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.WxLevelMerchantCVo;
 import com.iformall.mapper.WxCUserBasicInfoMapper;
@@ -20,21 +18,17 @@ import com.iformall.service.WxCUserBasicInfoService;
 import com.iformall.service.WxLevelConfigService;
 import com.iformall.utils.Constant;
 import com.iformall.utils.RedisCacheUtils;
-
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 @Service
 public class WxLevelConfigServiceImpl implements WxLevelConfigService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallApplyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallApplyServiceImpl.java
index 981c84c90..c24553676 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallApplyServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallApplyServiceImpl.java
@@ -6,9 +6,13 @@ import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
 import com.iformall.common.Result;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.WxMallApply;
+import com.iformall.domain.po.WxMsgValidationcode;
 import com.iformall.domain.po.msg.WxMsgRecord;
-import com.iformall.enums.*;
+import com.iformall.enums.EnumMsgMqKey;
+import com.iformall.enums.EnumMsgMqTag;
+import com.iformall.enums.EnumMsgMqTopic;
+import com.iformall.enums.EnumMsgRecordType;
 import com.iformall.mapper.WxMallApplyMapper;
 import com.iformall.mapper.WxMsgConfigMapper;
 import com.iformall.mapper.WxMsgValidationcodeMapper;
@@ -21,7 +25,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @Service
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java
index 508b00af3..dd18fc009 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java
@@ -7,11 +7,10 @@ import com.github.pagehelper.PageInfo;
 import com.iformall.common.IdWorker;
 import com.iformall.common.ResultData;
 import com.iformall.domain.dto.WxMallBuildingFloorDto;
-import com.iformall.domain.po.WxCUserBasicInfo;
 import com.iformall.domain.po.WxMall;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.WxMallBuilding;
 import com.iformall.domain.po.WxMallFloor;
+import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.mapper.WxMallBuildingMapper;
 import com.iformall.mapper.WxMallFloorMapper;
 import com.iformall.service.WxMallBuildingService;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallDisposeServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallDisposeServiceImpl.java
index 4fec5803a..95986a4c4 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallDisposeServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallDisposeServiceImpl.java
@@ -1,39 +1,19 @@
 package com.iformall.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.iformall.common.ErrorCode;
-import com.iformall.common.ResultData;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.WxMallDispose;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.WxMallDisposeVo;
-import com.iformall.enums.*;
-import com.iformall.mapper.WxMallBuildingMapper;
+import com.iformall.enums.EnumMallDispose;
 import com.iformall.mapper.WxMallDisposeMapper;
-import com.iformall.mapper.WxMallFloorMapper;
-import com.iformall.mapper.WxMallMapper;
-import com.iformall.service.MallUserInfoService;
 import com.iformall.service.WxMallDisposeService;
 import com.iformall.service.WxMallService;
-import com.iformall.utils.Constant;
-import com.iformall.utils.PasswordHelper;
-import com.iformall.utils.RedisCacheUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.Assert;
-
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
 @Service
 public class WxMallDisposeServiceImpl implements WxMallDisposeService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallFloorServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallFloorServiceImpl.java
index 3561f2876..3ee345b9a 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallFloorServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallFloorServiceImpl.java
@@ -1,20 +1,22 @@
 package com.iformall.service.impl;
 
-import java.util.*;
-import java.util.stream.Collectors;
-
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.iformall.common.IdWorker;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.WxMallFloor;
+import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.mapper.WxMallFloorMapper;
 import com.iformall.service.WxMallFloorService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.iformall.common.IdWorker;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 public class WxMallFloorServiceImpl implements WxMallFloorService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java
index 29d4d7066..dbc0e0e32 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java
@@ -1,6 +1,5 @@
 package com.iformall.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -14,7 +13,6 @@ import com.iformall.mapper.*;
 import com.iformall.service.MallUserInfoService;
 import com.iformall.service.WxMallService;
 import com.iformall.utils.Constant;
-import com.iformall.utils.DateUtils;
 import com.iformall.utils.PasswordHelper;
 import com.iformall.utils.RedisCacheUtils;
 import org.apache.commons.lang3.StringUtils;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMemberCardServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMemberCardServiceImpl.java
index 8788ed18f..2bc43dd78 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxMemberCardServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMemberCardServiceImpl.java
@@ -1,7 +1,6 @@
 package com.iformall.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.github.binarywang.wxpay.bean.businesscircle.MemberCardAuthorizeResult;
 import com.github.binarywang.wxpay.bean.membercard.MemberCardResult;
 import com.github.binarywang.wxpay.bean.membercard.MemberCardRightsRequest;
 import com.github.binarywang.wxpay.bean.membercard.MemberCardUpdRequest;
@@ -12,26 +11,22 @@ import com.github.pagehelper.PageInfo;
 import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.WxAppinfo;
+import com.iformall.domain.po.WxMemberCard;
+import com.iformall.domain.po.WxPayAccount;
 import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.domain.po.msg.AfterAddCreditMsg;
-import com.iformall.domain.po.msg.AfterAddScoreMsg;
-import com.iformall.domain.po.msg.FmInsideCLoginMsg;
 import com.iformall.domain.po.msg.SyncMemberCardMsg;
 import com.iformall.enums.*;
 import com.iformall.mapper.WxMemberCardMapper;
 import com.iformall.mq.MqBaseProducer;
 import com.iformall.service.*;
-import com.iformall.utils.DateUtils;
 import com.iformall.utils.MaUtil;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
-import java.util.List;
 
 @Service
 public class WxMemberCardServiceImpl implements WxMemberCardService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java
index 54c84c62c..ceb40054d 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java
@@ -6,7 +6,10 @@ import com.github.pagehelper.PageInfo;
 import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.WxMall;
+import com.iformall.domain.po.WxMerchant;
+import com.iformall.domain.po.WxMerchantBUser;
+import com.iformall.domain.po.WxMsgValidationcode;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.WxMerchantBuInfoVo;
 import com.iformall.enums.EnumMerchantBUserStatus;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantScoreRulesServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantScoreRulesServiceImpl.java
index c770cf6f2..6f0666fc3 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantScoreRulesServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantScoreRulesServiceImpl.java
@@ -2,17 +2,15 @@ package com.iformall.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.iformall.common.IdWorker;
-import com.iformall.domain.po.*;
-import com.iformall.enums.*;
-import com.iformall.mapper.*;
-import com.iformall.service.*;
-import com.iformall.utils.Constant;
+import com.iformall.domain.po.WxMerchantScoreRules;
+import com.iformall.mapper.WxMerchantScoreRulesMapper;
+import com.iformall.service.WxMerchantScoreRulesService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.Date;
 
 @Service
 public class WxMerchantScoreRulesServiceImpl implements WxMerchantScoreRulesService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
index 5e73aae75..3a2a9389b 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
@@ -22,7 +22,6 @@ import com.iformall.service.util.CouponCacheUtils;
 import com.iformall.utils.Constant;
 import com.iformall.utils.DateUtils;
 import com.iformall.utils.RedisCacheUtils;
-
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java
index ef83b365b..be14e8b66 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java
@@ -7,21 +7,13 @@ import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
 import com.iformall.common.Result;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.MallUserInfo;
-import com.iformall.domain.po.WxMall;
-import com.iformall.domain.po.WxMerchant;
-import com.iformall.domain.po.WxMerchantBUser;
-import com.iformall.domain.po.WxMerchantTradeDaily;
-import com.iformall.domain.po.WxMerchantTradeDailyHistory;
+import com.iformall.domain.po.*;
 import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.domain.vo.WxCouponOrderBVo;
 import com.iformall.domain.vo.WxMerchantTradeDailyVo;
 import com.iformall.enums.EnumTradeDailyDateType;
 import com.iformall.exception.MallinkException;
-import com.iformall.mapper.WxMerchantMapper;
 import com.iformall.mapper.WxMerchantTradeDailyHistoryMapper;
 import com.iformall.mapper.WxMerchantTradeDailyMapper;
-import com.iformall.mapper.WxShopMapper;
 import com.iformall.service.*;
 import com.iformall.utils.DateUtils;
 import org.slf4j.Logger;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java
index 41aabb792..6def2fcdd 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java
@@ -11,7 +11,6 @@ import com.iformall.enums.EnumMsgSendStatus;
 import com.iformall.mapper.*;
 import com.iformall.service.WxMsgCallbackService;
 import com.iformall.utils.HMACSHA256;
-
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgLimitServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgLimitServiceImpl.java
index 0c58bc4e4..928ecaa1e 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgLimitServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgLimitServiceImpl.java
@@ -1,8 +1,8 @@
 package com.iformall.service.impl;
 
 import com.iformall.common.IdWorker;
-import com.iformall.domain.po.base.BaseEntity;
 import com.iformall.domain.po.WxMsgLimit;
+import com.iformall.domain.po.base.BaseEntity;
 import com.iformall.enums.EnumMsgLimitType;
 import com.iformall.mapper.WxMsgLimitMapper;
 import com.iformall.service.WxMsgLimitService;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java
index b4366e107..60e214ad6 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java
@@ -7,23 +7,22 @@ import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
 import com.iformall.common.Result;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.WxMsgConfig;
 import com.iformall.domain.po.WxMsgModel;
+import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.enums.EnumMsgModelStatus;
 import com.iformall.enums.EnumVerifyCode;
 import com.iformall.mapper.WxMsgConfigMapper;
 import com.iformall.mapper.WxMsgModelMapper;
 import com.iformall.service.WxMsgModelService;
 import com.iformall.sms.SMSFactory;
-import com.iformall.utils.*;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class WxMsgModelServiceImpl implements WxMsgModelService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java
index c435879ab..5944954a8 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java
@@ -1,18 +1,16 @@
 package com.iformall.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.iformall.common.IdWorker;
 import com.iformall.domain.po.msg.*;
 import com.iformall.enums.EnumMsgRecordStatus;
-import com.iformall.mapper.*;
+import com.iformall.mapper.WxMsgRecordMapper;
 import com.iformall.service.WxMsgRecordService;
 import com.iformall.utils.JsonUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
 import java.util.List;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java
index aca8dc8e3..1e4b8c95d 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java
@@ -1,7 +1,6 @@
 package com.iformall.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
@@ -33,7 +32,6 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
-import java.text.DateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgSignatureServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgSignatureServiceImpl.java
index 265a8df4a..f1ee69a74 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgSignatureServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgSignatureServiceImpl.java
@@ -1,8 +1,8 @@
 package com.iformall.service.impl;
 
-import java.util.*;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.iformall.common.IdWorker;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.WxMsgSignature;
 import com.iformall.domain.po.base.TenantEntity;
@@ -12,7 +12,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.iformall.common.IdWorker;
+
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class WxMsgSignatureServiceImpl implements WxMsgSignatureService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java
index aeb377148..0c46a84d9 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java
@@ -1,31 +1,18 @@
 package com.iformall.service.impl;
 
-import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.iformall.common.ErrorCode;
-import com.iformall.common.IdWorker;
-import com.iformall.common.Result;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.WxMsgConfig;
 import com.iformall.domain.po.WxMsgValidationcodeModel;
-import com.iformall.domain.po.WxProjectConfig;
-import com.iformall.enums.EnumMsgModelStatus;
-import com.iformall.enums.EnumVerifyCode;
 import com.iformall.mapper.WxMsgConfigMapper;
 import com.iformall.mapper.WxMsgValidationcodeModelMapper;
 import com.iformall.service.WxMsgValidationcodeModelService;
-import com.iformall.sms.SMSFactory;
-import com.iformall.utils.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.List;
 
 @Service
 public class WxMsgValidationcodeModelServiceImpl implements WxMsgValidationcodeModelService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java
index 3751eb6b3..ae2d0252b 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java
@@ -6,7 +6,8 @@ import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
 import com.iformall.common.Result;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.WxMsgCallback;
+import com.iformall.domain.po.WxMsgValidationcode;
 import com.iformall.domain.po.msg.WxMsgRecord;
 import com.iformall.enums.*;
 import com.iformall.mapper.*;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOcrServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOcrServiceImpl.java
index 48d5a2ba9..a4f16dfae 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxOcrServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOcrServiceImpl.java
@@ -16,6 +16,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import java.util.Date;
 import java.util.List;
 
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java
index aba17482e..ec2da8176 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java
@@ -9,7 +9,6 @@ import com.iformall.common.Result;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.*;
 import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.domain.vo.WxCouponStatisVo;
 import com.iformall.domain.vo.WxOrderGroupMarketing;
 import com.iformall.enums.*;
 import com.iformall.exception.MallinkException;
@@ -29,11 +28,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
-import java.util.stream.Collectors;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author gongbiao
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java
index 43e7cf4c7..31f4e29db 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java
@@ -3,13 +3,14 @@ package com.iformall.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.google.common.collect.Lists;
 import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.WxCoupon;
+import com.iformall.domain.po.WxOrder;
+import com.iformall.domain.po.WxOrderPress;
 import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.domain.po.msg.SmartAppMsg;
-import com.iformall.enums.*;
+import com.iformall.enums.EnumOrderPressStatus;
+import com.iformall.enums.EnumOrderPressType;
 import com.iformall.exception.MallinkException;
 import com.iformall.mapper.WxCUserMapper;
 import com.iformall.mapper.WxCouponMapper;
@@ -18,22 +19,13 @@ import com.iformall.mapper.WxOrderPressMapper;
 import com.iformall.mq.MqBaseProducer;
 import com.iformall.service.WxMsgLimitService;
 import com.iformall.service.WxOrderPressService;
-import com.iformall.utils.Constant;
-import com.iformall.utils.DateUtils;
 import com.iformall.utils.PressUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
 import java.util.Date;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 @Service
 public class WxOrderPressServiceImpl implements WxOrderPressService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
index 9dd34a6db..714c5d3c5 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
@@ -1,32 +1,26 @@
 package com.iformall.service.impl;
 
-import java.math.BigDecimal;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
-import com.iformall.common.Result;
+import com.iformall.common.ErrorCode;
+import com.iformall.common.IdWorker;
+import com.iformall.common.ResultData;
+import com.iformall.domain.dto.OrderComposeSaveDto;
+import com.iformall.domain.dto.WxSharingOrderDto;
 import com.iformall.domain.po.*;
+import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.msg.*;
 import com.iformall.domain.po.tt.TtCUser;
 import com.iformall.domain.vo.*;
 import com.iformall.douyin.payv2.result.CreateOrderCallback;
 import com.iformall.enums.*;
+import com.iformall.exception.MallinkException;
 import com.iformall.mapper.*;
+import com.iformall.mq.MqBaseProducer;
 import com.iformall.service.*;
 import com.iformall.service.helper.WxOrderServiceHelper;
 import com.iformall.service.order.OrderAdapterService;
@@ -35,12 +29,8 @@ import com.iformall.service.order.entity.WxComposeChildOrderPrice;
 import com.iformall.service.order.entity.WxComposeChildOrderShare;
 import com.iformall.service.order.entity.WxComposeOrder;
 import com.iformall.service.order.util.OrderHelper;
-
 import com.iformall.service.pay.PayServiceFactory;
-import com.iformall.service.pay.entity.PayExtraParam;
-import com.iformall.service.pay.service.pay.entity.PayAdapterResult;
 import com.iformall.utils.*;
-
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -50,30 +40,19 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.iformall.common.ErrorCode;
-import com.iformall.common.IdWorker;
-import com.iformall.common.ResultData;
-import com.iformall.domain.dto.OrderComposeSaveDto;
-import com.iformall.domain.dto.OrderSaveDto;
-import com.iformall.domain.dto.PlatPushOrderSaveDto;
-import com.iformall.domain.dto.WxSharingOrderDto;
-import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.exception.MallinkException;
-import com.iformall.mq.MqBaseProducer;
-
-import static java.util.stream.Collectors.groupingBy;
-
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.lang.reflect.InvocationTargetException;
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 
 @Service
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxParkServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxParkServiceImpl.java
index 7a32afe63..e5f712525 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxParkServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxParkServiceImpl.java
@@ -1,9 +1,12 @@
 package com.iformall.service.impl;
 
-import java.util.*;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.iformall.domain.po.*;
+import com.iformall.common.IdWorker;
+import com.iformall.domain.po.WxMall;
+import com.iformall.domain.po.WxMerchant;
+import com.iformall.domain.po.WxPark;
+import com.iformall.domain.po.WxProjectConfig;
 import com.iformall.enums.EnumCarVendor;
 import com.iformall.mapper.WxMerchantMapper;
 import com.iformall.mapper.WxParkMapper;
@@ -14,9 +17,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.iformall.common.IdWorker;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
+import java.util.List;
+
 @Service
 public class WxParkServiceImpl implements WxParkService {
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountBillServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountBillServiceImpl.java
index a9a32bd27..6f5e5597b 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountBillServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountBillServiceImpl.java
@@ -4,9 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.IdWorker;
-import com.iformall.domain.po.WxPayAccount;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.WxPayAccountBill;
+import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.mapper.WxBillPropertyMapper;
 import com.iformall.mapper.WxBillRentMapper;
 import com.iformall.mapper.WxPayAccountBillMapper;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountServiceImpl.java
index 6a5ad03e9..0578fc468 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountServiceImpl.java
@@ -4,12 +4,11 @@ import com.github.binarywang.wxpay.service.WxPayService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ErrorCode;
+import com.iformall.common.IdWorker;
 import com.iformall.domain.po.WxAppinfo;
 import com.iformall.domain.po.WxPayAccount;
-import com.iformall.domain.po.WxProjectConfig;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.enums.EnumAppPlat;
-import com.iformall.enums.EnumPayWay;
 import com.iformall.exception.MallinkException;
 import com.iformall.mapper.WxPayAccountMapper;
 import com.iformall.service.WxAppinfoService;
@@ -23,7 +22,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
-import com.iformall.common.IdWorker;
 
 @Service
 public class WxPayAccountServiceImpl implements WxPayAccountService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java
index 7df0c2028..b1f118523 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java
@@ -7,17 +7,14 @@ import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
 import com.iformall.common.Result;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.WxAppinfo;
-import com.iformall.domain.po.WxBillSettle;
-import com.iformall.domain.po.WxMerchant;
-import com.iformall.domain.po.WxMerchantBUser;
-import com.iformall.domain.po.WxPayAccount;
-import com.iformall.domain.po.WxPayAccountBill;
-import com.iformall.domain.po.WxPayBill;
+import com.iformall.domain.po.*;
 import com.iformall.domain.vo.WxBillAll;
 import com.iformall.enums.*;
 import com.iformall.exception.MallinkException;
-import com.iformall.mapper.*;
+import com.iformall.mapper.WxBillAllMapper;
+import com.iformall.mapper.WxMerchantBUserMapper;
+import com.iformall.mapper.WxPayAccountBillMapper;
+import com.iformall.mapper.WxPayBillMapper;
 import com.iformall.pay.*;
 import com.iformall.service.*;
 import com.iformall.utils.*;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java
index ffc6d3001..3df03d19b 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java
@@ -12,21 +12,15 @@ import com.iformall.common.Result;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.*;
 import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.douyin.payv2.request.TtPayUnifiedOrderV2Request;
-import com.iformall.douyin.payv2.result.TtPayOrderQueryV2Result;
 import com.iformall.enums.*;
 import com.iformall.exception.MallinkException;
 import com.iformall.mapper.*;
-import com.iformall.pay.*;
 import com.iformall.service.*;
 import com.iformall.service.helper.WxOrderServiceHelper;
-import com.iformall.service.helper.WxPayOrderServiceHelper;
 import com.iformall.service.order.OrderAdapterService;
 import com.iformall.service.order.OrderFactory;
-import com.iformall.service.order.entity.WxComposeChildOrderPrice;
 import com.iformall.service.order.entity.WxComposeChildOrderShare;
 import com.iformall.service.order.entity.WxComposeOrder;
-import com.iformall.service.order.util.OrderHelper;
 import com.iformall.service.pay.PayServiceFactory;
 import com.iformall.service.pay.entity.PayExtraParam;
 import com.iformall.service.pay.service.pay.CDrivingPayService;
@@ -36,11 +30,10 @@ import com.iformall.service.pay.service.pay.entity.CreateUser;
 import com.iformall.service.pay.service.pay.entity.PayAdapterResult;
 import com.iformall.service.pay.service.pay.entity.PayQueryAdapterResult;
 import com.iformall.service.pay.service.share.PayShareAdapterService;
-import com.iformall.service.pay.service.share.entity.PayShareCalculateAmount;
 import com.iformall.service.pay.service.share.entity.ShareNotifyAdapterResult;
-import com.iformall.utils.*;
+import com.iformall.utils.HashUtil;
+import com.iformall.utils.Utility;
 import org.apache.commons.lang3.StringUtils;
-import org.flowable.job.service.JobHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.aop.framework.AopContext;
@@ -49,13 +42,10 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.text.ParseException;
 import java.util.*;
 
-import static java.util.stream.Collectors.groupingBy;
-
 @Service
 public class WxPayOrderServiceImpl implements WxPayOrderService {
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPressBatchServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPressBatchServiceImpl.java
index 35fb3635e..20c59e619 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxPressBatchServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPressBatchServiceImpl.java
@@ -8,13 +8,12 @@ import com.iformall.common.IdWorker;
 import com.iformall.common.Result;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.*;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.CouponPressBatchVo;
 import com.iformall.enums.EnumPressBatchStatus;
 import com.iformall.enums.EnumYesOrNo;
 import com.iformall.exception.MallinkException;
 import com.iformall.mapper.*;
-import com.iformall.service.*;
+import com.iformall.service.WxPressBatchService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +21,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class WxPressBatchServiceImpl implements WxPressBatchService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitPaymentReceiverServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitPaymentReceiverServiceImpl.java
index f3c94f8de..2edf90670 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitPaymentReceiverServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitPaymentReceiverServiceImpl.java
@@ -1,35 +1,33 @@
 package com.iformall.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
 import com.iformall.common.ResultData;
-import com.iformall.domain.dto.WxMerchantDto;
 import com.iformall.domain.po.*;
 import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.domain.po.msg.WxMsgRecord;
-import com.iformall.domain.vo.WxMerchantVo;
 import com.iformall.douyin.pay.DouYinPayHelper;
 import com.iformall.douyin.pay.enums.AppAddSubMerchantUrlType;
 import com.iformall.douyin.pay.orderQuery.QueryMerchantResult;
 import com.iformall.douyin.pay.preOrder.AppAddSubMerchant;
 import com.iformall.douyin.pay.preOrder.AppAddSubMerchantResult;
-import com.iformall.enums.*;
+import com.iformall.enums.EnumAppPlat;
+import com.iformall.enums.EnumProfitPaymentReceiverType;
+import com.iformall.enums.EnumProfitSharingReceiverStatus;
 import com.iformall.exception.MallinkException;
 import com.iformall.mapper.WxProfitPaymentReceiverMapper;
 import com.iformall.mapper.WxProfitSharingReceiverMapper;
 import com.iformall.mq.MqBaseProducer;
-import com.iformall.service.*;
+import com.iformall.service.WxAppinfoService;
+import com.iformall.service.WxMerchantService;
+import com.iformall.service.WxPayAccountService;
+import com.iformall.service.WxProfitPaymentReceiverService;
 import com.iformall.service.pay.PayServiceFactory;
-import com.iformall.service.pay.service.share.entity.ShareAccountResult;
 import com.iformall.utils.Constant;
-import com.iformall.utils.DateUtils;
 import com.iformall.utils.RedisCacheUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,9 +38,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 
 @Service
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java
index 0ace888d0..0f9a9f81d 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java
@@ -1,5 +1,6 @@
 package com.iformall.service.impl;
 
+import cn.afterturn.easypoi.handler.inter.IExcelExportServer;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -22,15 +23,10 @@ import com.iformall.service.*;
 import com.iformall.service.order.entity.WxComposeChildOrderShare;
 import com.iformall.service.pay.PayServiceFactory;
 import com.iformall.service.pay.service.fee.ServiceFeeAdapterService;
-import com.iformall.service.pay.service.pay.douyin.v2.miniApp.EnumTtPayChannel;
 import com.iformall.service.pay.service.share.PayShareAdapterService;
 import com.iformall.service.pay.service.share.entity.PayShareQueryResult;
 import com.iformall.service.pay.service.share.entity.PayShareResult;
 import com.iformall.utils.DateUtils;
-import com.iformall.utils.PayUtils;
-
-import cn.afterturn.easypoi.handler.inter.IExcelExportServer;
-
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,11 +36,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.math.BigDecimal;
-import java.util.*;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.util.*;
 
 
 @Service
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverApplyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverApplyServiceImpl.java
index c01096664..db6700238 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverApplyServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverApplyServiceImpl.java
@@ -3,7 +3,6 @@ package com.iformall.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.binarywang.wxpay.bean.applyment.*;
 import com.github.binarywang.wxpay.bean.applyment.enums.SalesScenesTypeEnum;
 import com.github.binarywang.wxpay.exception.WxPayException;
@@ -13,7 +12,10 @@ import com.github.pagehelper.PageInfo;
 import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.WxAppinfo;
+import com.iformall.domain.po.WxMerchant;
+import com.iformall.domain.po.WxProfitPaymentReceiver;
+import com.iformall.domain.po.WxProfitSharingReceiverApply;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.WxMerchantReceiverApplyVo;
 import com.iformall.enums.*;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java
index ef788b9cb..581eb15fd 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java
@@ -16,29 +16,18 @@ import com.iformall.domain.po.WxProfitSharingReceiver;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.msg.WxMsgRecord;
 import com.iformall.domain.vo.WxMerchantVo;
-import com.iformall.douyin.pay.DouYinPayHelper;
-import com.iformall.douyin.pay.enums.AppAddSubMerchantUrlType;
-import com.iformall.douyin.pay.orderQuery.QueryMerchantResult;
-import com.iformall.douyin.pay.preOrder.AppAddSubMerchant;
-import com.iformall.douyin.pay.preOrder.AppAddSubMerchantResult;
 import com.iformall.enums.*;
-import com.iformall.exception.MallinkException;
-import com.iformall.mapper.WxAppinfoMapper;
-import com.iformall.mapper.WxMerchantMapper;
-import com.iformall.mapper.WxPayAccountMapper;
 import com.iformall.mapper.WxProfitSharingReceiverMapper;
 import com.iformall.mq.MqBaseProducer;
-import com.iformall.pay.WxPayment;
-import com.iformall.pay.WxProfitSharing;
-import com.iformall.pay.WxProfitSharingReceiverP;
 import com.iformall.service.WxAppinfoService;
 import com.iformall.service.WxMerchantService;
 import com.iformall.service.WxPayAccountService;
 import com.iformall.service.WxProfitSharingReceiverService;
 import com.iformall.service.pay.PayServiceFactory;
 import com.iformall.service.pay.service.share.entity.ShareAccountResult;
-import com.iformall.utils.*;
-import net.sf.saxon.trans.Err;
+import com.iformall.utils.Constant;
+import com.iformall.utils.DateUtils;
+import com.iformall.utils.RedisCacheUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingResultServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingResultServiceImpl.java
index a8658f102..f1815f88d 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingResultServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingResultServiceImpl.java
@@ -2,6 +2,7 @@ package com.iformall.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.iformall.common.IdWorker;
 import com.iformall.domain.po.WxProfitSharingResult;
 import com.iformall.mapper.WxProfitSharingResultMapper;
 import com.iformall.service.WxProfitSharingResultService;
@@ -9,7 +10,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.iformall.common.IdWorker;
 
 @Service
 public class WxProfitSharingResultServiceImpl implements WxProfitSharingResultService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java
index e6aca8d0f..4ed9ff78f 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java
@@ -2,7 +2,7 @@ package com.iformall.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.iformall.domain.po.*;
-import com.iformall.mapper.*;
+import com.iformall.mapper.WxProjectConfigMapper;
 import com.iformall.service.*;
 import com.iformall.utils.Constant;
 import com.iformall.utils.RedisCacheUtils;
@@ -15,7 +15,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.List;
 
 @Service
 public class WxProjectConfigServiceImpl implements WxProjectConfigService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxQuestionOneselfServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxQuestionOneselfServiceImpl.java
index e74c4e115..6dd1031f5 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxQuestionOneselfServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxQuestionOneselfServiceImpl.java
@@ -10,7 +10,10 @@ import com.iformall.common.ResultData;
 import com.iformall.domain.po.WxCampaign;
 import com.iformall.domain.po.WxQuestionOneself;
 import com.iformall.domain.po.WxQuestionOneselfTopic;
-import com.iformall.enums.*;
+import com.iformall.enums.EnumCampaignProductType;
+import com.iformall.enums.EnumCampaignStatus;
+import com.iformall.enums.EnumCampaignType;
+import com.iformall.enums.EnumQuestionOneselfStatus;
 import com.iformall.exception.MallinkException;
 import com.iformall.mapper.WxCampaignMapper;
 import com.iformall.mapper.WxQuestionOneselfMapper;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java
index 77a917791..348a18624 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java
@@ -26,7 +26,6 @@ import com.iformall.service.pay.service.pay.entity.PayQueryAdapterResult;
 import com.iformall.service.pay.service.refund.entity.RefundAdapterResult;
 import com.iformall.service.pay.service.refund.entity.RefundNotifyAdapterResult;
 import com.iformall.utils.DateUtils;
-import com.iformall.utils.PayUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
index 35a94a337..36dee1367 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
@@ -28,10 +28,6 @@ import org.apache.shiro.SecurityUtils;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.TaskService;
 import org.flowable.task.api.Task;
-import org.joda.time.DateTime;
-import org.joda.time.Months;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java
index 5147c1370..4f14ce513 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java
@@ -1,6 +1,5 @@
 package com.iformall.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
@@ -12,9 +11,7 @@ import com.iformall.domain.vo.WxRentPropertyContractVo;
 import com.iformall.enums.EnumContract;
 import com.iformall.enums.EnumContractOperationType;
 import com.iformall.enums.EnumContractType;
-import com.iformall.enums.EnumFlowRecordStatus;
 import com.iformall.enums.EnumRentShopType;
-import com.iformall.exception.MallinkException;
 import com.iformall.mapper.WxPropertyContractMapper;
 import com.iformall.mapper.WxRentContractMapper;
 import com.iformall.service.WxFlowRecordService;
@@ -25,7 +22,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreHistoryServiceImpl.java
index 34dcd747b..f1e231096 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreHistoryServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreHistoryServiceImpl.java
@@ -2,6 +2,7 @@ package com.iformall.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.iformall.common.IdWorker;
 import com.iformall.domain.po.WxScoreHistory;
 import com.iformall.mapper.WxScoreHistoryMapper;
 import com.iformall.service.WxScoreHistoryService;
@@ -9,7 +10,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.iformall.common.IdWorker;
 
 import java.util.Date;
 
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java
index ed4dac4d1..8820c6dce 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java
@@ -1,11 +1,9 @@
 package com.iformall.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
-import com.iformall.common.ResultData;
 import com.iformall.common.SysConfigConstant;
 import com.iformall.domain.po.*;
 import com.iformall.domain.po.base.TenantEntity;
@@ -14,7 +12,6 @@ import com.iformall.exception.MallinkException;
 import com.iformall.mapper.*;
 import com.iformall.service.*;
 import com.iformall.utils.Constant;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,11 +20,7 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 public class WxScoreRulesServiceImpl implements WxScoreRulesService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java
index 4e978e2f0..a41a6b727 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java
@@ -1,29 +1,25 @@
 package com.iformall.service.impl;
 
-import cn.binarywang.wx.miniapp.api.WxMaService;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
-
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.WxCampaign;
+import com.iformall.domain.po.WxCouponChannel;
+import com.iformall.domain.po.WxMerchant;
+import com.iformall.domain.po.WxScreenAd;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.WxCouponCVo;
 import com.iformall.enums.EnumCouponChannelStatus;
-import com.iformall.enums.EnumCouponChannelType;
 import com.iformall.enums.EnumScreenAdType;
 import com.iformall.mapper.WxCampaignMapper;
-import com.iformall.mapper.WxCouponChannelMapper;
 import com.iformall.mapper.WxScreenAdMapper;
 import com.iformall.service.WxAppinfoService;
 import com.iformall.service.WxCouponChannelService;
 import com.iformall.service.WxMerchantService;
 import com.iformall.service.WxScreenAdService;
-import com.iformall.service.wechat.FmOpenService;
-import com.iformall.utils.MaUtil;
-import me.chanjar.weixin.common.error.WxErrorException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java
index 03758d5c7..5462cd159 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java
@@ -1,28 +1,5 @@
 package com.iformall.service.impl;
 
-import java.io.Serializable;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.iformall.mapper.*;
-import com.iformall.service.*;
-import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -30,20 +7,30 @@ import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
 import com.iformall.common.Result;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.WxBrand;
-import com.iformall.domain.po.WxBusiness;
-import com.iformall.domain.po.WxMerchant;
-import com.iformall.domain.po.WxMerchantShop;
-import com.iformall.domain.po.WxRentContract;
-import com.iformall.domain.po.WxShop;
+import com.iformall.domain.po.*;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.WxNotRentShopVo;
 import com.iformall.domain.vo.WxShopVo;
-import com.iformall.enums.EnumDelStatus;
-import com.iformall.enums.EnumRentContractStatus;
-import com.iformall.enums.EnumRentShopType;
-import com.iformall.enums.EnumShopStatus;
-import com.iformall.enums.EnumUserAdmin;
+import com.iformall.enums.*;
+import com.iformall.mapper.WxMerchantMapper;
+import com.iformall.mapper.WxMerchantShopMapper;
+import com.iformall.mapper.WxRentContractMapper;
+import com.iformall.mapper.WxShopMapper;
+import com.iformall.service.*;
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.Serializable;
+import java.lang.reflect.InvocationTargetException;
+import java.util.*;
 
 @Service
 public class WxShopServiceImpl implements WxShopService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxSubsidyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxSubsidyServiceImpl.java
index 863094885..783e9df31 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxSubsidyServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxSubsidyServiceImpl.java
@@ -4,36 +4,17 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.iformall.common.ErrorCode;
-import com.iformall.common.Result;
-import com.iformall.common.ResultData;
-import com.iformall.domain.po.*;
-import com.iformall.enums.EnumPayShare;
-import com.iformall.enums.EnumPayStatus;
-import com.iformall.enums.EnumPayWay;
-import com.iformall.exception.MallinkException;
+import com.iformall.common.IdWorker;
+import com.iformall.domain.po.WxSubsidy;
 import com.iformall.mapper.WxAppinfoMapper;
 import com.iformall.mapper.WxPayAccountMapper;
 import com.iformall.mapper.WxSubsidyMapper;
-import com.iformall.pay.WxNativePayOrderSP;
-import com.iformall.pay.WxPay;
-import com.iformall.pay.WxPayment;
 import com.iformall.service.WxAppinfoService;
 import com.iformall.service.WxSubsidyService;
-import com.iformall.utils.BeanUtils;
-import com.iformall.utils.PayUtils;
-import com.iformall.utils.Utility;
-import com.iformall.utils.XmlUtil;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.iformall.common.IdWorker;
-
-import java.math.BigDecimal;
-import java.text.ParseException;
-import java.util.*;
 
 @Service
 public class WxSubsidyServiceImpl implements WxSubsidyService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTagsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTagsServiceImpl.java
index ce9aaa7c2..dfa525c54 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxTagsServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTagsServiceImpl.java
@@ -1,8 +1,8 @@
 package com.iformall.service.impl;
 
-import java.util.*;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.iformall.common.IdWorker;
 import com.iformall.domain.po.WxTags;
 import com.iformall.domain.po.WxTagsGroup;
 import com.iformall.domain.po.WxTagsType;
@@ -18,7 +18,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.iformall.common.IdWorker;
+
+import java.util.ArrayList;
+import java.util.List;
 
 @Service
 public class WxTagsServiceImpl implements WxTagsService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java
index 185c1c96b..18af7540e 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java
@@ -4,14 +4,12 @@ import cn.binarywang.wx.miniapp.api.WxMaService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.google.common.collect.Lists;
 import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.WxAppinfo;
 import com.iformall.domain.po.WxTemplateMsg;
 import com.iformall.enums.EnumAppPlat;
-import com.iformall.enums.EnumPayWay;
 import com.iformall.enums.EnumTemplateType;
 import com.iformall.enums.EnumYesOrNo;
 import com.iformall.mapper.WxTemplateMsgMapper;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyApiServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyApiServiceImpl.java
index 00ba72c95..3cc7ae451 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyApiServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyApiServiceImpl.java
@@ -1,7 +1,6 @@
 package com.iformall.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.iformall.domain.po.WxAppinfo;
 import com.iformall.domain.po.WxThirdPartyApi;
 import com.iformall.mapper.WxThirdPartyApiMapper;
 import com.iformall.service.WxThirdPartyApiService;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java
index 768ab1d60..21b73bf21 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java
@@ -27,7 +27,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 @Service
 public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java
index 9790f660c..70e4d12c0 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java
@@ -6,6 +6,7 @@ import com.github.pagehelper.PageInfo;
 import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
 import com.iformall.common.Result;
+import com.iformall.common.ResultData;
 import com.iformall.domain.po.WxCoupon;
 import com.iformall.domain.po.WxCouponChannel;
 import com.iformall.domain.po.WxTopic;
@@ -19,12 +20,9 @@ import com.iformall.mapper.WxTopicMapper;
 import com.iformall.service.QrCodeService;
 import com.iformall.service.WxCouponChannelService;
 import com.iformall.service.WxTopicService;
-import com.iformall.utils.Constant;
-import com.iformall.utils.DateUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import com.iformall.common.ResultData;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -32,7 +30,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author luozukai ^_^
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxUserChannelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxUserChannelServiceImpl.java
index 06b13b278..eaacdf760 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxUserChannelServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxUserChannelServiceImpl.java
@@ -1,8 +1,8 @@
 package com.iformall.service.impl;
 
-import java.util.*;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.iformall.common.IdWorker;
 import com.iformall.domain.po.WxUserChannel;
 import com.iformall.mapper.WxUserChannelMapper;
 import com.iformall.service.WxUserChannelService;
@@ -10,7 +10,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.iformall.common.IdWorker;
+
+import java.util.List;
 
 @Service
 public class WxUserChannelServiceImpl implements WxUserChannelService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxUserVisitServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxUserVisitServiceImpl.java
index 26804a6a8..5fe0d6f8e 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxUserVisitServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxUserVisitServiceImpl.java
@@ -1,8 +1,8 @@
 package com.iformall.service.impl;
 
-import java.util.*;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.iformall.common.IdWorker;
 import com.iformall.domain.dto.MarkingCouponDataReportDto;
 import com.iformall.domain.po.WxUserVisit;
 import com.iformall.domain.vo.TouchUsersReportVo;
@@ -14,7 +14,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.iformall.common.IdWorker;
+
+import java.util.List;
 
 @Service
 public class WxUserVisitServiceImpl implements WxUserVisitService {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxWiWideInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxWiWideInfoServiceImpl.java
index c2b21983a..cb6d4d342 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxWiWideInfoServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxWiWideInfoServiceImpl.java
@@ -10,8 +10,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 @Service
 public class WxWiWideInfoServiceImpl implements WxWiWideInfoService {
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
diff --git a/mallinkService/src/main/java/com/iformall/service/invest/InvestHelper.java b/mallinkService/src/main/java/com/iformall/service/invest/InvestHelper.java
index a064f9083..f591c0ba2 100644
--- a/mallinkService/src/main/java/com/iformall/service/invest/InvestHelper.java
+++ b/mallinkService/src/main/java/com/iformall/service/invest/InvestHelper.java
@@ -2,7 +2,6 @@ package com.iformall.service.invest;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.Multimaps;
@@ -10,20 +9,19 @@ import com.iformall.common.ErrorCode;
 import com.iformall.domain.po.invest.InvestBaseEntity;
 import com.iformall.domain.po.invest.InvestTaskEntity;
 import com.iformall.domain.vo.invest.InvestPageQuery;
-import com.iformall.domain.vo.invest.InvestUserContext;
 import com.iformall.enums.EnumTaskStatus;
 import com.iformall.exception.MallinkException;
 import com.iformall.utils.JsonUtil;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.lang.reflect.Method;
 import java.text.MessageFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
diff --git a/mallinkService/src/main/java/com/iformall/service/invest/InvestMessageService.java b/mallinkService/src/main/java/com/iformall/service/invest/InvestMessageService.java
index af4c66619..bce25cca4 100755
--- a/mallinkService/src/main/java/com/iformall/service/invest/InvestMessageService.java
+++ b/mallinkService/src/main/java/com/iformall/service/invest/InvestMessageService.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.iformall.domain.po.invest.InvestMessageEntity;
 import com.iformall.enums.EnumFollowType;
 import com.iformall.enums.EnumInvestMessageTag;
-import com.iformall.enums.EnumInvestMessageType;
 
 import java.util.List;
 
diff --git a/mallinkService/src/main/java/com/iformall/service/invest/InvestOperateRecordService.java b/mallinkService/src/main/java/com/iformall/service/invest/InvestOperateRecordService.java
index dc1faa4d4..9d27c07b5 100755
--- a/mallinkService/src/main/java/com/iformall/service/invest/InvestOperateRecordService.java
+++ b/mallinkService/src/main/java/com/iformall/service/invest/InvestOperateRecordService.java
@@ -6,8 +6,6 @@ import com.iformall.domain.vo.invest.InvestOperateRecordQuery;
 import com.iformall.domain.vo.invest.InvestPageQuery;
 import com.iformall.domain.vo.invest.InvestPageResult;
 
-import java.util.List;
-
 /**
  * 操作记录
  *
diff --git a/mallinkService/src/main/java/com/iformall/service/invest/event/InvestListener.java b/mallinkService/src/main/java/com/iformall/service/invest/event/InvestListener.java
index 6dec918fa..9c55cca28 100644
--- a/mallinkService/src/main/java/com/iformall/service/invest/event/InvestListener.java
+++ b/mallinkService/src/main/java/com/iformall/service/invest/event/InvestListener.java
@@ -9,7 +9,6 @@ import com.iformall.enums.EnumRentContractStatus;
 import com.iformall.enums.EnumTaskStatus;
 import com.iformall.service.invest.InvestHelper;
 import com.iformall.service.invest.InvestTaskService;
-import com.iformall.utils.JsonUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,8 +16,6 @@ import org.springframework.context.ApplicationListener;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
-import java.util.Map;
-import java.util.Objects;
 
 @Slf4j
 @Component
diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java
index ba7cae3ed..af365c90a 100644
--- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java
@@ -8,13 +8,18 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.iformall.common.ErrorCode;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.MallUserInfo;
+import com.iformall.domain.po.WxBrand;
+import com.iformall.domain.po.WxBusiness;
+import com.iformall.domain.po.WxShop;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.invest.*;
 import com.iformall.domain.vo.invest.InvestPageQuery;
 import com.iformall.domain.vo.invest.InvestPageResult;
 import com.iformall.domain.vo.invest.InvestUserContext;
-import com.iformall.enums.*;
+import com.iformall.enums.EnumFollowType;
+import com.iformall.enums.EnumInvestMessageTag;
+import com.iformall.enums.EnumInvestType;
 import com.iformall.exception.MallinkException;
 import com.iformall.service.MallUserInfoService;
 import com.iformall.service.WxBrandService;
diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestCustomerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestCustomerServiceImpl.java
index 848c41613..17715e011 100755
--- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestCustomerServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestCustomerServiceImpl.java
@@ -3,7 +3,6 @@ package com.iformall.service.invest.impl;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.iformall.common.ErrorCode;
 import com.iformall.common.TableLog;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.invest.InvestCustomerEntity;
 import com.iformall.domain.vo.invest.InvestCustomerVo;
 import com.iformall.enums.EnumCustomerType;
diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestDemandServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestDemandServiceImpl.java
index dbc0ba1c1..9ff24c8a3 100755
--- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestDemandServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestDemandServiceImpl.java
@@ -12,7 +12,7 @@ import com.iformall.service.invest.InvestDemandService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.Objects;
 
 
 @Service
diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java
index 7cdd1ad5d..84d998705 100755
--- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java
@@ -3,8 +3,6 @@ package com.iformall.service.invest.impl;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.iformall.common.ErrorCode;
 import com.iformall.domain.po.invest.InvestTaskEntity;
 import com.iformall.enums.EnumFollowType;
 import com.iformall.enums.EnumInvestMessageTag;
@@ -19,7 +17,9 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
 
 
 @Service
diff --git a/mallinkService/src/main/java/com/iformall/service/kw/KwBoxCmdHistoryService.java b/mallinkService/src/main/java/com/iformall/service/kw/KwBoxCmdHistoryService.java
index c2d817a48..6a58cf9aa 100644
--- a/mallinkService/src/main/java/com/iformall/service/kw/KwBoxCmdHistoryService.java
+++ b/mallinkService/src/main/java/com/iformall/service/kw/KwBoxCmdHistoryService.java
@@ -2,7 +2,6 @@ package com.iformall.service.kw;
 
 
 import com.github.pagehelper.PageInfo;
-import com.iformall.common.ResultData;
 import com.iformall.domain.po.KwBoxCmdHistory;
 
 import java.util.List;
diff --git a/mallinkService/src/main/java/com/iformall/service/kw/KwBoxService.java b/mallinkService/src/main/java/com/iformall/service/kw/KwBoxService.java
index c40738eae..05c65162b 100644
--- a/mallinkService/src/main/java/com/iformall/service/kw/KwBoxService.java
+++ b/mallinkService/src/main/java/com/iformall/service/kw/KwBoxService.java
@@ -2,11 +2,8 @@ package com.iformall.service.kw;
 
 
 import com.github.pagehelper.PageInfo;
-import com.iformall.common.ResultData;
 import com.iformall.domain.po.KwBox;
 import com.iformall.domain.po.KwMeter;
-import com.iformall.domain.po.KwMeterData;
-
 
 import java.util.Date;
 import java.util.List;
diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxCmdHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxCmdHistoryServiceImpl.java
index 32655deab..61255bc01 100644
--- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxCmdHistoryServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxCmdHistoryServiceImpl.java
@@ -3,9 +3,7 @@ package com.iformall.service.kw.impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.IdWorker;
-import com.iformall.common.ResultData;
 import com.iformall.domain.po.KwBoxCmdHistory;
-import com.iformall.domain.po.KwMeter;
 import com.iformall.mapper.KwBoxCmdHistoryMapper;
 import com.iformall.service.kw.KwBoxCmdHistoryService;
 import org.slf4j.Logger;
diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java
index d481e45a9..d51038fa5 100644
--- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java
@@ -3,19 +3,18 @@ package com.iformall.service.kw.impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.IdWorker;
-import com.iformall.common.ResultData;
-
 import com.iformall.domain.po.KwBox;
 import com.iformall.domain.po.KwMeter;
 import com.iformall.domain.po.KwMeterData;
-import com.iformall.enums.*;
+import com.iformall.enums.EnumBoxStatus;
+import com.iformall.enums.EnumMeterBindStatus;
+import com.iformall.enums.EnumMeterStatus;
 import com.iformall.mapper.KwBoxMapper;
 import com.iformall.mapper.KwMeterMapper;
 import com.iformall.service.kw.KwBoxService;
 import com.iformall.service.kw.KwMeterDataService;
 import com.iformall.service.kw.KwMeterService;
 import io.netty.util.internal.StringUtil;
-import org.apache.rocketmq.common.filter.impl.Op;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterDataServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterDataServiceImpl.java
index 34600bcd5..65dedef2e 100644
--- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterDataServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterDataServiceImpl.java
@@ -3,8 +3,8 @@ package com.iformall.service.kw.impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.iformall.domain.dto.KwMeterDataDto;
-import com.iformall.domain.po.base.BaseEntity;
 import com.iformall.domain.po.KwMeterData;
+import com.iformall.domain.po.base.BaseEntity;
 import com.iformall.domain.vo.KwMeterDataVo;
 import com.iformall.enums.EnumMeterStatus;
 import com.iformall.mapper.KwMeterDataMapper;
diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/AfterAddCreditMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/AfterAddCreditMsgServiceImpl.java
index 16c093ad1..63c09ff4b 100644
--- a/mallinkService/src/main/java/com/iformall/service/msg/impl/AfterAddCreditMsgServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/AfterAddCreditMsgServiceImpl.java
@@ -1,26 +1,24 @@
 package com.iformall.service.msg.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.*;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.msg.AfterAddCreditMsg;
-import com.iformall.domain.po.msg.AppUniformMsg;
 import com.iformall.domain.po.msg.BaseMsg;
 import com.iformall.enums.EnumAppPlat;
 import com.iformall.enums.EnumBusinessType;
 import com.iformall.enums.EnumMemberCardStatus;
-import com.iformall.mapper.*;
+import com.iformall.mapper.WxCUserBasicInfoMapper;
+import com.iformall.mapper.WxCUserMapper;
+import com.iformall.mapper.WxCreditHistoryMapper;
+import com.iformall.mapper.WxMemberCardMapper;
 import com.iformall.service.*;
 import com.iformall.service.msg.MsgSendService;
-import com.iformall.service.wechat.FmOpenService;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/AfterAddScoreMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/AfterAddScoreMsgServiceImpl.java
index b7550c45d..7837c85df 100644
--- a/mallinkService/src/main/java/com/iformall/service/msg/impl/AfterAddScoreMsgServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/AfterAddScoreMsgServiceImpl.java
@@ -2,18 +2,14 @@ package com.iformall.service.msg.impl;
 
 import com.iformall.domain.po.WxAppinfo;
 import com.iformall.domain.po.WxPayAccount;
-import com.iformall.domain.po.WxTemplateMsg;
 import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.domain.po.msg.AfterAddCreditMsg;
 import com.iformall.domain.po.msg.AfterAddScoreMsg;
 import com.iformall.domain.po.msg.BaseMsg;
 import com.iformall.enums.EnumAppPlat;
 import com.iformall.enums.EnumBusinessType;
-import com.iformall.mapper.WxAppinfoMapper;
 import com.iformall.service.WxAppinfoService;
 import com.iformall.service.WxPayAccountService;
 import com.iformall.service.msg.MsgSendService;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/AfterBusinessCreditMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/AfterBusinessCreditMsgServiceImpl.java
index 71fa9556a..11642785d 100644
--- a/mallinkService/src/main/java/com/iformall/service/msg/impl/AfterBusinessCreditMsgServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/AfterBusinessCreditMsgServiceImpl.java
@@ -1,23 +1,11 @@
 package com.iformall.service.msg.impl;
 
-import com.iformall.common.ResultData;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.WxBusinessCircleOrder;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.msg.AfterBusinessCreditMsg;
-import com.iformall.domain.po.msg.AfterCarInOutMsg;
 import com.iformall.domain.po.msg.BaseMsg;
-import com.iformall.enums.EnumAppPlat;
-import com.iformall.enums.EnumBusinessType;
-import com.iformall.enums.EnumCarCmd;
-import com.iformall.mapper.WxCUserMapper;
-import com.iformall.mapper.WxCarCmdLogMapper;
-import com.iformall.pay.WxPayConstant;
-import com.iformall.service.WxAppinfoService;
 import com.iformall.service.WxBusinessCircleOrderService;
-import com.iformall.service.WxCUserCarService;
-import com.iformall.service.WxPayAccountService;
 import com.iformall.service.msg.MsgSendService;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/AfterCarInOutMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/AfterCarInOutMsgServiceImpl.java
index a70a7a7f1..a5f708629 100644
--- a/mallinkService/src/main/java/com/iformall/service/msg/impl/AfterCarInOutMsgServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/AfterCarInOutMsgServiceImpl.java
@@ -1,19 +1,23 @@
 package com.iformall.service.msg.impl;
 
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.WxAppinfo;
+import com.iformall.domain.po.WxCUserCar;
+import com.iformall.domain.po.WxCarCmdLog;
+import com.iformall.domain.po.WxPayAccount;
 import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.domain.po.msg.AfterAddScoreMsg;
 import com.iformall.domain.po.msg.AfterCarInOutMsg;
 import com.iformall.domain.po.msg.BaseMsg;
 import com.iformall.enums.EnumAppPlat;
 import com.iformall.enums.EnumBusinessType;
 import com.iformall.enums.EnumCarCmd;
-import com.iformall.mapper.WxAppinfoMapper;
 import com.iformall.mapper.WxCUserMapper;
 import com.iformall.mapper.WxCarCmdLogMapper;
 import com.iformall.pay.WxPayConstant;
-import com.iformall.service.*;
+import com.iformall.service.WxAppinfoService;
+import com.iformall.service.WxBusinessCircleOrderService;
+import com.iformall.service.WxCUserCarService;
+import com.iformall.service.WxPayAccountService;
 import com.iformall.service.msg.MsgSendService;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCLoginMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCLoginMsgServiceImpl.java
index e88503577..842473822 100644
--- a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCLoginMsgServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCLoginMsgServiceImpl.java
@@ -1,17 +1,14 @@
 package com.iformall.service.msg.impl;
 
 import com.iformall.common.ErrorCode;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.CUser;
+import com.iformall.domain.po.WxCUserFrom;
 import com.iformall.domain.po.msg.BaseMsg;
 import com.iformall.domain.po.msg.FmInsideCLoginMsg;
-import com.iformall.domain.po.msg.FmInsideCouponVerifyMsg;
 import com.iformall.enums.EnumAppPlat;
-import com.iformall.enums.EnumAssignTagsTrigger;
 import com.iformall.enums.EnumCUserFrom;
-import com.iformall.enums.EnumScoreType;
 import com.iformall.exception.MallinkException;
-import com.iformall.service.*;
-import com.iformall.service.cuser.BasicCUserService;
+import com.iformall.service.WxCUserFromService;
 import com.iformall.service.cuser.CUserServiceFactory;
 import com.iformall.service.msg.MsgSendService;
 import org.slf4j.Logger;
@@ -19,8 +16,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
-
 /**
  *
  * @author Stormeye Wu
diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCouponVerifyMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCouponVerifyMsgServiceImpl.java
index dfa0c1cc2..50b975025 100644
--- a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCouponVerifyMsgServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCouponVerifyMsgServiceImpl.java
@@ -1,11 +1,11 @@
 package com.iformall.service.msg.impl;
 
 import com.iformall.common.ErrorCode;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.WxCouponOrder;
+import com.iformall.domain.po.WxMerchant;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.msg.BaseMsg;
 import com.iformall.domain.po.msg.FmInsideCouponVerifyMsg;
-import com.iformall.enums.EnumCouponOrderStatus;
 import com.iformall.exception.MallinkException;
 import com.iformall.service.*;
 import com.iformall.service.msg.MsgSendService;
diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideNotifyCarPaidSuccessMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideNotifyCarPaidSuccessMsgServiceImpl.java
index e8b7e4a46..e2d7bb0c2 100644
--- a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideNotifyCarPaidSuccessMsgServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideNotifyCarPaidSuccessMsgServiceImpl.java
@@ -3,13 +3,8 @@ package com.iformall.service.msg.impl;
 import com.alibaba.fastjson.JSON;
 import com.iformall.domain.po.msg.BaseMsg;
 import com.iformall.domain.po.msg.FmInsideNotifyCarPaidSuccessMsg;
-import com.iformall.domain.po.msg.FmInsideNotifyRefundSuccessMsg;
-import com.iformall.enums.EnumPayVersion;
-import com.iformall.enums.EnumPayWay;
-import com.iformall.service.WxRefundOrderService;
 import com.iformall.service.msg.MsgSendService;
 import com.iformall.service.park.pay.WxParkPayService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideNotifyPaySuccessMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideNotifyPaySuccessMsgServiceImpl.java
index d68dbd5a6..1faf7c64e 100644
--- a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideNotifyPaySuccessMsgServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideNotifyPaySuccessMsgServiceImpl.java
@@ -1,18 +1,5 @@
 package com.iformall.service.msg.impl;
 
-import com.alibaba.fastjson.JSON;
-import com.iformall.domain.po.msg.BaseMsg;
-import com.iformall.domain.po.msg.FmInsideNotifyPaySuccessMsg;
-import com.iformall.enums.EnumPayWay;
-import com.iformall.service.WxPayOrderService;
-import com.iformall.service.msg.MsgSendService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-
 /**
  *
  * @author Stormeye Wu
diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderPushDeliveryMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderPushDeliveryMsgServiceImpl.java
index 478745140..af56449dc 100644
--- a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderPushDeliveryMsgServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderPushDeliveryMsgServiceImpl.java
@@ -1,23 +1,22 @@
 package com.iformall.service.msg.impl;
 
-import com.alibaba.fastjson.JSONObject;
 import com.iformall.common.ErrorCode;
-import com.iformall.common.ResultData;
 import com.iformall.domain.po.*;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.msg.BaseMsg;
 import com.iformall.domain.po.msg.FmInsideOrderPushMsg;
-import com.iformall.domain.vo.WxOrderCouponVo;
-import com.iformall.douyin.pay.TtPayService;
-import com.iformall.douyin.payv2.request.TtOrderPushDeliveryRequest;
-import com.iformall.enums.*;
+import com.iformall.enums.EnumCouponOrderStatus;
+import com.iformall.enums.EnumMsgRecordType;
+import com.iformall.enums.EnumPayWay;
+import com.iformall.enums.EnumThirdPartyConfigType;
 import com.iformall.exception.MallinkException;
-import com.iformall.mapper.*;
+import com.iformall.mapper.TtMerchantPoiMapper;
+import com.iformall.mapper.WxCUserBasicInfoMapper;
+import com.iformall.mapper.WxCouponMapper;
 import com.iformall.service.*;
 import com.iformall.service.msg.MsgSendService;
 import com.iformall.service.pay.PayServiceFactory;
 import com.iformall.service.pay.service.pay.PayAdapterService;
-import com.iformall.service.pay.service.pay.entity.PayAdapterResult;
 import com.iformall.utils.MaUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -25,10 +24,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
 /**
  *
  * @author Stormeye Wu
diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderPushMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderPushMsgServiceImpl.java
index e79d97940..eef0d0bda 100644
--- a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderPushMsgServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderPushMsgServiceImpl.java
@@ -1,30 +1,32 @@
 package com.iformall.service.msg.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.iformall.common.ErrorCode;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.WxBatchOrder;
+import com.iformall.domain.po.WxCUserBasicInfo;
+import com.iformall.domain.po.WxPayOrder;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.msg.BaseMsg;
 import com.iformall.domain.po.msg.FmInsideOrderPushMsg;
 import com.iformall.domain.vo.WxOrderCouponVo;
-import com.iformall.enums.*;
+import com.iformall.enums.EnumComposeOrder;
+import com.iformall.enums.EnumMsgRecordType;
+import com.iformall.enums.EnumPayWay;
+import com.iformall.enums.EnumThirdPartyConfigType;
 import com.iformall.exception.MallinkException;
-import com.iformall.mapper.*;
+import com.iformall.mapper.TtCUserMapper;
+import com.iformall.mapper.TtMerchantPoiMapper;
+import com.iformall.mapper.WxCUserBasicInfoMapper;
+import com.iformall.mapper.WxPayOrderMapper;
 import com.iformall.service.*;
 import com.iformall.service.msg.MsgSendService;
 import com.iformall.service.pay.PayServiceFactory;
-import com.iformall.service.pay.service.pay.entity.PayAdapterResult;
-import com.iformall.utils.DateUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
-import java.util.List;
-
 /**
  *
  * @author Stormeye Wu
diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderRefundMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderRefundMsgServiceImpl.java
index 2d93dabd5..c10926e35 100644
--- a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderRefundMsgServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderRefundMsgServiceImpl.java
@@ -1,12 +1,14 @@
 package com.iformall.service.msg.impl;
 
 import com.iformall.common.ErrorCode;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.WxCUserBasicInfo;
+import com.iformall.domain.po.WxOrder;
 import com.iformall.domain.po.msg.BaseMsg;
 import com.iformall.domain.po.msg.FmInsideOrderRefundMsg;
-import com.iformall.domain.po.msg.FmInsideOrderSuccessMsg;
 import com.iformall.exception.MallinkException;
-import com.iformall.service.*;
+import com.iformall.service.WxCUserBasicInfoService;
+import com.iformall.service.WxOrderService;
+import com.iformall.service.WxRefundOrderService;
 import com.iformall.service.msg.MsgSendService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideProductPushMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideProductPushMsgServiceImpl.java
index 3d60bcaca..47a88826e 100644
--- a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideProductPushMsgServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideProductPushMsgServiceImpl.java
@@ -1,9 +1,6 @@
 package com.iformall.service.msg.impl;
 
-import com.iformall.common.ErrorCode;
-import com.iformall.common.ResultData;
 import com.iformall.domain.po.TtCouponChannelPoi;
-import com.iformall.domain.po.WxMallVersion;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.msg.BaseMsg;
 import com.iformall.domain.po.msg.FmInsideProductPushMsg;
@@ -12,7 +9,6 @@ import com.iformall.enums.EnumPushType;
 import com.iformall.enums.EnumSpuSyncStatus;
 import com.iformall.mapper.TtCouponChannelPoiMapper;
 import com.iformall.service.TtCouponGoodsService;
-import com.iformall.service.TtGoodsCategoryService;
 import com.iformall.service.TtMerchantPoiService;
 import com.iformall.service.WxMallService;
 import com.iformall.service.msg.MsgSendService;
diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java
index 6c7ee9b16..55ae2fee3 100644
--- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java
@@ -2,8 +2,8 @@ package com.iformall.service.msg.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.iformall.common.ErrorCode;
-import com.iformall.common.IdWorker;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.WxMsgConfig;
+import com.iformall.domain.po.WxMsgModel;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.msg.BaseMsg;
 import com.iformall.domain.po.msg.WxMsg;
@@ -13,15 +13,15 @@ import com.iformall.enums.EnumVerifyCode;
 import com.iformall.exception.MallinkException;
 import com.iformall.mapper.*;
 import com.iformall.service.WxMsgLimitService;
-import com.iformall.service.msg.MsgSendService;
 import com.iformall.service.WxMsgService;
 import com.iformall.service.WxMsgValidationcodeService;
+import com.iformall.service.msg.MsgSendService;
 import com.iformall.sms.SMSFactory;
-import com.iformall.utils.DateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import java.util.List;
 
 /**
diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java
index a4d7a1521..0296e2a9f 100644
--- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java
@@ -19,6 +19,7 @@ import org.springframework.mail.SimpleMailMessage;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.stereotype.Service;
+
 import javax.mail.internet.MimeMessage;
 import java.io.File;
 import java.util.List;
diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendMpMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendMpMsgServiceImpl.java
index d00cce2d7..e2677853c 100644
--- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendMpMsgServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendMpMsgServiceImpl.java
@@ -1,11 +1,8 @@
 package com.iformall.service.msg.impl;
 
-import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage;
-import cn.binarywang.wx.miniapp.constant.WxMaConstants;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.iformall.domain.po.WxTemplateMsg;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.msg.BaseMsg;
diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java
index fca924460..53731ea52 100644
--- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java
@@ -6,7 +6,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils;
 import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.WxMsgConfig;
+import com.iformall.domain.po.WxMsgValidationcode;
+import com.iformall.domain.po.WxMsgValidationcodeModel;
+import com.iformall.domain.po.WxMsgValidationcodeModelTenant;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.msg.BaseMsg;
 import com.iformall.domain.po.msg.WxMsgRecord;
@@ -17,14 +20,15 @@ import com.iformall.mapper.WxMsgConfigMapper;
 import com.iformall.mapper.WxMsgValidationcodeMapper;
 import com.iformall.mapper.WxMsgValidationcodeModelMapper;
 import com.iformall.mapper.WxMsgValidationcodeModelTenantMapper;
-import com.iformall.service.msg.MsgSendService;
 import com.iformall.service.WxMsgValidationcodeService;
+import com.iformall.service.msg.MsgSendService;
 import com.iformall.sms.SMSFactory;
 import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendWeappUniformMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendWeappUniformMsgServiceImpl.java
index 6a7a9f307..cf0ea9af8 100644
--- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendWeappUniformMsgServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendWeappUniformMsgServiceImpl.java
@@ -7,16 +7,13 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.iformall.domain.po.WxAppinfo;
 import com.iformall.domain.po.WxTemplateMsg;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.msg.AppUniformMsg;
 import com.iformall.domain.po.msg.BaseMsg;
 import com.iformall.mapper.WxAppinfoMapper;
 import com.iformall.mapper.WxTemplateMsgMapper;
 import com.iformall.service.msg.MsgSendService;
 import com.iformall.service.wechat.FmOpenService;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/UpdateCouponStockMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/UpdateCouponStockMsgServiceImpl.java
index 5714748c3..0e53d0f3e 100644
--- a/mallinkService/src/main/java/com/iformall/service/msg/impl/UpdateCouponStockMsgServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/UpdateCouponStockMsgServiceImpl.java
@@ -1,15 +1,13 @@
 package com.iformall.service.msg.impl;
 
+import com.iformall.domain.po.msg.BaseMsg;
+import com.iformall.service.WxCouponService;
+import com.iformall.service.msg.MsgSendService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.iformall.domain.po.msg.BaseMsg;
-import com.iformall.enums.EnumPayWay;
-import com.iformall.service.WxCouponService;
-import com.iformall.service.msg.MsgSendService;
-
 /**
  *
  * @author Stormeye Wu
diff --git a/mallinkService/src/main/java/com/iformall/service/order/OrderAdapterService.java b/mallinkService/src/main/java/com/iformall/service/order/OrderAdapterService.java
index f2e95f83b..a20f0f8de 100644
--- a/mallinkService/src/main/java/com/iformall/service/order/OrderAdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/order/OrderAdapterService.java
@@ -1,10 +1,6 @@
 package com.iformall.service.order;
 
-import java.util.Date;
-import java.util.List;
-
 import com.iformall.domain.dto.OrderComposeSaveDto;
-import com.iformall.domain.dto.PlatPushOrderSaveDto;
 import com.iformall.domain.po.*;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.enums.EnumPayVersion;
@@ -12,6 +8,8 @@ import com.iformall.enums.EnumPayWay;
 import com.iformall.service.order.entity.WxComposeChildOrderPrice;
 import com.iformall.service.order.entity.WxComposeOrder;
 
+import java.util.List;
+
 public interface OrderAdapterService {
 
 	/**
diff --git a/mallinkService/src/main/java/com/iformall/service/order/OrderFactory.java b/mallinkService/src/main/java/com/iformall/service/order/OrderFactory.java
index 65e9326cb..17f91d9c3 100644
--- a/mallinkService/src/main/java/com/iformall/service/order/OrderFactory.java
+++ b/mallinkService/src/main/java/com/iformall/service/order/OrderFactory.java
@@ -1,13 +1,12 @@
 package com.iformall.service.order;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.iformall.enums.EnumComposeOrder;
 import com.iformall.service.order.impl.SingleOrderAdapterService;
 import com.iformall.service.order.impl.batch.CouponPackageOrderAdapterService;
 import com.iformall.service.order.impl.batch.MulityNumberOneOrderBatchOrderAdapterService;
 import com.iformall.service.order.impl.batch.OneNumberOneOrderBatchOrderAdapterService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 @Service
 public class OrderFactory {
diff --git a/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeChildOrderShare.java b/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeChildOrderShare.java
index e7ff19643..86a7af7b1 100644
--- a/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeChildOrderShare.java
+++ b/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeChildOrderShare.java
@@ -1,6 +1,5 @@
 package com.iformall.service.order.entity;
 
-import com.iformall.service.pay.service.share.entity.PayShareCalculateAmount;
 import lombok.Data;
 
 /**
diff --git a/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeOrder.java b/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeOrder.java
index 0217cf47d..fa39638aa 100644
--- a/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeOrder.java
+++ b/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeOrder.java
@@ -1,16 +1,13 @@
 package com.iformall.service.order.entity;
 
-import java.util.List;
-import java.util.Map;
-
 import com.iformall.domain.po.WxBatchOrder;
-import com.iformall.domain.po.WxCoupon;
-import com.iformall.domain.po.WxCouponChannel;
 import com.iformall.domain.po.WxOrder;
 import com.iformall.domain.po.base.TenantEntity;
-
 import lombok.Data;
 
+import java.util.List;
+import java.util.Map;
+
 @Data
 public class WxComposeOrder extends TenantEntity{
 
diff --git a/mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java b/mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java
index e34ec52a1..6070883f6 100644
--- a/mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java
@@ -1,31 +1,22 @@
 package com.iformall.service.order.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
+import com.iformall.domain.dto.OrderComposeSaveDto;
 import com.iformall.domain.po.*;
 import com.iformall.domain.po.base.TenantEntity;
-
-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 com.iformall.common.IdWorker;
-import com.iformall.domain.dto.OrderComposeSaveDto;
-import com.iformall.domain.dto.PlatPushOrderSaveDto;
 import com.iformall.enums.EnumComposeOrder;
-import com.iformall.enums.EnumOrderShopingType;
 import com.iformall.enums.EnumPayVersion;
 import com.iformall.enums.EnumPayWay;
 import com.iformall.mapper.WxBatchOrderMapper;
 import com.iformall.mapper.WxOrderMapper;
-import com.iformall.service.order.OrderAdapterService;
-import com.iformall.service.order.entity.WxComposeChildOrderPrice;
 import com.iformall.service.order.entity.WxComposeOrder;
 import com.iformall.service.order.impl.batch.BaseBatchOrderAdapterService;
-import com.iformall.service.order.util.OrderHelper;
+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.ArrayList;
+import java.util.List;
 
 /**
  * 购物车批量下单
diff --git a/mallinkService/src/main/java/com/iformall/service/order/impl/batch/BaseBatchOrderAdapterService.java b/mallinkService/src/main/java/com/iformall/service/order/impl/batch/BaseBatchOrderAdapterService.java
index 66bdfb2cd..56286569d 100644
--- a/mallinkService/src/main/java/com/iformall/service/order/impl/batch/BaseBatchOrderAdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/order/impl/batch/BaseBatchOrderAdapterService.java
@@ -1,36 +1,25 @@
 package com.iformall.service.order.impl.batch;
 
-import java.util.*;
-
-import com.iformall.enums.EnumYesOrNo;
-import com.iformall.mapper.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
 import com.iformall.domain.dto.OrderComposeSaveDto;
-import com.iformall.domain.dto.PlatPushOrderSaveDto;
-import com.iformall.domain.po.WxBatchOrder;
-import com.iformall.domain.po.WxCUserBasicInfo;
-import com.iformall.domain.po.WxCoupon;
-import com.iformall.domain.po.WxCouponChannel;
-import com.iformall.domain.po.WxOrder;
+import com.iformall.domain.po.*;
 import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.enums.EnumComposeOrder;
-import com.iformall.enums.EnumOrderShopingType;
-import com.iformall.enums.EnumPayVersion;
-import com.iformall.enums.EnumPayWay;
-import com.iformall.exception.MallinkException;
+import com.iformall.enums.*;
+import com.iformall.mapper.*;
 import com.iformall.service.WxCouponChannelService;
 import com.iformall.service.WxOrderService;
 import com.iformall.service.order.OrderAdapterService;
 import com.iformall.service.order.entity.WxComposeChildOrderPrice;
 import com.iformall.service.order.entity.WxComposeOrder;
 import com.iformall.service.order.util.OrderHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 购物车批量下单
diff --git a/mallinkService/src/main/java/com/iformall/service/order/impl/batch/CouponPackageOrderAdapterService.java b/mallinkService/src/main/java/com/iformall/service/order/impl/batch/CouponPackageOrderAdapterService.java
index bea5df03d..c4e95f748 100644
--- a/mallinkService/src/main/java/com/iformall/service/order/impl/batch/CouponPackageOrderAdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/order/impl/batch/CouponPackageOrderAdapterService.java
@@ -1,24 +1,20 @@
 package com.iformall.service.order.impl.batch;
 
-import java.util.Date;
-import java.util.List;
-
-import com.aliyun.openservices.shade.com.alibaba.fastjson.JSON;
-import com.iformall.common.ErrorCode;
+import com.iformall.domain.dto.OrderComposeSaveDto;
 import com.iformall.domain.po.*;
 import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.enums.*;
-import com.iformall.exception.MallinkException;
-import org.apache.commons.lang3.StringUtils;
+import com.iformall.enums.EnumComposeOrder;
+import com.iformall.enums.EnumPayVersion;
+import com.iformall.enums.EnumPayWay;
+import com.iformall.service.order.entity.WxComposeOrder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import com.iformall.domain.dto.OrderComposeSaveDto;
-import com.iformall.domain.dto.PlatPushOrderSaveDto;
-import com.iformall.service.order.entity.WxComposeOrder;
+
+import java.util.List;
 /**
  * 券包批量下单
  * @author alascor
diff --git a/mallinkService/src/main/java/com/iformall/service/order/impl/batch/MulityNumberOneOrderBatchOrderAdapterService.java b/mallinkService/src/main/java/com/iformall/service/order/impl/batch/MulityNumberOneOrderBatchOrderAdapterService.java
index 7c36f4f5a..d7c753292 100644
--- a/mallinkService/src/main/java/com/iformall/service/order/impl/batch/MulityNumberOneOrderBatchOrderAdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/order/impl/batch/MulityNumberOneOrderBatchOrderAdapterService.java
@@ -1,22 +1,19 @@
 package com.iformall.service.order.impl.batch;
 
 
-import java.util.ArrayList;
-import java.util.List;
-
+import com.iformall.domain.dto.OrderComposeSaveDto;
 import com.iformall.domain.po.*;
 import com.iformall.domain.po.base.TenantEntity;
-
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.iformall.domain.dto.OrderComposeSaveDto;
-import com.iformall.domain.dto.PlatPushOrderSaveDto;
 import com.iformall.enums.EnumComposeOrder;
 import com.iformall.enums.EnumPayVersion;
 import com.iformall.enums.EnumPayWay;
 import com.iformall.service.order.entity.WxComposeOrder;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
 /**
  * 购物车批量下单
  * @author alascor
diff --git a/mallinkService/src/main/java/com/iformall/service/order/impl/batch/OneNumberOneOrderBatchOrderAdapterService.java b/mallinkService/src/main/java/com/iformall/service/order/impl/batch/OneNumberOneOrderBatchOrderAdapterService.java
index 201fdfe07..909e43aed 100644
--- a/mallinkService/src/main/java/com/iformall/service/order/impl/batch/OneNumberOneOrderBatchOrderAdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/order/impl/batch/OneNumberOneOrderBatchOrderAdapterService.java
@@ -1,20 +1,17 @@
 package com.iformall.service.order.impl.batch;
 
-import java.util.List;
-
+import com.iformall.domain.dto.OrderComposeSaveDto;
 import com.iformall.domain.po.*;
 import com.iformall.domain.po.base.TenantEntity;
-
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.iformall.domain.dto.OrderComposeSaveDto;
-import com.iformall.domain.dto.PlatPushOrderSaveDto;
 import com.iformall.enums.EnumComposeOrder;
 import com.iformall.enums.EnumPayVersion;
 import com.iformall.enums.EnumPayWay;
 import com.iformall.service.order.entity.WxComposeOrder;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
  * 购物车批量下单
diff --git a/mallinkService/src/main/java/com/iformall/service/park/ParkAdapterService.java b/mallinkService/src/main/java/com/iformall/service/park/ParkAdapterService.java
index 34fb9721f..e1e8e090e 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/ParkAdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/ParkAdapterService.java
@@ -1,7 +1,5 @@
 package com.iformall.service.park;
 
-import java.util.Map;
-
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.WxCUserBasicInfo;
 import com.iformall.domain.po.WxCoupon;
@@ -12,6 +10,8 @@ import com.iformall.service.park.entity.ParkNotifyPaid;
 import com.iformall.service.park.entity.ParkPaidNotifyResult;
 import com.iformall.service.park.entity.ParkStopFee;
 
+import java.util.Map;
+
 /**
  * 新的用NewParkAdapterService
  * @author alascor
diff --git a/mallinkService/src/main/java/com/iformall/service/park/ParkBatchCallBackAdapterService.java b/mallinkService/src/main/java/com/iformall/service/park/ParkBatchCallBackAdapterService.java
index 1624c3a50..2bff3911d 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/ParkBatchCallBackAdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/ParkBatchCallBackAdapterService.java
@@ -1,10 +1,9 @@
 package com.iformall.service.park;
 
-import java.util.List;
-import java.util.Map;
-
 import com.iformall.service.park.entity.ParkNotifyParam;
 
+import java.util.List;
+
 /**
  * 停车场回调 -- 批量传回
  * @author alascor
diff --git a/mallinkService/src/main/java/com/iformall/service/park/ParkCallBackAdapterService.java b/mallinkService/src/main/java/com/iformall/service/park/ParkCallBackAdapterService.java
index cff99cecc..0a62bba41 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/ParkCallBackAdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/ParkCallBackAdapterService.java
@@ -1,7 +1,5 @@
 package com.iformall.service.park;
 
-import java.util.Map;
-
 import com.iformall.service.park.entity.ParkNotifyParam;
 
 /**
diff --git a/mallinkService/src/main/java/com/iformall/service/park/ParkFactory.java b/mallinkService/src/main/java/com/iformall/service/park/ParkFactory.java
index 01e7cd479..f226a39ac 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/ParkFactory.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/ParkFactory.java
@@ -1,11 +1,5 @@
 package com.iformall.service.park;
 
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.iformall.common.ErrorCode;
 import com.iformall.enums.EnumCarVendor;
 import com.iformall.exception.MallinkException;
@@ -28,6 +22,11 @@ import com.iformall.service.park.impl.lifang.LiFangParkCallbackService;
 import com.iformall.service.park.impl.lifang.LiFangParkService;
 import com.iformall.service.park.impl.shangan.ShangAnParkService;
 import com.iformall.service.park.impl.tjd.TJDParkService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 @Service
 public class ParkFactory {
diff --git a/mallinkService/src/main/java/com/iformall/service/park/entity/ParkCreatePayOrder.java b/mallinkService/src/main/java/com/iformall/service/park/entity/ParkCreatePayOrder.java
index 88db14b43..590c66210 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/entity/ParkCreatePayOrder.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/entity/ParkCreatePayOrder.java
@@ -1,9 +1,9 @@
 package com.iformall.service.park.entity;
 
-import java.io.Serializable;
+import com.iformall.enums.EnumCarVendor;
 import org.apache.commons.lang3.StringUtils;
 
-import com.iformall.enums.EnumCarVendor;
+import java.io.Serializable;
 
 public class ParkCreatePayOrder implements Serializable{
 
diff --git a/mallinkService/src/main/java/com/iformall/service/park/entity/ParkNotifyPaid.java b/mallinkService/src/main/java/com/iformall/service/park/entity/ParkNotifyPaid.java
index 5fa5bc5cf..9128a4248 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/entity/ParkNotifyPaid.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/entity/ParkNotifyPaid.java
@@ -1,16 +1,11 @@
 package com.iformall.service.park.entity;
 
-import java.io.Serializable;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.util.Date;
+
 @Data
 @AllArgsConstructor
 public class ParkNotifyPaid implements Serializable{
diff --git a/mallinkService/src/main/java/com/iformall/service/park/entity/ParkNotifyParam.java b/mallinkService/src/main/java/com/iformall/service/park/entity/ParkNotifyParam.java
index f56ac6c09..1f68d04f9 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/entity/ParkNotifyParam.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/entity/ParkNotifyParam.java
@@ -1,10 +1,10 @@
 package com.iformall.service.park.entity;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
 
-import lombok.Data;
-
 @Data
 public class ParkNotifyParam implements Serializable{
 
diff --git a/mallinkService/src/main/java/com/iformall/service/park/entity/ParkPaidNotifyResult.java b/mallinkService/src/main/java/com/iformall/service/park/entity/ParkPaidNotifyResult.java
index 60365bae3..7995376cb 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/entity/ParkPaidNotifyResult.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/entity/ParkPaidNotifyResult.java
@@ -1,16 +1,10 @@
 package com.iformall.service.park.entity;
 
-import java.io.Serializable;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
+import java.io.Serializable;
+
 @Data
 @AllArgsConstructor
 public class ParkPaidNotifyResult implements Serializable{
diff --git a/mallinkService/src/main/java/com/iformall/service/park/entity/ParkStopFee.java b/mallinkService/src/main/java/com/iformall/service/park/entity/ParkStopFee.java
index 64eb9f21a..a3fed7321 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/entity/ParkStopFee.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/entity/ParkStopFee.java
@@ -1,13 +1,13 @@
 package com.iformall.service.park.entity;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.lang3.StringUtils;
-
 public class ParkStopFee implements Serializable{
 
 	private static final long serialVersionUID = 6478840764729191197L;
diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/BaseParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/BaseParkService.java
index dab1e9d4f..c1f0cc886 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/impl/BaseParkService.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/impl/BaseParkService.java
@@ -1,18 +1,11 @@
 package com.iformall.service.park.impl;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.iformall.common.ErrorCode;
-import com.iformall.common.ResultData;
-import com.iformall.domain.po.WxCUserBasicInfo;
 import com.iformall.domain.po.WxCoupon;
-import com.iformall.domain.po.WxPark;
 import com.iformall.exception.MallinkException;
 import com.iformall.service.park.impl.util.ParkHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 @Service
 public class BaseParkService {
diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/bolink/BoLinkParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/bolink/BoLinkParkService.java
index 60a35a35d..143827bf5 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/impl/bolink/BoLinkParkService.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/impl/bolink/BoLinkParkService.java
@@ -1,11 +1,5 @@
 package com.iformall.service.park.impl.bolink;
 
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestBody;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.iformall.common.ErrorCode;
@@ -21,6 +15,10 @@ import com.iformall.service.park.entity.ParkNotifyPaid;
 import com.iformall.service.park.entity.ParkPaidNotifyResult;
 import com.iformall.service.park.entity.ParkStopFee;
 import com.iformall.service.park.impl.BaseParkService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
 
 @Service
 public class BoLinkParkService extends BaseParkService implements ParkAdapterService {
diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkCallbackService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkCallbackService.java
index f28d9fc86..2343a35a2 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkCallbackService.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkCallbackService.java
@@ -1,18 +1,16 @@
 package com.iformall.service.park.impl.cyf;
 
-import java.text.ParseException;
-import java.util.Date;
-import java.util.Map;
-
-import org.springframework.stereotype.Service;
-
 import com.iformall.domain.vo.WxCarCYFVo;
 import com.iformall.service.park.ParkCallBackAdapterService;
 import com.iformall.service.park.entity.ParkNotifyParam;
 import com.iformall.service.park.impl.BaseParkService;
 import com.iformall.service.park.impl.tjd.TJDUtil;
-
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.text.ParseException;
+import java.util.Date;
+import java.util.Map;
 
 @Slf4j
 @Service
diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkService.java
index ed88e1099..41df08bd2 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkService.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkService.java
@@ -1,15 +1,5 @@
 package com.iformall.service.park.impl.cyf;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestBody;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.iformall.common.ErrorCode;
@@ -29,6 +19,14 @@ import com.iformall.service.park.entity.ParkPaidNotifyResult;
 import com.iformall.service.park.entity.ParkStopFee;
 import com.iformall.service.park.impl.BaseParkService;
 import com.iformall.service.park.impl.util.ParkHelper;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
 
 @Service
 public class CYFParkService extends BaseParkService implements ParkAdapterService {
diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFUtil.java b/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFUtil.java
index 72f5921bd..fcfa2cc45 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFUtil.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFUtil.java
@@ -21,7 +21,6 @@ import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.TimeZone;
 
 
 /**
diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkCallbackService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkCallbackService.java
index c8b8108cd..9b9ad499f 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkCallbackService.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkCallbackService.java
@@ -1,33 +1,17 @@
 package com.iformall.service.park.impl.dahua;
 
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.iformall.common.ErrorCode;
-import com.iformall.common.IdWorker;
-import com.iformall.domain.po.WxCarJSOrder;
-import com.iformall.domain.po.WxPark;
-import com.iformall.domain.vo.WxCarCYFVo;
-import com.iformall.enums.EnumCarVendor;
-import com.iformall.exception.MallinkException;
 import com.iformall.mapper.WxCarJSOrderMapper;
 import com.iformall.service.WxParkService;
-import com.iformall.service.park.ParkBatchCallBackAdapterService;
 import com.iformall.service.park.ParkCallBackAdapterService;
 import com.iformall.service.park.entity.ParkNotifyParam;
 import com.iformall.service.park.impl.BaseParkService;
-
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.ParseException;
+import java.util.Map;
 
 @Slf4j
 @Service
diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkService.java
index c54223d20..9740df0db 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkService.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkService.java
@@ -1,35 +1,16 @@
 package com.iformall.service.park.impl.dahua;
 
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.iformall.common.ErrorCode;
-import com.iformall.common.IdWorker;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.WxCUserBasicInfo;
-import com.iformall.domain.po.WxCarJSOrder;
 import com.iformall.domain.po.WxCoupon;
 import com.iformall.domain.po.WxPark;
 import com.iformall.domain.vo.WxCouponOrderCarCVo;
 import com.iformall.domain.vo.WxParkCouponConfig;
-import com.iformall.enums.EnumCarVendor;
-import com.iformall.enums.EnumCouponUnit;
 import com.iformall.exception.MallinkException;
 import com.iformall.mapper.WxCarJSOrderMapper;
-import com.iformall.service.WxParkService;
 import com.iformall.service.park.ParkAdapterService;
 import com.iformall.service.park.entity.ParkCreatePayOrder;
 import com.iformall.service.park.entity.ParkNotifyPaid;
@@ -37,10 +18,20 @@ import com.iformall.service.park.entity.ParkPaidNotifyResult;
 import com.iformall.service.park.entity.ParkStopFee;
 import com.iformall.service.park.impl.BaseParkService;
 import com.iformall.service.park.impl.util.ParkHelper;
-import com.iformall.service.park.utils.ParkCacheUtils;
 import com.iformall.utils.DateUtils;
 import com.iformall.utils.RedisCacheUtils;
 import com.iformall.utils.RedisLock;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.Map;
 
 /**
  * 
diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaUtil.java b/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaUtil.java
index ad98eed98..531e9b3cb 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaUtil.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaUtil.java
@@ -5,40 +5,26 @@ import com.alibaba.fastjson.JSONObject;
 import com.iformall.common.ErrorCode;
 import com.iformall.domain.po.WxPark;
 import com.iformall.exception.MallinkException;
-
 import lombok.extern.slf4j.Slf4j;
-
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.Consts;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
-import org.apache.http.message.BasicHeader;
-import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.protocol.HTTP;
 import org.apache.http.util.EntityUtils;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.TimeZone;
 
 
 /**
diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/ETCPUtil.java b/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/ETCPUtil.java
index f25398ab2..cdd860a69 100755
--- a/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/ETCPUtil.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/ETCPUtil.java
@@ -1,7 +1,6 @@
 package com.iformall.service.park.impl.etcp;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.iformall.common.ErrorCode;
 import com.iformall.exception.MallinkException;
diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/EtcpHelper.java b/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/EtcpHelper.java
index 12642a6aa..c44912d92 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/EtcpHelper.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/EtcpHelper.java
@@ -1,28 +1,12 @@
 package com.iformall.service.park.impl.etcp;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestBody;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.iformall.common.ErrorCode;
 import com.iformall.common.Result;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.WxCUserBasicInfo;
-import com.iformall.domain.po.WxCUserCar;
-import com.iformall.domain.po.WxCouponOrder;
-import com.iformall.domain.po.WxMerchant;
-import com.iformall.domain.po.WxPark;
+import com.iformall.domain.po.*;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.WxCouponOrderCarCVo;
 import com.iformall.domain.vo.WxMerchantVo;
@@ -35,6 +19,17 @@ import com.iformall.service.WxCUserCarService;
 import com.iformall.service.WxCouponOrderService;
 import com.iformall.service.WxMerchantService;
 import com.iformall.service.park.impl.util.ParkHelper;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class EtcpHelper {
diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/fute/FuteParkCallbackService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/fute/FuteParkCallbackService.java
index 159352c9f..22bdc9ca8 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/impl/fute/FuteParkCallbackService.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/impl/fute/FuteParkCallbackService.java
@@ -1,33 +1,15 @@
 package com.iformall.service.park.impl.fute;
 
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.iformall.common.ErrorCode;
-import com.iformall.common.IdWorker;
-import com.iformall.domain.po.WxCarJSOrder;
-import com.iformall.domain.po.WxPark;
-import com.iformall.domain.vo.WxCarCYFVo;
-import com.iformall.enums.EnumCarVendor;
-import com.iformall.exception.MallinkException;
-import com.iformall.mapper.WxCarJSOrderMapper;
 import com.iformall.service.WxParkService;
-import com.iformall.service.park.ParkBatchCallBackAdapterService;
 import com.iformall.service.park.ParkCallBackAdapterService;
 import com.iformall.service.park.entity.ParkNotifyParam;
 import com.iformall.service.park.impl.BaseParkService;
-
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.Map;
 
 @Slf4j
 @Service
diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/fute/FuteParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/fute/FuteParkService.java
index c37f6a271..a1083a663 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/impl/fute/FuteParkService.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/impl/fute/FuteParkService.java
@@ -1,35 +1,15 @@
 package com.iformall.service.park.impl.fute;
 
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.iformall.common.ErrorCode;
-import com.iformall.common.IdWorker;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.WxCUserBasicInfo;
-import com.iformall.domain.po.WxCarJSOrder;
 import com.iformall.domain.po.WxCoupon;
 import com.iformall.domain.po.WxPark;
 import com.iformall.domain.vo.WxCouponOrderCarCVo;
 import com.iformall.domain.vo.WxParkCouponConfig;
-import com.iformall.enums.EnumCarVendor;
-import com.iformall.enums.EnumCouponUnit;
 import com.iformall.exception.MallinkException;
-import com.iformall.mapper.WxCarJSOrderMapper;
-import com.iformall.service.WxParkService;
 import com.iformall.service.park.ParkAdapterService;
 import com.iformall.service.park.entity.ParkCreatePayOrder;
 import com.iformall.service.park.entity.ParkNotifyPaid;
@@ -37,9 +17,17 @@ import com.iformall.service.park.entity.ParkPaidNotifyResult;
 import com.iformall.service.park.entity.ParkStopFee;
 import com.iformall.service.park.impl.BaseParkService;
 import com.iformall.service.park.impl.util.ParkHelper;
-import com.iformall.service.park.utils.ParkCacheUtils;
-import com.iformall.utils.RedisCacheUtils;
 import com.iformall.utils.RedisLock;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.Map;
 
 /**
  * 福特停车
diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/fute/FuteUtil.java b/mallinkService/src/main/java/com/iformall/service/park/impl/fute/FuteUtil.java
index b36891eea..3c0286db2 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/impl/fute/FuteUtil.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/impl/fute/FuteUtil.java
@@ -2,24 +2,14 @@ package com.iformall.service.park.impl.fute;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.iformall.common.ErrorCode;
 import com.iformall.domain.po.WxPark;
-import com.iformall.exception.MallinkException;
-
 import lombok.extern.slf4j.Slf4j;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.http.Consts;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
-import org.apache.http.message.BasicHeader;
-import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.protocol.HTTP;
 import org.apache.http.util.EntityUtils;
 
@@ -31,15 +21,7 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TimeZone;
+import java.util.*;
 
 
 /**
diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishi/HaiKangWeiShiParkCallbackService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishi/HaiKangWeiShiParkCallbackService.java
index 731f13a76..2877e8788 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishi/HaiKangWeiShiParkCallbackService.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishi/HaiKangWeiShiParkCallbackService.java
@@ -1,33 +1,16 @@
 package com.iformall.service.park.impl.haikangweishi;
 
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.iformall.common.ErrorCode;
-import com.iformall.common.IdWorker;
-import com.iformall.domain.po.WxCarJSOrder;
-import com.iformall.domain.po.WxPark;
-import com.iformall.domain.vo.WxCarCYFVo;
-import com.iformall.enums.EnumCarVendor;
-import com.iformall.exception.MallinkException;
-import com.iformall.mapper.WxCarJSOrderMapper;
 import com.iformall.service.WxParkService;
 import com.iformall.service.park.ParkBatchCallBackAdapterService;
-import com.iformall.service.park.ParkCallBackAdapterService;
 import com.iformall.service.park.entity.ParkNotifyParam;
 import com.iformall.service.park.impl.BaseParkService;
-
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 
 /**
diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishi/HaiKangWeiShiParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishi/HaiKangWeiShiParkService.java
index a0b19d69b..119b434a9 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishi/HaiKangWeiShiParkService.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishi/HaiKangWeiShiParkService.java
@@ -1,35 +1,17 @@
 package com.iformall.service.park.impl.haikangweishi;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.iformall.common.ErrorCode;
-import com.iformall.common.IdWorker;
 import com.iformall.common.Result;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.WxCUserBasicInfo;
-import com.iformall.domain.po.WxCarJSOrder;
 import com.iformall.domain.po.WxCoupon;
 import com.iformall.domain.po.WxPark;
 import com.iformall.domain.vo.WxCouponOrderCarCVo;
 import com.iformall.domain.vo.WxParkCouponConfig;
-import com.iformall.enums.EnumCarVendor;
-import com.iformall.enums.EnumCouponUnit;
 import com.iformall.exception.MallinkException;
-import com.iformall.mapper.WxCarJSOrderMapper;
-import com.iformall.service.WxParkService;
 import com.iformall.service.park.ParkAdapterService;
 import com.iformall.service.park.entity.ParkCreatePayOrder;
 import com.iformall.service.park.entity.ParkNotifyPaid;
@@ -37,9 +19,18 @@ import com.iformall.service.park.entity.ParkPaidNotifyResult;
 import com.iformall.service.park.entity.ParkStopFee;
 import com.iformall.service.park.impl.BaseParkService;
 import com.iformall.service.park.impl.util.ParkHelper;
-import com.iformall.service.park.utils.ParkCacheUtils;
 import com.iformall.utils.RedisCacheUtils;
 import com.iformall.utils.RedisLock;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 认证平台 https://www.hikyun.com 武汉富茂链客/zfy151431113 
diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishi/HaiKangWeiShiUtil.java b/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishi/HaiKangWeiShiUtil.java
index d8361767e..6c9c49cd1 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishi/HaiKangWeiShiUtil.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishi/HaiKangWeiShiUtil.java
@@ -1,26 +1,20 @@
 package com.iformall.service.park.impl.haikangweishi;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.iformall.common.ErrorCode;
 import com.iformall.domain.po.WxPark;
 import com.iformall.exception.MallinkException;
 import com.iformall.service.park.impl.haikangweishi.entity.ChallengeCode;
 import com.iformall.utils.HashUtil;
-
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.NameValuePair;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
-import org.apache.http.entity.mime.HttpMultipartMode;
-import org.apache.http.entity.mime.MultipartEntity;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
 import org.apache.http.entity.mime.content.StringBody;
 import org.apache.http.impl.client.CloseableHttpClient;
@@ -29,21 +23,12 @@ import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.protocol.HTTP;
 import org.apache.http.util.EntityUtils;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.Charset;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 
 /**
diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkCallbackService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkCallbackService.java
index ab53e3ca9..ec166ecc6 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkCallbackService.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkCallbackService.java
@@ -1,33 +1,20 @@
 package com.iformall.service.park.impl.jieshun;
 
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.iformall.common.ErrorCode;
-import com.iformall.common.IdWorker;
-import com.iformall.domain.po.WxCarJSOrder;
-import com.iformall.domain.po.WxPark;
-import com.iformall.domain.vo.WxCarCYFVo;
-import com.iformall.enums.EnumCarVendor;
-import com.iformall.exception.MallinkException;
 import com.iformall.mapper.WxCarJSOrderMapper;
 import com.iformall.service.WxParkService;
 import com.iformall.service.park.ParkBatchCallBackAdapterService;
-import com.iformall.service.park.ParkCallBackAdapterService;
 import com.iformall.service.park.entity.ParkNotifyParam;
 import com.iformall.service.park.impl.BaseParkService;
-
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 @Slf4j
 @Service
diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java
index f8239e792..a1f22a6dc 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java
@@ -1,34 +1,18 @@
 package com.iformall.service.park.impl.jieshun;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.iformall.common.ErrorCode;
-import com.iformall.common.IdWorker;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.WxCUserBasicInfo;
-import com.iformall.domain.po.WxCarJSOrder;
 import com.iformall.domain.po.WxCoupon;
 import com.iformall.domain.po.WxPark;
 import com.iformall.domain.vo.WxCouponOrderCarCVo;
 import com.iformall.domain.vo.WxParkCouponConfig;
 import com.iformall.enums.EnumCarVendor;
-import com.iformall.enums.EnumCouponUnit;
 import com.iformall.exception.MallinkException;
 import com.iformall.mapper.WxCarJSOrderMapper;
-import com.iformall.service.WxParkService;
 import com.iformall.service.park.ParkAdapterService;
 import com.iformall.service.park.entity.ParkCreatePayOrder;
 import com.iformall.service.park.entity.ParkNotifyPaid;
@@ -39,6 +23,15 @@ import com.iformall.service.park.impl.util.ParkHelper;
 import com.iformall.service.park.utils.ParkCacheUtils;
 import com.iformall.utils.RedisCacheUtils;
 import com.iformall.utils.RedisLock;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
 
 /**
  * 跳转捷停车小程序参数:(生产环境)  
diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunUtil.java b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunUtil.java
index 8c4b9e4a4..45211fdce 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunUtil.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunUtil.java
@@ -5,21 +5,15 @@ import com.alibaba.fastjson.JSONObject;
 import com.iformall.common.ErrorCode;
 import com.iformall.domain.po.WxPark;
 import com.iformall.exception.MallinkException;
-
 import lombok.extern.slf4j.Slf4j;
-
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.Consts;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
-import org.apache.http.message.BasicHeader;
-import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.protocol.HTTP;
 import org.apache.http.util.EntityUtils;
 
@@ -32,12 +26,10 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.TimeZone;
 
 
 /**
diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshunV2/JieShunUtilV2.java b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshunV2/JieShunUtilV2.java
index 317a540a4..94816684f 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshunV2/JieShunUtilV2.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshunV2/JieShunUtilV2.java
@@ -5,21 +5,15 @@ import com.alibaba.fastjson.JSONObject;
 import com.iformall.common.ErrorCode;
 import com.iformall.domain.po.WxPark;
 import com.iformall.exception.MallinkException;
-
 import lombok.extern.slf4j.Slf4j;
-
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.Consts;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
-import org.apache.http.message.BasicHeader;
-import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.protocol.HTTP;
 import org.apache.http.util.EntityUtils;
 
@@ -32,12 +26,10 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.TimeZone;
 
 
 /**
diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshunV2/JieShunV2ParkCallbackService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshunV2/JieShunV2ParkCallbackService.java
index f0b2598e7..1729e1324 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshunV2/JieShunV2ParkCallbackService.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshunV2/JieShunV2ParkCallbackService.java
@@ -1,33 +1,20 @@
 package com.iformall.service.park.impl.jieshunV2;
 
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.iformall.common.ErrorCode;
-import com.iformall.common.IdWorker;
-import com.iformall.domain.po.WxCarJSOrder;
-import com.iformall.domain.po.WxPark;
-import com.iformall.domain.vo.WxCarCYFVo;
-import com.iformall.enums.EnumCarVendor;
-import com.iformall.exception.MallinkException;
 import com.iformall.mapper.WxCarJSOrderMapper;
 import com.iformall.service.WxParkService;
 import com.iformall.service.park.ParkBatchCallBackAdapterService;
-import com.iformall.service.park.ParkCallBackAdapterService;
 import com.iformall.service.park.entity.ParkNotifyParam;
 import com.iformall.service.park.impl.BaseParkService;
-
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 @Slf4j
 @Service
diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshunV2/JieShunV2ParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshunV2/JieShunV2ParkService.java
index 864281b17..02bdd0ff4 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshunV2/JieShunV2ParkService.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshunV2/JieShunV2ParkService.java
@@ -1,34 +1,18 @@
 package com.iformall.service.park.impl.jieshunV2;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.iformall.common.ErrorCode;
-import com.iformall.common.IdWorker;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.WxCUserBasicInfo;
-import com.iformall.domain.po.WxCarJSOrder;
 import com.iformall.domain.po.WxCoupon;
 import com.iformall.domain.po.WxPark;
 import com.iformall.domain.vo.WxCouponOrderCarCVo;
 import com.iformall.domain.vo.WxParkCouponConfig;
 import com.iformall.enums.EnumCarVendor;
-import com.iformall.enums.EnumCouponUnit;
 import com.iformall.exception.MallinkException;
 import com.iformall.mapper.WxCarJSOrderMapper;
-import com.iformall.service.WxParkService;
 import com.iformall.service.park.ParkAdapterService;
 import com.iformall.service.park.entity.ParkCreatePayOrder;
 import com.iformall.service.park.entity.ParkNotifyPaid;
@@ -39,6 +23,15 @@ import com.iformall.service.park.impl.util.ParkHelper;
 import com.iformall.service.park.utils.ParkCacheUtils;
 import com.iformall.utils.RedisCacheUtils;
 import com.iformall.utils.RedisLock;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
 
 /**
  * 
diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoParkCallbackService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoParkCallbackService.java
index 92b689c41..e894a6106 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoParkCallbackService.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoParkCallbackService.java
@@ -1,33 +1,18 @@
 package com.iformall.service.park.impl.ketuo;
 
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.iformall.common.ErrorCode;
-import com.iformall.common.IdWorker;
-import com.iformall.domain.po.WxCarJSOrder;
-import com.iformall.domain.po.WxPark;
-import com.iformall.domain.vo.WxCarCYFVo;
-import com.iformall.enums.EnumCarVendor;
-import com.iformall.exception.MallinkException;
 import com.iformall.mapper.WxCarJSOrderMapper;
 import com.iformall.service.WxParkService;
-import com.iformall.service.park.ParkBatchCallBackAdapterService;
 import com.iformall.service.park.ParkCallBackAdapterService;
 import com.iformall.service.park.entity.ParkNotifyParam;
 import com.iformall.service.park.impl.BaseParkService;
-
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.ParseException;
+import java.util.Map;
 
 @Slf4j
 @Service
diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoParkService.java
index 361e1a931..836c023ca 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoParkService.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoParkService.java
@@ -1,35 +1,16 @@
 package com.iformall.service.park.impl.ketuo;
 
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.iformall.common.ErrorCode;
-import com.iformall.common.IdWorker;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.WxCUserBasicInfo;
-import com.iformall.domain.po.WxCarJSOrder;
 import com.iformall.domain.po.WxCoupon;
 import com.iformall.domain.po.WxPark;
 import com.iformall.domain.vo.WxCouponOrderCarCVo;
 import com.iformall.domain.vo.WxParkCouponConfig;
-import com.iformall.enums.EnumCarVendor;
-import com.iformall.enums.EnumCouponUnit;
 import com.iformall.exception.MallinkException;
 import com.iformall.mapper.WxCarJSOrderMapper;
-import com.iformall.service.WxParkService;
 import com.iformall.service.park.ParkAdapterService;
 import com.iformall.service.park.entity.ParkCreatePayOrder;
 import com.iformall.service.park.entity.ParkNotifyPaid;
@@ -37,9 +18,17 @@ import com.iformall.service.park.entity.ParkPaidNotifyResult;
 import com.iformall.service.park.entity.ParkStopFee;
 import com.iformall.service.park.impl.BaseParkService;
 import com.iformall.service.park.impl.util.ParkHelper;
-import com.iformall.service.park.utils.ParkCacheUtils;
-import com.iformall.utils.RedisCacheUtils;
 import com.iformall.utils.RedisLock;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.Map;
 
 /**
  * 
diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java b/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java
index 9a4e7e0f7..b3ceb13c9 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java
@@ -15,19 +15,14 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.protocol.HTTP;
 import org.apache.http.util.EntityUtils;
+
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
+import java.util.*;
 
 /**
  * @author: furunxin
diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/lifang/LiFangAESUtils.java b/mallinkService/src/main/java/com/iformall/service/park/impl/lifang/LiFangAESUtils.java
index 752cbc532..8fb5c58be 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/impl/lifang/LiFangAESUtils.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/impl/lifang/LiFangAESUtils.java
@@ -1,14 +1,14 @@
 package com.iformall.service.park.impl.lifang;
 
-import java.security.Key;
-import java.security.NoSuchAlgorithmException;
+import com.iformall.utils.Base64Util;
+import org.apache.commons.codec.binary.Base64;
 
 import javax.crypto.Cipher;
 import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.SecretKeySpec;
-import com.iformall.utils.Base64Util;
-import org.apache.commons.codec.binary.Base64;
+import java.security.Key;
+import java.security.NoSuchAlgorithmException;
 
 
 public class LiFangAESUtils {
diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/lifang/LiFangParkCallbackService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/lifang/LiFangParkCallbackService.java
index 91b9b6958..6dac37830 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/impl/lifang/LiFangParkCallbackService.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/impl/lifang/LiFangParkCallbackService.java
@@ -1,33 +1,17 @@
 package com.iformall.service.park.impl.lifang;
 
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.iformall.common.ErrorCode;
-import com.iformall.common.IdWorker;
-import com.iformall.domain.po.WxCarJSOrder;
-import com.iformall.domain.po.WxPark;
-import com.iformall.domain.vo.WxCarCYFVo;
-import com.iformall.enums.EnumCarVendor;
-import com.iformall.exception.MallinkException;
 import com.iformall.mapper.WxCarJSOrderMapper;
 import com.iformall.service.WxParkService;
-import com.iformall.service.park.ParkBatchCallBackAdapterService;
 import com.iformall.service.park.ParkCallBackAdapterService;
 import com.iformall.service.park.entity.ParkNotifyParam;
 import com.iformall.service.park.impl.BaseParkService;
-
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.ParseException;
+import java.util.Date;
+import java.util.Map;
 
 @Slf4j
 @Service
diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/lifang/LiFangParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/lifang/LiFangParkService.java
index 52c435c69..3511c50a1 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/impl/lifang/LiFangParkService.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/impl/lifang/LiFangParkService.java
@@ -1,34 +1,16 @@
 package com.iformall.service.park.impl.lifang;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.iformall.common.ErrorCode;
-import com.iformall.common.IdWorker;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.WxCUserBasicInfo;
-import com.iformall.domain.po.WxCarJSOrder;
 import com.iformall.domain.po.WxCoupon;
 import com.iformall.domain.po.WxPark;
 import com.iformall.domain.vo.WxCouponOrderCarCVo;
-import com.iformall.domain.vo.WxParkCouponConfig;
 import com.iformall.enums.EnumCarVendor;
-import com.iformall.enums.EnumCouponUnit;
 import com.iformall.exception.MallinkException;
 import com.iformall.mapper.WxCarJSOrderMapper;
-import com.iformall.service.WxParkService;
 import com.iformall.service.park.ParkAdapterService;
 import com.iformall.service.park.entity.ParkCreatePayOrder;
 import com.iformall.service.park.entity.ParkNotifyPaid;
@@ -37,8 +19,17 @@ import com.iformall.service.park.entity.ParkStopFee;
 import com.iformall.service.park.impl.BaseParkService;
 import com.iformall.service.park.impl.util.ParkHelper;
 import com.iformall.service.park.utils.ParkCacheUtils;
-import com.iformall.utils.RedisCacheUtils;
 import com.iformall.utils.RedisLock;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.Map;
 
 /**
  * 
diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/lifang/LiFangUtil.java b/mallinkService/src/main/java/com/iformall/service/park/impl/lifang/LiFangUtil.java
index 8ed17ecdd..9779ef96e 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/impl/lifang/LiFangUtil.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/impl/lifang/LiFangUtil.java
@@ -6,40 +6,25 @@ import com.iformall.common.ErrorCode;
 import com.iformall.domain.po.WxPark;
 import com.iformall.exception.MallinkException;
 import com.iformall.utils.DateUtils;
-
 import lombok.extern.slf4j.Slf4j;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.http.Consts;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
-import org.apache.http.message.BasicHeader;
-import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.protocol.HTTP;
 import org.apache.http.util.EntityUtils;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.TimeZone;
 
 
 /**
diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/shangan/ShangAnParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/shangan/ShangAnParkService.java
index 89249aa68..aa0120af5 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/impl/shangan/ShangAnParkService.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/impl/shangan/ShangAnParkService.java
@@ -1,12 +1,5 @@
 package com.iformall.service.park.impl.shangan;
 
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.iformall.common.ErrorCode;
@@ -17,13 +10,18 @@ import com.iformall.domain.po.WxPark;
 import com.iformall.domain.vo.WxCouponOrderCarCVo;
 import com.iformall.enums.EnumCouponUnit;
 import com.iformall.service.WxCouponOrderService;
-import com.iformall.service.WxCouponService;
 import com.iformall.service.park.ParkAdapterService;
 import com.iformall.service.park.entity.ParkCreatePayOrder;
 import com.iformall.service.park.entity.ParkNotifyPaid;
 import com.iformall.service.park.entity.ParkPaidNotifyResult;
 import com.iformall.service.park.entity.ParkStopFee;
 import com.iformall.service.park.impl.BaseParkService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
 
 @Service
 public class ShangAnParkService extends BaseParkService implements ParkAdapterService{
diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/tjd/TJDParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/tjd/TJDParkService.java
index 343450f12..b837809a8 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/impl/tjd/TJDParkService.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/impl/tjd/TJDParkService.java
@@ -1,15 +1,5 @@
 package com.iformall.service.park.impl.tjd;
 
-import java.util.Date;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestBody;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.iformall.common.ErrorCode;
@@ -19,10 +9,7 @@ import com.iformall.domain.po.WxCUserCar;
 import com.iformall.domain.po.WxCoupon;
 import com.iformall.domain.po.WxPark;
 import com.iformall.domain.vo.WxCouponOrderCarCVo;
-import com.iformall.enums.EnumAssignTagsTrigger;
-import com.iformall.enums.EnumCarVendor;
 import com.iformall.enums.EnumCouponUnit;
-import com.iformall.enums.EnumScoreType;
 import com.iformall.enums.EnumTJDCode;
 import com.iformall.exception.MallinkException;
 import com.iformall.service.WxCUserCarService;
@@ -36,6 +23,14 @@ import com.iformall.service.park.entity.ParkPaidNotifyResult;
 import com.iformall.service.park.entity.ParkStopFee;
 import com.iformall.service.park.impl.BaseParkService;
 import com.iformall.service.park.impl.util.ParkHelper;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.Map;
 
 @Service
 public class TJDParkService extends BaseParkService implements ParkAdapterService {
diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java b/mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java
index 97bc28399..d8b874c83 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java
@@ -1,14 +1,5 @@
 package com.iformall.service.park.impl.util;
 
-import java.util.Date;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.iformall.common.ErrorCode;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.WxCUserCar;
@@ -23,6 +14,14 @@ import com.iformall.service.WxCUserCarService;
 import com.iformall.service.WxCUserTagsService;
 import com.iformall.service.WxCreditHistoryService;
 import com.iformall.service.WxScoreRulesService;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.Map;
 
 @Service
 public class ParkHelper {
diff --git a/mallinkService/src/main/java/com/iformall/service/park/pay/WxParkPayService.java b/mallinkService/src/main/java/com/iformall/service/park/pay/WxParkPayService.java
index 0c8f2f3d7..2023e0fb0 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/pay/WxParkPayService.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/pay/WxParkPayService.java
@@ -1,21 +1,17 @@
 package com.iformall.service.park.pay;
 
-import java.util.Date;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.github.pagehelper.PageInfo;
 import com.iformall.domain.po.WxAppinfo;
 import com.iformall.domain.po.WxCarPayOrder;
 import com.iformall.domain.po.WxPark;
 import com.iformall.domain.po.WxPayAccount;
-import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.domain.vo.WxCouponOrderBVo;
-import com.iformall.enums.EnumCarVendor;
 import com.iformall.service.pay.service.pay.entity.PayAdapterResult;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
+import java.util.Map;
+
 public interface WxParkPayService {
 
 	public PageInfo listPayOrderAsPage(WxCarPayOrder record, Integer pageIndex, Integer pageSize);
diff --git a/mallinkService/src/main/java/com/iformall/service/park/pay/WxParkPayServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/park/pay/WxParkPayServiceImpl.java
index a3f0cfa2a..8807c005d 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/pay/WxParkPayServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/pay/WxParkPayServiceImpl.java
@@ -1,57 +1,32 @@
 package com.iformall.service.park.pay;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
-import com.iformall.common.Result;
-import com.iformall.common.ResultData;
 import com.iformall.domain.po.WxAppinfo;
 import com.iformall.domain.po.WxCarPayOrder;
-import com.iformall.domain.po.WxCoupon;
 import com.iformall.domain.po.WxPark;
 import com.iformall.domain.po.WxPayAccount;
-import com.iformall.domain.po.WxPayOrder;
-import com.iformall.domain.po.WxRefundOrder;
 import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.domain.vo.WxCouponOrderBVo;
-import com.iformall.enums.EnumCarVendor;
-import com.iformall.enums.EnumPayVersion;
-import com.iformall.enums.EnumPayWay;
 import com.iformall.enums.EnumYesOrNo;
 import com.iformall.exception.MallinkException;
 import com.iformall.mapper.WxAppinfoMapper;
 import com.iformall.mapper.WxCarPayOrderMapper;
 import com.iformall.mapper.WxPayAccountMapper;
-import com.iformall.pay.WxPayment;
 import com.iformall.service.ExcelService;
 import com.iformall.service.WxAppinfoService;
 import com.iformall.service.WxParkService;
 import com.iformall.service.WxPayAccountService;
 import com.iformall.service.park.ParkFactory;
-import com.iformall.service.park.entity.ParkCreatePayOrder;
 import com.iformall.service.park.entity.ParkNotifyPaid;
 import com.iformall.service.park.entity.ParkPaidNotifyResult;
-import com.iformall.service.pay.PayServiceFactory;
 import com.iformall.service.pay.service.pay.entity.PayAdapterResult;
 import com.iformall.service.pay.service.pay.wx.v2.miniApp.appPay.WxMiniAppPayAdapterService;
-import com.iformall.utils.Base64Util;
-import com.iformall.utils.CipherUtil;
 import com.iformall.utils.DateUtils;
 import com.iformall.utils.RedisLock;
 import com.iformall.utils.XmlUtil;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.TreeMap;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -59,6 +34,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
+
 
 @Service
 public class WxParkPayServiceImpl implements WxParkPayService {
diff --git a/mallinkService/src/main/java/com/iformall/service/park/utils/ParkCacheUtils.java b/mallinkService/src/main/java/com/iformall/service/park/utils/ParkCacheUtils.java
index 4302f6b0b..4265a6c04 100644
--- a/mallinkService/src/main/java/com/iformall/service/park/utils/ParkCacheUtils.java
+++ b/mallinkService/src/main/java/com/iformall/service/park/utils/ParkCacheUtils.java
@@ -1,8 +1,7 @@
 package com.iformall.service.park.utils;
 
-import org.springframework.data.redis.core.RedisTemplate;
-
 import com.iformall.utils.RedisCacheUtils;
+import org.springframework.data.redis.core.RedisTemplate;
 
 public class ParkCacheUtils {
 
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java b/mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java
index ab7a387e7..f2684ea1b 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java
@@ -1,35 +1,21 @@
 package com.iformall.service.pay;
 
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
+import com.iformall.common.ErrorCode;
 import com.iformall.enums.EnumAppPlat;
 import com.iformall.enums.EnumPayVersion;
-import com.iformall.service.pay.service.fee.ServiceFeeAdapterService;
-import com.iformall.service.pay.service.fee.TtServiceFeeService;
-import com.iformall.service.pay.service.fee.WxServiceFeeService;
-import com.iformall.service.pay.service.pay.douyin.v3.open.TtOpenPayAdapterService;
-import com.iformall.service.pay.service.refund.douyin.v2.TtRefundAdapterService;
-import com.iformall.service.pay.service.refund.douyin.v3.TtOpenRefundAdapterService;
-import com.iformall.service.pay.service.refund.wx.v2.WxRefundAdapterService;
-import com.iformall.service.pay.service.refund.wx.v3.WxRefundV3AdapterService;
-import com.iformall.service.pay.service.share.douyin.v2.TtPayShareService;
-import com.iformall.service.pay.service.share.douyin.v3.TtOpenShareService;
-import com.iformall.service.pay.service.share.wx.sft.WxPayShareSFTService;
-import com.iformall.service.pay.service.share.wx.v2.WxPayShareService;
-import com.iformall.service.pay.service.share.wx.v3.WxPayShareV3Service;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.iformall.common.ErrorCode;
 import com.iformall.enums.EnumPayWay;
 import com.iformall.exception.MallinkException;
 import com.iformall.service.pay.service.cashout.CashOutAdapterService;
 import com.iformall.service.pay.service.cashout.wx.sft.WxCashOutSFTAdapterService;
 import com.iformall.service.pay.service.cashout.wx.v2.WxCashOutQYFKAdapterService;
+import com.iformall.service.pay.service.fee.ServiceFeeAdapterService;
+import com.iformall.service.pay.service.fee.TtServiceFeeService;
+import com.iformall.service.pay.service.fee.WxServiceFeeService;
 import com.iformall.service.pay.service.pay.CDrivingPayService;
 import com.iformall.service.pay.service.pay.CPassivePayService;
 import com.iformall.service.pay.service.pay.PayAdapterService;
 import com.iformall.service.pay.service.pay.douyin.v2.miniApp.TtMiniAppPayAdapterService;
+import com.iformall.service.pay.service.pay.douyin.v3.open.TtOpenPayAdapterService;
 import com.iformall.service.pay.service.pay.wx.sft.h5.WxH5PaySFTService;
 import com.iformall.service.pay.service.pay.wx.sft.miniApp.appPay.WxMiniAppPaySFTAdapterService;
 import com.iformall.service.pay.service.pay.wx.v2.h5.WxH5PayService;
@@ -37,7 +23,21 @@ import com.iformall.service.pay.service.pay.wx.v2.miniApp.appPay.WxMiniAppPayAda
 import com.iformall.service.pay.service.pay.wx.v2.miniApp.maPay.WxMiniMaPayAdapterService;
 import com.iformall.service.pay.service.pay.wx.v3.miniApp.appPay.WxMiniAppPayV3AdapterService;
 import com.iformall.service.pay.service.refund.RefundPayAdapterService;
+import com.iformall.service.pay.service.refund.douyin.v2.TtRefundAdapterService;
+import com.iformall.service.pay.service.refund.douyin.v3.TtOpenRefundAdapterService;
+import com.iformall.service.pay.service.refund.wx.v2.WxRefundAdapterService;
+import com.iformall.service.pay.service.refund.wx.v3.WxRefundV3AdapterService;
 import com.iformall.service.pay.service.share.PayShareAdapterService;
+import com.iformall.service.pay.service.share.douyin.v2.TtPayShareService;
+import com.iformall.service.pay.service.share.douyin.v3.TtOpenShareService;
+import com.iformall.service.pay.service.share.wx.sft.WxPayShareSFTService;
+import com.iformall.service.pay.service.share.wx.v2.WxPayShareService;
+import com.iformall.service.pay.service.share.wx.v3.WxPayShareV3Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * 支付方式工厂
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/alipay/AliPayUtil.java b/mallinkService/src/main/java/com/iformall/service/pay/alipay/AliPayUtil.java
index 527d85e26..96f923dbe 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/alipay/AliPayUtil.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/alipay/AliPayUtil.java
@@ -1,30 +1,9 @@
 package com.iformall.service.pay.alipay;
 
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alipay.easysdk.base.image.models.AlipayOfflineMaterialImageUploadResponse;
-import com.alipay.easysdk.base.oauth.models.AlipaySystemOauthTokenResponse;
 import com.alipay.easysdk.kernel.Config;
 import com.alipay.easysdk.util.generic.models.AlipayOpenApiGenericResponse;
 import com.iformall.service.pay.alipay.api.AliPayApi;
@@ -35,8 +14,14 @@ import com.iformall.service.pay.alipay.api.reqEntity.AlipayMemberCardModelReques
 import com.iformall.service.pay.alipay.api.reqEntity.AlipayMemberCardModelStyle;
 import com.iformall.service.pay.alipay.api.result.UserAuthData;
 import com.iformall.service.pay.alipay.config.AliPayConfig;
-
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.io.*;
+import java.net.URLEncoder;
+import java.util.*;
 
 @Component
 @Slf4j
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/alipay/api/AliPayApi.java b/mallinkService/src/main/java/com/iformall/service/pay/alipay/api/AliPayApi.java
index 7a96f7c48..76d9fa821 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/alipay/api/AliPayApi.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/alipay/api/AliPayApi.java
@@ -1,18 +1,7 @@
 package com.iformall.service.pay.alipay.api;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.apache.commons.lang3.StringUtils;
-
 import com.alibaba.fastjson.JSON;
 import com.alipay.easysdk.base.image.models.AlipayOfflineMaterialImageUploadResponse;
-import com.alipay.easysdk.base.oauth.models.AlipaySystemOauthTokenResponse;
 import com.alipay.easysdk.factory.Factory;
 import com.alipay.easysdk.kernel.Config;
 import com.alipay.easysdk.util.generic.models.AlipayOpenApiGenericResponse;
@@ -22,6 +11,14 @@ import com.iformall.service.pay.alipay.api.reqEntity.AlipayMemberCardModelFieldR
 import com.iformall.service.pay.alipay.api.reqEntity.AlipayMemberCardModelRequest;
 import com.iformall.service.pay.alipay.api.reqEntity.AlipayMemberCardModelStyle;
 import com.iformall.utils.DateUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * SDK说明 https://opendocs.alipay.com/open/54/00y8k9
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/alipay/api/reqEntity/AlipayMemberCardModelColumn.java b/mallinkService/src/main/java/com/iformall/service/pay/alipay/api/reqEntity/AlipayMemberCardModelColumn.java
index 16a569a72..851631a7c 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/alipay/api/reqEntity/AlipayMemberCardModelColumn.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/alipay/api/reqEntity/AlipayMemberCardModelColumn.java
@@ -1,7 +1,5 @@
 package com.iformall.service.pay.alipay.api.reqEntity;
 
-import com.aliyun.tea.TeaModel;
-
 public class AlipayMemberCardModelColumn{
 
 	private String code;//标准栏位:行为由支付宝统一定,同时已经分配标准Code
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/alipay/api/reqEntity/AlipayMemberCardModelFieldRule.java b/mallinkService/src/main/java/com/iformall/service/pay/alipay/api/reqEntity/AlipayMemberCardModelFieldRule.java
index e1847ec89..9900a96d3 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/alipay/api/reqEntity/AlipayMemberCardModelFieldRule.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/alipay/api/reqEntity/AlipayMemberCardModelFieldRule.java
@@ -1,7 +1,5 @@
 package com.iformall.service.pay.alipay.api.reqEntity;
 
-import com.aliyun.tea.TeaModel;
-
 public class AlipayMemberCardModelFieldRule{
 
 	private String field_name;//字段名称,现在支持如下几个Key(暂不支持自定义)
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/alipay/api/reqEntity/AlipayMemberCardModelRequest.java b/mallinkService/src/main/java/com/iformall/service/pay/alipay/api/reqEntity/AlipayMemberCardModelRequest.java
index 86d5ffecc..c96da744a 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/alipay/api/reqEntity/AlipayMemberCardModelRequest.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/alipay/api/reqEntity/AlipayMemberCardModelRequest.java
@@ -2,9 +2,6 @@ package com.iformall.service.pay.alipay.api.reqEntity;
 
 import java.util.List;
 
-import com.aliyun.tea.NameInMap;
-import com.aliyun.tea.Validation;
-
 public class AlipayMemberCardModelRequest{
 
 	private String card_type="OUT_MEMBER_CARD";//卡类型。可选类型如下:OUT_MEMBER_CARD:外部权益卡
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/alipay/api/reqEntity/AlipayMemberCardModelStyle.java b/mallinkService/src/main/java/com/iformall/service/pay/alipay/api/reqEntity/AlipayMemberCardModelStyle.java
index b88f1fb7f..79f224945 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/alipay/api/reqEntity/AlipayMemberCardModelStyle.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/alipay/api/reqEntity/AlipayMemberCardModelStyle.java
@@ -1,7 +1,5 @@
 package com.iformall.service.pay.alipay.api.reqEntity;
 
-import com.aliyun.tea.TeaModel;
-
 public class AlipayMemberCardModelStyle{
 
 	private String card_show_name;//钱包端显示名称(字符串长度)
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/alipay/config/AliPayConfig.java b/mallinkService/src/main/java/com/iformall/service/pay/alipay/config/AliPayConfig.java
index 663fb9dc2..7c0dd6fa1 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/alipay/config/AliPayConfig.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/alipay/config/AliPayConfig.java
@@ -3,7 +3,6 @@ package com.iformall.service.pay.alipay.config;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.stereotype.Component;
 
 /**
  * alipay 配置
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/cashout/wx/sft/WxCashOutSFTAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/cashout/wx/sft/WxCashOutSFTAdapterService.java
index 8874bb470..8eb6b4fff 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/cashout/wx/sft/WxCashOutSFTAdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/cashout/wx/sft/WxCashOutSFTAdapterService.java
@@ -1,62 +1,30 @@
 package com.iformall.service.pay.service.cashout.wx.sft;
 
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.TreeMap;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.iformall.common.ErrorCode;
-import com.iformall.common.Result;
-import com.iformall.common.ResultData;
 import com.iformall.domain.po.WxAppinfo;
 import com.iformall.domain.po.WxCashOut;
 import com.iformall.domain.po.WxPayAccount;
-import com.iformall.domain.po.WxPayOrder;
-import com.iformall.domain.po.WxRefundOrder;
-import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.enums.EnumAppPlat;
 import com.iformall.enums.EnumCashOutStatus;
-import com.iformall.enums.EnumPayMode;
-import com.iformall.enums.EnumPayType;
-import com.iformall.enums.EnumPayWay;
-import com.iformall.enums.EnumRefundStatus;
 import com.iformall.exception.MallinkException;
-import com.iformall.mapper.WxAppinfoMapper;
-import com.iformall.mapper.WxPayAccountMapper;
-import com.iformall.mapper.WxPayOrderMapper;
-import com.iformall.mapper.WxRefundOrderMapper;
-import com.iformall.pay.WxCashOutP;
 import com.iformall.pay.WxCashOutPV3;
 import com.iformall.pay.WxCashOutPV3Item;
-import com.iformall.pay.WxCashOutQueryP;
-import com.iformall.pay.WxPay;
 import com.iformall.pay.WxPayV3;
-import com.iformall.pay.WxPayment;
-import com.iformall.pay.WxRefundOrderP;
-import com.iformall.pay.WxRefundOrderSP;
 import com.iformall.service.WxAppinfoService;
 import com.iformall.service.pay.service.cashout.CashOutAdapterService;
 import com.iformall.service.pay.service.cashout.entity.CashOutAdapterResult;
-import com.iformall.service.pay.service.refund.RefundPayAdapterService;
-import com.iformall.service.pay.service.refund.entity.RefundAdapterResult;
-import com.iformall.service.pay.service.refund.entity.RefundNotifyAdapterResult;
-import com.iformall.utils.BeanUtils;
-import com.iformall.utils.CipherUtil;
-import com.iformall.utils.DateUtils;
 import com.iformall.utils.MaUtil;
 import com.iformall.utils.Utility;
-import com.iformall.utils.XmlUtil;
-
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.List;
 
 @Slf4j
 @Service
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/cashout/wx/v2/WxCashOutAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/cashout/wx/v2/WxCashOutAdapterService.java
index d1e8556c0..aabf1bd58 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/cashout/wx/v2/WxCashOutAdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/cashout/wx/v2/WxCashOutAdapterService.java
@@ -1,62 +1,30 @@
 package com.iformall.service.pay.service.cashout.wx.v2;
 
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.TreeMap;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.iformall.common.ErrorCode;
-import com.iformall.common.Result;
-import com.iformall.common.ResultData;
 import com.iformall.domain.po.WxAppinfo;
 import com.iformall.domain.po.WxCashOut;
 import com.iformall.domain.po.WxPayAccount;
-import com.iformall.domain.po.WxPayOrder;
-import com.iformall.domain.po.WxRefundOrder;
-import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.enums.EnumAppPlat;
 import com.iformall.enums.EnumCashOutStatus;
-import com.iformall.enums.EnumPayMode;
-import com.iformall.enums.EnumPayType;
-import com.iformall.enums.EnumPayWay;
-import com.iformall.enums.EnumRefundStatus;
 import com.iformall.exception.MallinkException;
-import com.iformall.mapper.WxAppinfoMapper;
-import com.iformall.mapper.WxPayAccountMapper;
-import com.iformall.mapper.WxPayOrderMapper;
-import com.iformall.mapper.WxRefundOrderMapper;
-import com.iformall.pay.WxCashOutP;
 import com.iformall.pay.WxCashOutPV3;
 import com.iformall.pay.WxCashOutPV3Item;
-import com.iformall.pay.WxCashOutQueryP;
-import com.iformall.pay.WxPay;
 import com.iformall.pay.WxPayV3;
-import com.iformall.pay.WxPayment;
-import com.iformall.pay.WxRefundOrderP;
-import com.iformall.pay.WxRefundOrderSP;
 import com.iformall.service.WxAppinfoService;
 import com.iformall.service.pay.service.cashout.CashOutAdapterService;
 import com.iformall.service.pay.service.cashout.entity.CashOutAdapterResult;
-import com.iformall.service.pay.service.refund.RefundPayAdapterService;
-import com.iformall.service.pay.service.refund.entity.RefundAdapterResult;
-import com.iformall.service.pay.service.refund.entity.RefundNotifyAdapterResult;
-import com.iformall.utils.BeanUtils;
-import com.iformall.utils.CipherUtil;
-import com.iformall.utils.DateUtils;
 import com.iformall.utils.MaUtil;
 import com.iformall.utils.Utility;
-import com.iformall.utils.XmlUtil;
-
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.List;
 
 
 /**
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/cashout/wx/v2/WxCashOutQYFKAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/cashout/wx/v2/WxCashOutQYFKAdapterService.java
index 593d43a22..bf5fe971a 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/cashout/wx/v2/WxCashOutQYFKAdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/cashout/wx/v2/WxCashOutQYFKAdapterService.java
@@ -1,8 +1,5 @@
 package com.iformall.service.pay.service.cashout.wx.v2;
 
-import java.util.Map;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.iformall.common.ErrorCode;
@@ -20,6 +17,10 @@ import com.iformall.service.pay.service.cashout.entity.CashOutAdapterResult;
 import com.iformall.utils.BeanUtils;
 import com.iformall.utils.Utility;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
 
 /**
  * 企业付款到零钱
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/fee/ServiceFeeAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/fee/ServiceFeeAdapterService.java
index 9995fd476..33cfa6d6b 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/fee/ServiceFeeAdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/fee/ServiceFeeAdapterService.java
@@ -1,12 +1,10 @@
 package com.iformall.service.pay.service.fee;
 
 import com.iformall.domain.po.WxAppinfo;
-import com.iformall.domain.po.WxCashOut;
 import com.iformall.domain.po.WxPayAccount;
 import com.iformall.domain.po.WxPayOrder;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.service.order.entity.WxComposeChildOrderShare;
-import com.iformall.service.pay.service.cashout.entity.CashOutAdapterResult;
 
 /**
  * 费率接口
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/fee/TtServiceFeeService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/fee/TtServiceFeeService.java
index e55751710..608fa2b35 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/fee/TtServiceFeeService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/fee/TtServiceFeeService.java
@@ -6,23 +6,18 @@ import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.douyin.pay.DouYinPayHelper;
 import com.iformall.douyin.pay.orderQuery.QueryUnsettleAmount;
 import com.iformall.enums.EnumCpsPlanType;
-import com.iformall.enums.EnumDouyinApplicationVersion;
 import com.iformall.enums.EnumOrderType;
 import com.iformall.enums.EnumYesOrNo;
 import com.iformall.exception.MallinkException;
 import com.iformall.mapper.TtPoiTakeRateMapper;
-import com.iformall.mapper.WxCouponMapper;
 import com.iformall.mapper.WxOrderMapper;
 import com.iformall.service.TtGoodsCategoryService;
 import com.iformall.service.TtMallGoodsCategoryService;
 import com.iformall.service.WxCouponService;
-import com.iformall.service.WxMallService;
-
 import com.iformall.service.order.entity.WxComposeChildOrderShare;
 import com.iformall.utils.PayUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 @Slf4j
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/fee/WxServiceFeeService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/fee/WxServiceFeeService.java
index ef631162c..8d9632682 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/fee/WxServiceFeeService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/fee/WxServiceFeeService.java
@@ -1,8 +1,10 @@
 package com.iformall.service.pay.service.fee;
 
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.WxAppinfo;
+import com.iformall.domain.po.WxPayAccount;
+import com.iformall.domain.po.WxPayOrder;
 import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.enums.*;
+import com.iformall.enums.EnumYesOrNo;
 import com.iformall.service.order.entity.WxComposeChildOrderShare;
 import com.iformall.utils.PayUtils;
 import lombok.extern.slf4j.Slf4j;
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/CPassivePayService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/CPassivePayService.java
index ca3fc3224..9380b3625 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/CPassivePayService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/CPassivePayService.java
@@ -1,15 +1,7 @@
 package com.iformall.service.pay.service.pay;
 
-import java.util.Date;
-
 import com.iformall.domain.po.WxAppinfo;
-import com.iformall.domain.po.WxOrder;
-import com.iformall.domain.po.WxPayAccount;
-import com.iformall.domain.po.WxPayOrder;
-import com.iformall.enums.EnumPayShare;
-import com.iformall.service.pay.entity.PayExtraParam;
 import com.iformall.service.pay.service.pay.entity.CreateUser;
-import com.iformall.service.pay.service.pay.entity.PayAdapterResult;
 
 /**
  * C端被动发起的支付
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/PayAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/PayAdapterService.java
index bf036e140..063fc9cac 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/PayAdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/PayAdapterService.java
@@ -1,17 +1,14 @@
 package com.iformall.service.pay.service.pay;
 
-import java.io.File;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
 import com.iformall.domain.po.*;
-import com.iformall.enums.EnumPayShare;
 import com.iformall.service.order.entity.WxComposeOrder;
 import com.iformall.service.pay.entity.PayExtraParam;
 import com.iformall.service.pay.service.pay.entity.PayAdapterResult;
 import com.iformall.service.pay.service.pay.entity.PayQueryAdapterResult;
-import org.springframework.scheduling.annotation.Async;
+
+import java.io.File;
+import java.util.Date;
+import java.util.List;
 
 public interface PayAdapterService {
 
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/BaseTtPayAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/BaseTtPayAdapterService.java
index 7966320d5..582e56d55 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/BaseTtPayAdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/BaseTtPayAdapterService.java
@@ -6,7 +6,6 @@ import com.iformall.domain.po.WxAppinfo;
 import com.iformall.domain.po.WxPayAccount;
 import com.iformall.domain.po.WxPayOrder;
 import com.iformall.douyin.miniapp.api.TtMaService;
-import com.iformall.douyin.pay.TtPayService;
 import com.iformall.douyin.payv2.result.TtPayOrderQueryV2Result;
 import com.iformall.enums.EnumPayStatus;
 import com.iformall.exception.MallinkException;
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v2/miniApp/TtMiniAppPayAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v2/miniApp/TtMiniAppPayAdapterService.java
index 71557369e..cb031230c 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v2/miniApp/TtMiniAppPayAdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v2/miniApp/TtMiniAppPayAdapterService.java
@@ -6,17 +6,15 @@ import com.iformall.common.ErrorCode;
 import com.iformall.domain.po.*;
 import com.iformall.douyin.pay.TtPayService;
 import com.iformall.douyin.payv2.request.TtOrderPushDeliveryRequest;
-import com.iformall.douyin.payv2.request.TtPayUnifiedOrderV2Request;
 import com.iformall.douyin.payv2.result.TtPayCpsOrderQueryV2Result;
 import com.iformall.douyin.payv2.result.TtPayOrderQueryV2Result;
-import com.iformall.douyin.payv2.result.TtPayUnifiedOrderV2Result;
-import com.iformall.enums.*;
+import com.iformall.enums.EnumCouponOrderStatus;
+import com.iformall.enums.EnumOrderStatus;
+import com.iformall.enums.EnumPayStatus;
 import com.iformall.exception.MallinkException;
 import com.iformall.mapper.*;
 import com.iformall.service.WxCouponService;
-import com.iformall.service.order.OrderAdapterService;
 import com.iformall.service.order.OrderFactory;
-import com.iformall.service.order.entity.WxComposeChildOrderShare;
 import com.iformall.service.order.entity.WxComposeOrder;
 import com.iformall.service.pay.entity.PayExtraParam;
 import com.iformall.service.pay.service.pay.CDrivingPayService;
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v3/open/TtOpenPayAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v3/open/TtOpenPayAdapterService.java
index d958db656..06a0242fd 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v3/open/TtOpenPayAdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v3/open/TtOpenPayAdapterService.java
@@ -1,35 +1,26 @@
 package com.iformall.service.pay.service.pay.douyin.v3.open;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.iformall.common.ErrorCode;
 import com.iformall.domain.po.*;
-import com.iformall.douyin.pay.TtPayService;
 import com.iformall.douyin.payv2.request.TtOrderPushDeliveryRequest;
-import com.iformall.douyin.payv2.request.TtPayUnifiedOrderV2Request;
 import com.iformall.douyin.payv2.result.TtPayCpsOrderQueryV2Result;
 import com.iformall.douyin.payv2.result.TtPayOrderQueryV2Result;
-import com.iformall.douyin.payv2.result.TtPayUnifiedOrderV2Result;
 import com.iformall.douyin.web.api.order.TtWebPayService;
 import com.iformall.enums.EnumCouponOrderStatus;
 import com.iformall.enums.EnumOrderStatus;
-import com.iformall.enums.EnumPayMchType;
 import com.iformall.enums.EnumPayStatus;
 import com.iformall.exception.MallinkException;
 import com.iformall.mapper.*;
 import com.iformall.service.WxCouponService;
-import com.iformall.service.order.OrderAdapterService;
 import com.iformall.service.order.OrderFactory;
-import com.iformall.service.order.entity.WxComposeChildOrderShare;
 import com.iformall.service.order.entity.WxComposeOrder;
 import com.iformall.service.pay.entity.PayExtraParam;
 import com.iformall.service.pay.service.pay.CDrivingPayService;
 import com.iformall.service.pay.service.pay.douyin.BaseTtPayAdapterService;
 import com.iformall.service.pay.service.pay.douyin.v2.miniApp.EnumTtOrderStatus;
-import com.iformall.service.pay.service.pay.douyin.v2.miniApp.EnumTtPoiOrderStatus;
 import com.iformall.service.pay.service.pay.entity.PayAdapterResult;
 import com.iformall.service.pay.service.pay.entity.PayQueryAdapterResult;
-import com.iformall.utils.Constant;
 import com.iformall.utils.MaUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/entity/CreateUser.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/entity/CreateUser.java
index 875db1b1b..b13624d73 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/entity/CreateUser.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/entity/CreateUser.java
@@ -1,12 +1,11 @@
 package com.iformall.service.pay.service.pay.entity;
 
-import java.io.Serializable;
-
 import com.iformall.utils.UserUtil;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
+import java.io.Serializable;
+
 @Data
 @AllArgsConstructor
 public class CreateUser implements Serializable{
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/entity/PayQueryAdapterResult.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/entity/PayQueryAdapterResult.java
index 4f41c3f5f..9aa02e7f9 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/entity/PayQueryAdapterResult.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/entity/PayQueryAdapterResult.java
@@ -1,10 +1,10 @@
 package com.iformall.service.pay.service.pay.entity;
 
-import java.io.Serializable;
-
 import lombok.Data;
 import lombok.ToString;
 
+import java.io.Serializable;
+
 @Data
 @ToString
 public class PayQueryAdapterResult implements Serializable{
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/BaseWxPayAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/BaseWxPayAdapterService.java
index 7a9c1e834..35646e0ce 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/BaseWxPayAdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/BaseWxPayAdapterService.java
@@ -1,55 +1,35 @@
 package com.iformall.service.pay.service.pay.wx;
 
-import java.io.File;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.bean.WxMaCodeLineColor;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.iformall.common.ErrorCode;
-import com.iformall.common.Result;
-import com.iformall.common.ResultData;
-import com.iformall.domain.po.PosCouponOrderVerify;
 import com.iformall.domain.po.WxAppinfo;
-import com.iformall.domain.po.WxBatchOrder;
-import com.iformall.domain.po.WxCouponOrder;
 import com.iformall.domain.po.WxOrder;
 import com.iformall.domain.po.WxPayAccount;
 import com.iformall.domain.po.WxPayOrder;
-import com.iformall.enums.EnumCouponOrderStatus;
-import com.iformall.enums.EnumOrderFrom;
-import com.iformall.enums.EnumOrderStatus;
-import com.iformall.enums.EnumOrderType;
 import com.iformall.enums.EnumPayMode;
-import com.iformall.enums.EnumPayStatus;
 import com.iformall.exception.MallinkException;
 import com.iformall.pay.WxPay;
 import com.iformall.pay.WxPayOrderQ;
 import com.iformall.pay.WxPayOrderSQ;
 import com.iformall.pay.WxPayment;
-import com.iformall.service.QrCodeService;
-import com.iformall.service.helper.WxPayOrderServiceHelper;
 import com.iformall.service.order.entity.WxComposeChildOrderShare;
-import com.iformall.service.pay.service.pay.PayAdapterService;
 import com.iformall.service.pay.service.pay.entity.PayAdapterResult;
-import com.iformall.service.pay.service.pay.entity.PayQueryAdapterResult;
 import com.iformall.utils.BeanUtils;
 import com.iformall.utils.MaUtil;
-import com.iformall.utils.MapUtil;
 import com.iformall.utils.QRCodeUtils;
 import com.iformall.utils.Utility;
-
-import cn.binarywang.wx.miniapp.api.WxMaService;
-import cn.binarywang.wx.miniapp.bean.WxMaCodeLineColor;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.open.api.WxOpenService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
 
 @Slf4j
 public class BaseWxPayAdapterService {
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/BaseWxPaySFTAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/BaseWxPaySFTAdapterService.java
index 32d5c7af9..3ae0d0df4 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/BaseWxPaySFTAdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/BaseWxPaySFTAdapterService.java
@@ -1,53 +1,7 @@
 package com.iformall.service.pay.service.pay.wx.sft;
 
-import java.io.File;
-import java.util.Date;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.iformall.common.ErrorCode;
-import com.iformall.common.Result;
-import com.iformall.common.ResultData;
-import com.iformall.domain.po.PosCouponOrderVerify;
-import com.iformall.domain.po.WxAppinfo;
-import com.iformall.domain.po.WxBatchOrder;
-import com.iformall.domain.po.WxCouponOrder;
-import com.iformall.domain.po.WxOrder;
-import com.iformall.domain.po.WxPayAccount;
-import com.iformall.domain.po.WxPayOrder;
-import com.iformall.enums.EnumCouponOrderStatus;
-import com.iformall.enums.EnumOrderFrom;
-import com.iformall.enums.EnumOrderStatus;
-import com.iformall.enums.EnumOrderType;
-import com.iformall.enums.EnumPayMode;
-import com.iformall.enums.EnumPayStatus;
-import com.iformall.exception.MallinkException;
-import com.iformall.pay.WxPay;
-import com.iformall.pay.WxPayOrderQ;
-import com.iformall.pay.WxPayOrderSQ;
-import com.iformall.pay.WxPayment;
-import com.iformall.service.QrCodeService;
-import com.iformall.service.helper.WxPayOrderServiceHelper;
-import com.iformall.service.pay.service.pay.PayAdapterService;
-import com.iformall.service.pay.service.pay.entity.PayAdapterResult;
-import com.iformall.service.pay.service.pay.entity.PayQueryAdapterResult;
 import com.iformall.service.pay.service.pay.wx.BaseWxPayAdapterService;
-import com.iformall.utils.BeanUtils;
-import com.iformall.utils.MaUtil;
-import com.iformall.utils.QRCodeUtils;
-import com.iformall.utils.Utility;
-
-import cn.binarywang.wx.miniapp.api.WxMaService;
-import cn.binarywang.wx.miniapp.bean.WxMaCodeLineColor;
 import lombok.extern.slf4j.Slf4j;
-import me.chanjar.weixin.common.error.WxErrorException;
-import me.chanjar.weixin.open.api.WxOpenService;
 
 @Slf4j
 public class BaseWxPaySFTAdapterService extends BaseWxPayAdapterService{
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/entity/SFTCombineCloseReq.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/entity/SFTCombineCloseReq.java
index db2305a7f..190173377 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/entity/SFTCombineCloseReq.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/entity/SFTCombineCloseReq.java
@@ -1,13 +1,14 @@
 package com.iformall.service.pay.service.pay.wx.sft.entity;
 
-import java.util.ArrayList;
-import java.util.List;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.iformall.domain.po.WxPayAccount;
 import com.iformall.domain.po.WxPayOrder;
 import com.iformall.service.order.entity.WxComposeChildOrderShare;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Data
 public class SFTCombineCloseReq {
 
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/entity/SFTCombineItemOrder.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/entity/SFTCombineItemOrder.java
index 1eea36c83..4b727e534 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/entity/SFTCombineItemOrder.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/entity/SFTCombineItemOrder.java
@@ -1,14 +1,13 @@
 package com.iformall.service.pay.service.pay.wx.sft.entity;
 
-import java.io.UnsupportedEncodingException;
-
 import com.iformall.domain.po.WxAppinfo;
 import com.iformall.domain.po.WxOrder;
 import com.iformall.domain.po.WxPayAccount;
 import com.iformall.pay.WxPayV3;
-
 import lombok.Data;
 
+import java.io.UnsupportedEncodingException;
+
 @Data
 public class SFTCombineItemOrder {
 
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/entity/SFTCombinePayCommonMiniAppReq.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/entity/SFTCombinePayCommonMiniAppReq.java
index 57bc2f301..4c69ec361 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/entity/SFTCombinePayCommonMiniAppReq.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/entity/SFTCombinePayCommonMiniAppReq.java
@@ -1,9 +1,9 @@
 package com.iformall.service.pay.service.pay.wx.sft.entity;
 
-import java.util.List;
-
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class SFTCombinePayCommonMiniAppReq {
 
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/entity/SFTPayQueryReq.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/entity/SFTPayQueryReq.java
index 06a781ba9..55564e496 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/entity/SFTPayQueryReq.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/entity/SFTPayQueryReq.java
@@ -1,7 +1,6 @@
 package com.iformall.service.pay.service.pay.wx.sft.entity;
 
 import com.alibaba.fastjson.annotation.JSONField;
-
 import lombok.Data;
 
 @Data
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/h5/WxH5PaySFTService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/h5/WxH5PaySFTService.java
index 21152697f..c0090165c 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/h5/WxH5PaySFTService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/h5/WxH5PaySFTService.java
@@ -1,23 +1,19 @@
 package com.iformall.service.pay.service.pay.wx.sft.h5;
 
-import java.io.File;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
 import com.iformall.common.ErrorCode;
 import com.iformall.domain.po.*;
 import com.iformall.exception.MallinkException;
-import org.springframework.stereotype.Service;
-
-import com.iformall.enums.EnumPayShare;
 import com.iformall.service.order.entity.WxComposeOrder;
 import com.iformall.service.pay.entity.PayExtraParam;
 import com.iformall.service.pay.service.pay.CDrivingPayService;
 import com.iformall.service.pay.service.pay.entity.PayAdapterResult;
 import com.iformall.service.pay.service.pay.entity.PayQueryAdapterResult;
 import com.iformall.service.pay.service.pay.wx.sft.BaseWxPaySFTAdapterService;
-import com.iformall.service.pay.service.pay.wx.v2.BaseWxPayV2AdapterService;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class WxH5PaySFTService extends BaseWxPaySFTAdapterService implements CDrivingPayService{
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/miniApp/appPay/WxMiniAppPaySFTAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/miniApp/appPay/WxMiniAppPaySFTAdapterService.java
index c4e8dc07e..e3eb94ec1 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/miniApp/appPay/WxMiniAppPaySFTAdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/miniApp/appPay/WxMiniAppPaySFTAdapterService.java
@@ -1,62 +1,37 @@
 package com.iformall.service.pay.service.pay.wx.sft.miniApp.appPay;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import com.iformall.domain.po.*;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.iformall.common.ErrorCode;
-import com.iformall.common.Result;
-import com.iformall.common.ResultData;
-import com.iformall.enums.EnumComposeOrder;
-import com.iformall.enums.EnumOrderStatus;
+import com.iformall.domain.po.*;
 import com.iformall.enums.EnumPayMchType;
 import com.iformall.enums.EnumPayMode;
 import com.iformall.enums.EnumPayShare;
 import com.iformall.enums.EnumPayStatus;
 import com.iformall.exception.MallinkException;
-import com.iformall.pay.WxPay;
-import com.iformall.pay.WxPayOrderP;
-import com.iformall.pay.WxPayOrderSP;
 import com.iformall.pay.WxPayV3;
 import com.iformall.pay.WxPayV3SFT;
-import com.iformall.pay.WxPayment;
 import com.iformall.service.helper.WxPayOrderServiceHelper;
-import com.iformall.service.order.entity.WxComposeChildOrderShare;
 import com.iformall.service.order.entity.WxComposeOrder;
 import com.iformall.service.pay.entity.PayExtraParam;
 import com.iformall.service.pay.service.pay.CDrivingPayService;
 import com.iformall.service.pay.service.pay.entity.PayAdapterResult;
 import com.iformall.service.pay.service.pay.entity.PayQueryAdapterResult;
-import com.iformall.service.pay.service.pay.wx.BaseWxPayAdapterService;
 import com.iformall.service.pay.service.pay.wx.sft.BaseWxPaySFTAdapterService;
-import com.iformall.service.pay.service.pay.wx.sft.entity.SFTCombineCloseReq;
-import com.iformall.service.pay.service.pay.wx.sft.entity.SFTCombineItemOrder;
-import com.iformall.service.pay.service.pay.wx.sft.entity.SFTCombinePayCommonMiniAppReq;
-import com.iformall.service.pay.service.pay.wx.sft.entity.SFTCombinePayerReq;
-import com.iformall.service.pay.service.pay.wx.sft.entity.SFTPayAmountReq;
-import com.iformall.service.pay.service.pay.wx.sft.entity.SFTPayCommonMiniAppReq;
-import com.iformall.service.pay.service.pay.wx.sft.entity.SFTPayQueryReq;
-import com.iformall.service.pay.service.pay.wx.sft.entity.SFTPaySettleReq;
-import com.iformall.service.pay.service.pay.wx.sft.entity.SFTPayerReq;
-import com.iformall.service.pay.service.pay.wx.v2.BaseWxPayV2AdapterService;
-import com.iformall.utils.BeanUtils;
+import com.iformall.service.pay.service.pay.wx.sft.entity.*;
 import com.iformall.utils.MaUtil;
-import com.iformall.utils.MapUtil;
-import com.iformall.utils.Utility;
-
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 @Slf4j
 @Service
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/BaseWxPayV2AdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/BaseWxPayV2AdapterService.java
index a0d66c116..0f3c61a5e 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/BaseWxPayV2AdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/BaseWxPayV2AdapterService.java
@@ -1,53 +1,26 @@
 package com.iformall.service.pay.service.pay.wx.v2;
 
-import java.io.File;
-import java.util.Date;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.iformall.common.ErrorCode;
-import com.iformall.common.Result;
-import com.iformall.common.ResultData;
-import com.iformall.domain.po.PosCouponOrderVerify;
 import com.iformall.domain.po.WxAppinfo;
-import com.iformall.domain.po.WxBatchOrder;
-import com.iformall.domain.po.WxCouponOrder;
-import com.iformall.domain.po.WxOrder;
 import com.iformall.domain.po.WxPayAccount;
 import com.iformall.domain.po.WxPayOrder;
-import com.iformall.enums.EnumCouponOrderStatus;
-import com.iformall.enums.EnumOrderFrom;
-import com.iformall.enums.EnumOrderStatus;
-import com.iformall.enums.EnumOrderType;
 import com.iformall.enums.EnumPayMode;
-import com.iformall.enums.EnumPayStatus;
 import com.iformall.exception.MallinkException;
 import com.iformall.pay.WxPay;
 import com.iformall.pay.WxPayOrderQ;
 import com.iformall.pay.WxPayOrderSQ;
 import com.iformall.pay.WxPayment;
-import com.iformall.service.QrCodeService;
 import com.iformall.service.helper.WxPayOrderServiceHelper;
-import com.iformall.service.pay.service.pay.PayAdapterService;
 import com.iformall.service.pay.service.pay.entity.PayAdapterResult;
 import com.iformall.service.pay.service.pay.entity.PayQueryAdapterResult;
 import com.iformall.service.pay.service.pay.wx.BaseWxPayAdapterService;
 import com.iformall.utils.BeanUtils;
-import com.iformall.utils.MaUtil;
-import com.iformall.utils.QRCodeUtils;
 import com.iformall.utils.Utility;
-
-import cn.binarywang.wx.miniapp.api.WxMaService;
-import cn.binarywang.wx.miniapp.bean.WxMaCodeLineColor;
 import lombok.extern.slf4j.Slf4j;
-import me.chanjar.weixin.common.error.WxErrorException;
-import me.chanjar.weixin.open.api.WxOpenService;
+
+import java.util.Map;
 
 @Slf4j
 public class BaseWxPayV2AdapterService extends BaseWxPayAdapterService{
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/h5/WxH5PayService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/h5/WxH5PayService.java
index ded1500c6..99694b6e7 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/h5/WxH5PayService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/h5/WxH5PayService.java
@@ -1,22 +1,19 @@
 package com.iformall.service.pay.service.pay.wx.v2.h5;
 
-import java.io.File;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
 import com.iformall.common.ErrorCode;
 import com.iformall.domain.po.*;
 import com.iformall.exception.MallinkException;
-import org.springframework.stereotype.Service;
-
-import com.iformall.enums.EnumPayShare;
 import com.iformall.service.order.entity.WxComposeOrder;
 import com.iformall.service.pay.entity.PayExtraParam;
 import com.iformall.service.pay.service.pay.CDrivingPayService;
 import com.iformall.service.pay.service.pay.entity.PayAdapterResult;
 import com.iformall.service.pay.service.pay.entity.PayQueryAdapterResult;
 import com.iformall.service.pay.service.pay.wx.v2.BaseWxPayV2AdapterService;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class WxH5PayService  extends BaseWxPayV2AdapterService implements CDrivingPayService{
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/miniApp/appPay/WxMiniAppPayAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/miniApp/appPay/WxMiniAppPayAdapterService.java
index cdc830df3..5d674f2aa 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/miniApp/appPay/WxMiniAppPayAdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/miniApp/appPay/WxMiniAppPayAdapterService.java
@@ -1,25 +1,11 @@
 package com.iformall.service.pay.service.pay.wx.v2.miniApp.appPay;
 
-import java.io.File;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.iformall.domain.po.*;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.iformall.common.ErrorCode;
-import com.iformall.common.Result;
-import com.iformall.common.ResultData;
-import com.iformall.enums.EnumOrderStatus;
+import com.iformall.domain.po.*;
 import com.iformall.enums.EnumPayMchType;
 import com.iformall.enums.EnumPayMode;
-import com.iformall.enums.EnumPayShare;
-import com.iformall.enums.EnumPayStatus;
 import com.iformall.exception.MallinkException;
 import com.iformall.pay.WxPay;
 import com.iformall.pay.WxPayOrderP;
@@ -34,8 +20,14 @@ import com.iformall.service.pay.service.pay.wx.v2.BaseWxPayV2AdapterService;
 import com.iformall.utils.BeanUtils;
 import com.iformall.utils.MapUtil;
 import com.iformall.utils.Utility;
-
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 @Slf4j
 @Service
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/miniApp/maPay/WxMiniMaPayAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/miniApp/maPay/WxMiniMaPayAdapterService.java
index 7e60ddd89..88cbcaaf2 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/miniApp/maPay/WxMiniMaPayAdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/miniApp/maPay/WxMiniMaPayAdapterService.java
@@ -1,23 +1,9 @@
 package com.iformall.service.pay.service.pay.wx.v2.miniApp.maPay;
 
-import java.io.File;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import com.iformall.domain.po.*;
-import com.iformall.service.order.entity.WxComposeChildOrderShare;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.iformall.common.ErrorCode;
-import com.iformall.common.IdWorker;
-import com.iformall.domain.po.base.TenantEntity;
+import com.iformall.domain.po.*;
 import com.iformall.enums.EnumPayMchType;
 import com.iformall.enums.EnumPayMode;
-import com.iformall.enums.EnumPayShare;
-import com.iformall.enums.EnumUserIsSubscribe;
 import com.iformall.exception.MallinkException;
 import com.iformall.mapper.WxCUserBasicInfoMapper;
 import com.iformall.mapper.WxCUserMapper;
@@ -27,6 +13,7 @@ import com.iformall.pay.WxMicroPayOrderSP;
 import com.iformall.pay.WxPay;
 import com.iformall.pay.WxPayment;
 import com.iformall.service.WxCUserService;
+import com.iformall.service.order.entity.WxComposeChildOrderShare;
 import com.iformall.service.order.entity.WxComposeOrder;
 import com.iformall.service.pay.entity.PayExtraParam;
 import com.iformall.service.pay.service.pay.CPassivePayService;
@@ -37,7 +24,14 @@ import com.iformall.service.pay.service.pay.wx.v2.BaseWxPayV2AdapterService;
 import com.iformall.utils.BeanUtils;
 import com.iformall.utils.Utility;
 import lombok.extern.slf4j.Slf4j;
-import me.chanjar.weixin.common.error.WxErrorException;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 
 @Slf4j
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/BaseWxPayV3AdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/BaseWxPayV3AdapterService.java
index 8ef87684a..4cde01e4a 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/BaseWxPayV3AdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/BaseWxPayV3AdapterService.java
@@ -1,6 +1,5 @@
 package com.iformall.service.pay.service.pay.wx.v3;
 
-import java.io.UnsupportedEncodingException;
 import com.iformall.service.pay.service.pay.wx.BaseWxPayAdapterService;
 
 public class BaseWxPayV3AdapterService extends BaseWxPayAdapterService{
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/entity/V3CombineCloseReq.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/entity/V3CombineCloseReq.java
index ccf20b396..c0ecd9e71 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/entity/V3CombineCloseReq.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/entity/V3CombineCloseReq.java
@@ -1,13 +1,14 @@
 package com.iformall.service.pay.service.pay.wx.v3.entity;
 
-import java.util.ArrayList;
-import java.util.List;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.iformall.domain.po.WxPayAccount;
 import com.iformall.domain.po.WxPayOrder;
 import com.iformall.service.order.entity.WxComposeChildOrderShare;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Data
 public class V3CombineCloseReq {
 
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/entity/V3CombineItemOrder.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/entity/V3CombineItemOrder.java
index 0c17727d3..fc0969398 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/entity/V3CombineItemOrder.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/entity/V3CombineItemOrder.java
@@ -1,14 +1,13 @@
 package com.iformall.service.pay.service.pay.wx.v3.entity;
 
-import java.io.UnsupportedEncodingException;
-
 import com.iformall.domain.po.WxAppinfo;
 import com.iformall.domain.po.WxOrder;
 import com.iformall.domain.po.WxPayAccount;
 import com.iformall.pay.WxPayV3;
-
 import lombok.Data;
 
+import java.io.UnsupportedEncodingException;
+
 @Data
 public class V3CombineItemOrder {
 
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/entity/V3CombinePayCommonMiniAppReq.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/entity/V3CombinePayCommonMiniAppReq.java
index 9e308da98..e6f4148f1 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/entity/V3CombinePayCommonMiniAppReq.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/entity/V3CombinePayCommonMiniAppReq.java
@@ -1,9 +1,9 @@
 package com.iformall.service.pay.service.pay.wx.v3.entity;
 
-import java.util.List;
-
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class V3CombinePayCommonMiniAppReq {
 
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/entity/V3PayQueryReq.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/entity/V3PayQueryReq.java
index 7554b7b18..206a80ea1 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/entity/V3PayQueryReq.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/entity/V3PayQueryReq.java
@@ -1,7 +1,6 @@
 package com.iformall.service.pay.service.pay.wx.v3.entity;
 
 import com.alibaba.fastjson.annotation.JSONField;
-
 import lombok.Data;
 
 @Data
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/miniApp/appPay/WxMiniAppPayV3AdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/miniApp/appPay/WxMiniAppPayV3AdapterService.java
index 266815ef2..a0ffa3035 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/miniApp/appPay/WxMiniAppPayV3AdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/miniApp/appPay/WxMiniAppPayV3AdapterService.java
@@ -1,69 +1,38 @@
 package com.iformall.service.pay.service.pay.wx.v3.miniApp.appPay;
 
-import java.io.File;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.iformall.domain.po.*;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.iformall.common.ErrorCode;
-import com.iformall.common.Result;
-import com.iformall.common.ResultData;
-import com.iformall.enums.EnumOrderStatus;
+import com.iformall.domain.po.*;
 import com.iformall.enums.EnumPayMchType;
 import com.iformall.enums.EnumPayMode;
 import com.iformall.enums.EnumPayShare;
 import com.iformall.enums.EnumPayStatus;
 import com.iformall.exception.MallinkException;
 import com.iformall.exception.PayPlatOrderNotExistsException;
-import com.iformall.pay.WxPay;
-import com.iformall.pay.WxPayOrderP;
-import com.iformall.pay.WxPayOrderSP;
 import com.iformall.pay.WxPayV3;
-import com.iformall.pay.WxPayV3SFT;
-import com.iformall.pay.WxPayment;
 import com.iformall.service.helper.WxPayOrderServiceHelper;
 import com.iformall.service.order.entity.WxComposeOrder;
 import com.iformall.service.pay.entity.PayExtraParam;
 import com.iformall.service.pay.service.pay.CDrivingPayService;
 import com.iformall.service.pay.service.pay.entity.PayAdapterResult;
 import com.iformall.service.pay.service.pay.entity.PayQueryAdapterResult;
-import com.iformall.service.pay.service.pay.wx.sft.entity.SFTCombineItemOrder;
-import com.iformall.service.pay.service.pay.wx.sft.entity.SFTCombinePayCommonMiniAppReq;
-import com.iformall.service.pay.service.pay.wx.sft.entity.SFTCombinePayerReq;
-import com.iformall.service.pay.service.pay.wx.sft.entity.SFTPayAmountReq;
-import com.iformall.service.pay.service.pay.wx.sft.entity.SFTPayCommonMiniAppReq;
 import com.iformall.service.pay.service.pay.wx.sft.entity.SFTPayQueryReq;
-import com.iformall.service.pay.service.pay.wx.sft.entity.SFTPaySettleReq;
-import com.iformall.service.pay.service.pay.wx.sft.entity.SFTPayerReq;
-import com.iformall.service.pay.service.pay.wx.v2.BaseWxPayV2AdapterService;
 import com.iformall.service.pay.service.pay.wx.v3.BaseWxPayV3AdapterService;
-import com.iformall.service.pay.service.pay.wx.v3.entity.V3CombineItemOrder;
-import com.iformall.service.pay.service.pay.wx.v3.entity.V3CombinePayCommonMiniAppReq;
-import com.iformall.service.pay.service.pay.wx.v3.entity.V3CombinePayerReq;
-import com.iformall.service.pay.service.pay.wx.v3.entity.V3PayAmountReq;
-import com.iformall.service.pay.service.pay.wx.v3.entity.V3PayCommonMiniAppReq;
-import com.iformall.service.pay.service.pay.wx.v3.entity.V3PayQueryReq;
-import com.iformall.service.pay.service.pay.wx.v3.entity.V3PaySettleReq;
-import com.iformall.service.pay.service.pay.wx.v3.entity.V3PayerReq;
-import com.iformall.utils.BeanUtils;
+import com.iformall.service.pay.service.pay.wx.v3.entity.*;
 import com.iformall.utils.MaUtil;
-import com.iformall.utils.MapUtil;
 import com.iformall.utils.Utility;
-
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.io.UnsupportedEncodingException;
+import java.util.*;
 
 @Slf4j
 @Service
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/refund/RefundPayAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/refund/RefundPayAdapterService.java
index 8ed51b5de..d8dbd65d0 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/refund/RefundPayAdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/refund/RefundPayAdapterService.java
@@ -1,7 +1,5 @@
 package com.iformall.service.pay.service.refund;
 
-import java.util.Map;
-
 import com.iformall.domain.po.WxAppinfo;
 import com.iformall.domain.po.WxPayAccount;
 import com.iformall.domain.po.WxPayOrder;
@@ -11,6 +9,8 @@ import com.iformall.enums.EnumPayWay;
 import com.iformall.service.pay.service.refund.entity.RefundAdapterResult;
 import com.iformall.service.pay.service.refund.entity.RefundNotifyAdapterResult;
 
+import java.util.Map;
+
 public interface RefundPayAdapterService {
 
 	/**
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/refund/douyin/v2/TtRefundAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/refund/douyin/v2/TtRefundAdapterService.java
index e34836021..c0de07232 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/refund/douyin/v2/TtRefundAdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/refund/douyin/v2/TtRefundAdapterService.java
@@ -4,12 +4,8 @@ package com.iformall.service.pay.service.refund.douyin.v2;
 import com.alibaba.fastjson.JSON;
 import com.iformall.common.ErrorCode;
 import com.iformall.domain.po.*;
-import com.iformall.douyin.pay.DouYinPayHelper;
 import com.iformall.douyin.pay.TtPayService;
 import com.iformall.douyin.pay.exception.TtPayException;
-import com.iformall.douyin.pay.orderQuery.QueryRefundResult;
-import com.iformall.douyin.pay.preOrder.CreateRefund;
-import com.iformall.douyin.pay.preOrder.CreateRefundResult;
 import com.iformall.douyin.payv2.request.TtPayRefundQueryV2Request;
 import com.iformall.douyin.payv2.request.TtPayRefundV2Request;
 import com.iformall.douyin.payv2.request.TtRefundAuditMsgRequest;
@@ -19,7 +15,6 @@ import com.iformall.enums.EnumPayType;
 import com.iformall.enums.EnumPayWay;
 import com.iformall.enums.EnumRefundStatus;
 import com.iformall.exception.MallinkException;
-import com.iformall.mapper.WxPayAccountMapper;
 import com.iformall.mapper.WxPayOrderMapper;
 import com.iformall.mapper.WxRefundOrderMapper;
 import com.iformall.service.WxAppinfoService;
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/refund/douyin/v3/TtOpenRefundAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/refund/douyin/v3/TtOpenRefundAdapterService.java
index d415e1906..c12ec2e23 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/refund/douyin/v3/TtOpenRefundAdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/refund/douyin/v3/TtOpenRefundAdapterService.java
@@ -4,8 +4,6 @@ package com.iformall.service.pay.service.refund.douyin.v3;
 import com.alibaba.fastjson.JSON;
 import com.iformall.common.ErrorCode;
 import com.iformall.domain.po.*;
-import com.iformall.douyin.pay.TtPayService;
-import com.iformall.douyin.pay.exception.TtPayException;
 import com.iformall.douyin.payv2.request.TtPayRefundQueryV2Request;
 import com.iformall.douyin.payv2.request.TtPayRefundV2Request;
 import com.iformall.douyin.payv2.request.TtRefundAuditMsgRequest;
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/refund/entity/RefundNotifyAdapterResult.java b/mallinkService/src/main/java/com/iformall/service/pay/service/refund/entity/RefundNotifyAdapterResult.java
index ed47847a9..91de30280 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/refund/entity/RefundNotifyAdapterResult.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/refund/entity/RefundNotifyAdapterResult.java
@@ -1,9 +1,9 @@
 package com.iformall.service.pay.service.refund.entity;
 
-import java.io.Serializable;
-
 import com.iformall.domain.po.WxRefundOrder;
 
+import java.io.Serializable;
+
 public class RefundNotifyAdapterResult implements Serializable{
 	private static final long serialVersionUID = -6647306162758854293L;
 	private boolean isSuccess;
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/refund/wx/v2/WxRefundAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/refund/wx/v2/WxRefundAdapterService.java
index 8aff5450c..0161092df 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/refund/wx/v2/WxRefundAdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/refund/wx/v2/WxRefundAdapterService.java
@@ -1,19 +1,8 @@
 package com.iformall.service.pay.service.refund.wx.v2;
 
-import java.util.List;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.TreeMap;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.iformall.common.ErrorCode;
-import com.iformall.common.Result;
-import com.iformall.common.ResultData;
 import com.iformall.domain.po.WxAppinfo;
 import com.iformall.domain.po.WxPayAccount;
 import com.iformall.domain.po.WxPayOrder;
@@ -38,8 +27,14 @@ import com.iformall.utils.BeanUtils;
 import com.iformall.utils.CipherUtil;
 import com.iformall.utils.Utility;
 import com.iformall.utils.XmlUtil;
-
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.TreeMap;
 
 @Slf4j
 @Service
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/refund/wx/v3/WxRefundV3AdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/refund/wx/v3/WxRefundV3AdapterService.java
index 7ac734c8e..fc97644cd 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/refund/wx/v3/WxRefundV3AdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/refund/wx/v3/WxRefundV3AdapterService.java
@@ -1,44 +1,18 @@
 package com.iformall.service.pay.service.refund.wx.v3;
 
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.TreeMap;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.iformall.common.ErrorCode;
-import com.iformall.common.Result;
-import com.iformall.common.ResultData;
-import com.iformall.domain.po.WxAppinfo;
-import com.iformall.domain.po.WxOrder;
-import com.iformall.domain.po.WxPayAccount;
-import com.iformall.domain.po.WxPayOrder;
-import com.iformall.domain.po.WxRefundOrder;
-import com.iformall.enums.EnumPayMchType;
-import com.iformall.enums.EnumPayMode;
-import com.iformall.enums.EnumPayType;
-import com.iformall.enums.EnumPayWay;
-import com.iformall.enums.EnumRefundStatus;
+import com.iformall.domain.po.*;
+import com.iformall.enums.*;
 import com.iformall.exception.MallinkException;
 import com.iformall.mapper.WxAppinfoMapper;
 import com.iformall.mapper.WxPayAccountMapper;
 import com.iformall.mapper.WxPayOrderMapper;
 import com.iformall.mapper.WxRefundOrderMapper;
-import com.iformall.pay.WxPay;
 import com.iformall.pay.WxPayV3;
-import com.iformall.pay.WxPayment;
-import com.iformall.pay.WxRefundOrderP;
-import com.iformall.pay.WxRefundOrderSP;
 import com.iformall.service.WxOrderService;
 import com.iformall.service.WxPayAccountService;
 import com.iformall.service.order.entity.WxComposeChildOrderShare;
@@ -48,13 +22,14 @@ import com.iformall.service.pay.service.refund.entity.RefundNotifyAdapterResult;
 import com.iformall.service.pay.service.refund.wx.v3.entity.V3PayRefundAmountReq;
 import com.iformall.service.pay.service.refund.wx.v3.entity.V3PayRefundGoodsReq;
 import com.iformall.service.pay.service.refund.wx.v3.entity.V3PayRefundReq;
-import com.iformall.utils.BeanUtils;
-import com.iformall.utils.CipherUtil;
 import com.iformall.utils.MaUtil;
-import com.iformall.utils.Utility;
-import com.iformall.utils.XmlUtil;
-
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import java.io.UnsupportedEncodingException;
+import java.util.*;
 
 @Slf4j
 @Service
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/refund/wx/v3/entity/V3PayRefundReq.java b/mallinkService/src/main/java/com/iformall/service/pay/service/refund/wx/v3/entity/V3PayRefundReq.java
index 99cac55b3..53d2d5be7 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/refund/wx/v3/entity/V3PayRefundReq.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/refund/wx/v3/entity/V3PayRefundReq.java
@@ -1,9 +1,9 @@
 package com.iformall.service.pay.service.refund.wx.v3.entity;
 
-import java.util.List;
-
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class V3PayRefundReq {
 
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/share/PayShareAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/share/PayShareAdapterService.java
index 8527ae0eb..16640bf0f 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/share/PayShareAdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/share/PayShareAdapterService.java
@@ -1,21 +1,17 @@
 package com.iformall.service.pay.service.share;
 
-import java.util.List;
-import java.util.Map;
-
 import com.alibaba.fastjson.JSONArray;
-import com.iformall.common.ResultData;
-import com.iformall.domain.dto.WxSharingOrderDto;
 import com.iformall.domain.po.*;
 import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.enums.*;
+import com.iformall.enums.EnumPayWay;
 import com.iformall.exception.MallinkException;
-import com.iformall.service.pay.service.share.entity.ShareAccountResult;
-import com.iformall.service.pay.service.share.entity.PayShareCalculateAmount;
 import com.iformall.service.pay.service.share.entity.PayShareQueryResult;
 import com.iformall.service.pay.service.share.entity.PayShareResult;
+import com.iformall.service.pay.service.share.entity.ShareAccountResult;
 import com.iformall.service.pay.service.share.entity.ShareNotifyAdapterResult;
 
+import java.util.Map;
+
 /**
  * 分账接口
  * @author alascor
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/share/PayShareBaseAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/share/PayShareBaseAdapterService.java
index 1dc736753..5b9665b35 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/share/PayShareBaseAdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/share/PayShareBaseAdapterService.java
@@ -1,10 +1,5 @@
 package com.iformall.service.pay.service.share;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -25,6 +20,10 @@ import com.iformall.utils.BeanUtils;
 import com.iformall.utils.Utility;
 import lombok.extern.slf4j.Slf4j;
 
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
 @Slf4j
 public abstract class PayShareBaseAdapterService implements PayShareAdapterService{
 	
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/v2/TtPayShareService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/v2/TtPayShareService.java
index 2924c8631..915ab325b 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/v2/TtPayShareService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/v2/TtPayShareService.java
@@ -10,7 +10,6 @@ import com.iformall.douyin.pay.TtPayService;
 import com.iformall.douyin.pay.enums.MerchantImportStatus;
 import com.iformall.douyin.pay.exception.TtPayException;
 import com.iformall.douyin.payv2.request.ProfitSharingRequest;
-import com.iformall.douyin.payv2.result.ProfitSharingResult;
 import com.iformall.douyin.payv2.result.TtSettleResult;
 import com.iformall.enums.*;
 import com.iformall.exception.MallinkException;
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/v3/TtOpenShareService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/v3/TtOpenShareService.java
index 5c74c0ac6..4a381bfdb 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/v3/TtOpenShareService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/v3/TtOpenShareService.java
@@ -6,14 +6,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.iformall.common.ErrorCode;
 import com.iformall.domain.po.*;
 import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.douyin.pay.TtPayService;
 import com.iformall.douyin.pay.enums.MerchantImportStatus;
-import com.iformall.douyin.pay.exception.TtPayException;
 import com.iformall.douyin.payv2.request.ProfitSharingRequest;
-import com.iformall.douyin.payv2.result.ProfitSharingResult;
 import com.iformall.douyin.payv2.result.TtSettleResult;
 import com.iformall.douyin.web.api.order.TtWebPayService;
-import com.iformall.douyin.web.api.web.TtWebService;
 import com.iformall.enums.*;
 import com.iformall.exception.MallinkException;
 import com.iformall.mapper.*;
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/share/entity/PayShareCalculateAmount.java b/mallinkService/src/main/java/com/iformall/service/pay/service/share/entity/PayShareCalculateAmount.java
index 1af10f36c..0a6d0203f 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/share/entity/PayShareCalculateAmount.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/share/entity/PayShareCalculateAmount.java
@@ -1,10 +1,10 @@
 package com.iformall.service.pay.service.share.entity;
 
-import java.io.Serializable;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
+import java.io.Serializable;
+
 @Data
 @AllArgsConstructor
 public class PayShareCalculateAmount implements Serializable{
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/share/entity/PayShareQueryResult.java b/mallinkService/src/main/java/com/iformall/service/pay/service/share/entity/PayShareQueryResult.java
index ae72704d0..9f8f75436 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/share/entity/PayShareQueryResult.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/share/entity/PayShareQueryResult.java
@@ -1,11 +1,11 @@
 package com.iformall.service.pay.service.share.entity;
 
-import java.io.Serializable;
-import java.util.List;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.util.List;
+
 @Data
 @AllArgsConstructor
 public class PayShareQueryResult implements Serializable{
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/share/entity/PayShareQueryResultReceivers.java b/mallinkService/src/main/java/com/iformall/service/pay/service/share/entity/PayShareQueryResultReceivers.java
index 7ecbf4e39..702851dad 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/share/entity/PayShareQueryResultReceivers.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/share/entity/PayShareQueryResultReceivers.java
@@ -1,10 +1,9 @@
 package com.iformall.service.pay.service.share.entity;
 
-import java.io.Serializable;
-
-import lombok.AllArgsConstructor;
 import lombok.Data;
 
+import java.io.Serializable;
+
 @Data
 public class PayShareQueryResultReceivers implements Serializable{
 
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/share/entity/PayShareResult.java b/mallinkService/src/main/java/com/iformall/service/pay/service/share/entity/PayShareResult.java
index 044326a76..8318441c3 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/share/entity/PayShareResult.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/share/entity/PayShareResult.java
@@ -1,10 +1,10 @@
 package com.iformall.service.pay.service.share.entity;
 
-import java.io.Serializable;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
+import java.io.Serializable;
+
 @Data
 @AllArgsConstructor
 public class PayShareResult implements Serializable{
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/share/entity/ShareAccountResult.java b/mallinkService/src/main/java/com/iformall/service/pay/service/share/entity/ShareAccountResult.java
index 70685b3e8..f01f12f84 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/share/entity/ShareAccountResult.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/share/entity/ShareAccountResult.java
@@ -1,10 +1,10 @@
 package com.iformall.service.pay.service.share.entity;
 
-import java.io.Serializable;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
+import java.io.Serializable;
+
 @Data
 @AllArgsConstructor
 public class ShareAccountResult implements Serializable{
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/share/entity/ShareNotifyAdapterResult.java b/mallinkService/src/main/java/com/iformall/service/pay/service/share/entity/ShareNotifyAdapterResult.java
index c60704d3f..38ca0c373 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/share/entity/ShareNotifyAdapterResult.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/share/entity/ShareNotifyAdapterResult.java
@@ -1,8 +1,9 @@
 package com.iformall.service.pay.service.share.entity;
 
-import java.io.Serializable;
 import com.iformall.domain.po.WxPayOrder;
 
+import java.io.Serializable;
+
 public class ShareNotifyAdapterResult implements Serializable{
 	private static final long serialVersionUID = -6647306162758854293L;
 	private boolean isSuccess;
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/sft/WxPayShareSFTService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/sft/WxPayShareSFTService.java
index edea018a9..2825e0654 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/sft/WxPayShareSFTService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/sft/WxPayShareSFTService.java
@@ -1,30 +1,30 @@
 package com.iformall.service.pay.service.share.wx.sft;
 
-import java.util.*;
-
-import com.iformall.domain.po.*;
-import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.enums.*;
-import com.iformall.mapper.*;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.iformall.common.ErrorCode;
+import com.iformall.domain.po.*;
+import com.iformall.domain.po.base.TenantEntity;
+import com.iformall.enums.EnumMerchantSubsidyType;
+import com.iformall.enums.EnumPayWay;
 import com.iformall.exception.MallinkException;
+import com.iformall.mapper.*;
 import com.iformall.service.WxProfitSharingReceiverService;
 import com.iformall.service.pay.service.share.PayShareBaseAdapterService;
-import com.iformall.service.pay.service.share.entity.ShareAccountResult;
 import com.iformall.service.pay.service.share.entity.PayShareQueryResult;
 import com.iformall.service.pay.service.share.entity.PayShareResult;
+import com.iformall.service.pay.service.share.entity.ShareAccountResult;
 import com.iformall.service.pay.service.share.entity.ShareNotifyAdapterResult;
 import com.iformall.utils.XmlUtil;
-
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.TreeMap;
 
 @Slf4j
 @Service
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v2/WxPayShareService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v2/WxPayShareService.java
index 5294533f2..0af1ae8c8 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v2/WxPayShareService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v2/WxPayShareService.java
@@ -1,37 +1,34 @@
 package com.iformall.service.pay.service.share.wx.v2;
 
-import java.text.ParseException;
-import java.util.*;
-
-import com.iformall.domain.po.*;
-import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.enums.*;
-import com.iformall.mapper.*;
-
-import com.iformall.service.WxProfitPaymentReceiverService;
-import com.iformall.service.WxProfitSharingReceiverService;
-import com.iformall.utils.*;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.iformall.common.ErrorCode;
+import com.iformall.domain.po.*;
+import com.iformall.domain.po.base.TenantEntity;
+import com.iformall.enums.*;
 import com.iformall.exception.MallinkException;
-import com.iformall.pay.WxPayment;
-import com.iformall.pay.WxProfitSharing;
-import com.iformall.pay.WxProfitSharingFinishP;
-import com.iformall.pay.WxProfitSharingP;
-import com.iformall.pay.WxProfitSharingQueryP;
+import com.iformall.mapper.WxAppinfoMapper;
+import com.iformall.mapper.WxPayAccountMapper;
+import com.iformall.mapper.WxPayOrderMapper;
+import com.iformall.pay.*;
+import com.iformall.service.WxProfitPaymentReceiverService;
+import com.iformall.service.WxProfitSharingReceiverService;
 import com.iformall.service.pay.service.share.PayShareBaseAdapterService;
-import com.iformall.service.pay.service.share.entity.ShareAccountResult;
 import com.iformall.service.pay.service.share.entity.PayShareQueryResult;
 import com.iformall.service.pay.service.share.entity.PayShareResult;
+import com.iformall.service.pay.service.share.entity.ShareAccountResult;
 import com.iformall.service.pay.service.share.entity.ShareNotifyAdapterResult;
-
+import com.iformall.utils.BeanUtils;
+import com.iformall.utils.Utility;
+import com.iformall.utils.XmlUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.ParseException;
+import java.util.*;
 
 @Slf4j
 @Service
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v3/WxPayShareV3Service.java b/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v3/WxPayShareV3Service.java
index c11d171fb..be67aa5b4 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v3/WxPayShareV3Service.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v3/WxPayShareV3Service.java
@@ -1,43 +1,26 @@
 package com.iformall.service.pay.service.share.wx.v3;
 
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.security.GeneralSecurityException;
-import java.text.ParseException;
-import java.util.*;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.WxPayService;
-import com.iformall.common.IdWorker;
-import com.iformall.domain.dto.WxSharingOrderDto;
+import com.iformall.common.ErrorCode;
 import com.iformall.domain.po.*;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.enums.*;
-import com.iformall.mapper.*;
-import com.iformall.service.WxProfitPaymentReceiverService;
-import com.iformall.utils.Constant;
-import com.iformall.utils.RedisCacheUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.iformall.common.ErrorCode;
-import com.iformall.common.ResultData;
 import com.iformall.exception.MallinkException;
+import com.iformall.mapper.WxAppinfoMapper;
+import com.iformall.mapper.WxPayAccountMapper;
+import com.iformall.mapper.WxPayOrderMapper;
 import com.iformall.pay.WxPayV3;
 import com.iformall.service.WxPayAccountService;
+import com.iformall.service.WxProfitPaymentReceiverService;
 import com.iformall.service.WxProfitSharingReceiverService;
-import com.iformall.service.order.util.OrderHelper;
 import com.iformall.service.pay.service.share.PayShareBaseAdapterService;
-import com.iformall.service.pay.service.share.entity.ShareAccountResult;
-import com.iformall.service.pay.service.share.entity.PayShareCalculateAmount;
 import com.iformall.service.pay.service.share.entity.PayShareQueryResult;
 import com.iformall.service.pay.service.share.entity.PayShareResult;
+import com.iformall.service.pay.service.share.entity.ShareAccountResult;
 import com.iformall.service.pay.service.share.entity.ShareNotifyAdapterResult;
 import com.iformall.service.pay.service.share.wx.v3.entity.V3PayShareQueryReq;
 import com.iformall.service.pay.service.share.wx.v3.entity.V3PayShareReq;
@@ -45,6 +28,16 @@ import com.iformall.service.pay.service.share.wx.v3.entity.V3PayShareUnfreezeReq
 import com.iformall.utils.MaUtil;
 import com.iformall.utils.Utility;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.security.GeneralSecurityException;
+import java.text.ParseException;
+import java.util.*;
 
 @Slf4j
 @Service
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v3/entity/V3PayShareReq.java b/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v3/entity/V3PayShareReq.java
index 96b613770..8b4b56dd4 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v3/entity/V3PayShareReq.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v3/entity/V3PayShareReq.java
@@ -1,7 +1,5 @@
 package com.iformall.service.pay.service.share.wx.v3.entity;
 
-import com.alibaba.fastjson.JSONArray;
-
 import lombok.Data;
 
 import java.util.List;
diff --git a/mallinkService/src/main/java/com/iformall/service/sys/MallSaleTypeService.java b/mallinkService/src/main/java/com/iformall/service/sys/MallSaleTypeService.java
index 7eb3db38e..3494cd67f 100644
--- a/mallinkService/src/main/java/com/iformall/service/sys/MallSaleTypeService.java
+++ b/mallinkService/src/main/java/com/iformall/service/sys/MallSaleTypeService.java
@@ -1,7 +1,6 @@
 package com.iformall.service.sys;
 
 import com.github.pagehelper.PageInfo;
-import com.iformall.domain.po.MallPermission;
 import com.iformall.domain.po.MallSaleType;
 
 import java.util.List;
diff --git a/mallinkService/src/main/java/com/iformall/service/tags/TagsDeveloper.java b/mallinkService/src/main/java/com/iformall/service/tags/TagsDeveloper.java
index b8bdc47ce..53180f998 100644
--- a/mallinkService/src/main/java/com/iformall/service/tags/TagsDeveloper.java
+++ b/mallinkService/src/main/java/com/iformall/service/tags/TagsDeveloper.java
@@ -1,10 +1,10 @@
 package com.iformall.service.tags;
 
-import java.util.List;
-
 import com.iformall.domain.po.WxTags;
 import com.iformall.domain.po.base.TenantEntity;
 
+import java.util.List;
+
 public interface TagsDeveloper {
 
 	List getTagList( TenantEntity tenantEntity,Object obj);
diff --git a/mallinkService/src/main/java/com/iformall/service/tags/jinmao/JinMaoOrderTagsDeveloper.java b/mallinkService/src/main/java/com/iformall/service/tags/jinmao/JinMaoOrderTagsDeveloper.java
index 70e6110ff..cac74c040 100644
--- a/mallinkService/src/main/java/com/iformall/service/tags/jinmao/JinMaoOrderTagsDeveloper.java
+++ b/mallinkService/src/main/java/com/iformall/service/tags/jinmao/JinMaoOrderTagsDeveloper.java
@@ -1,12 +1,5 @@
 package com.iformall.service.tags.jinmao;
 
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.iformall.domain.po.JmSportOrder;
 import com.iformall.domain.po.WxCUserBasicInfo;
 import com.iformall.domain.po.WxTags;
@@ -17,6 +10,12 @@ import com.iformall.mapper.WxCUserBasicInfoMapper;
 import com.iformall.service.WxCUserTagsService;
 import com.iformall.service.helper.WxCUserTagsServiceHelper;
 import com.iformall.service.tags.TagsDeveloper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class JinMaoOrderTagsDeveloper implements TagsDeveloper {
diff --git a/mallinkService/src/main/java/com/iformall/service/tags/jinmao/JinMaoUserTagsDeveloper.java b/mallinkService/src/main/java/com/iformall/service/tags/jinmao/JinMaoUserTagsDeveloper.java
index 43ae986fe..8b31bd1b7 100644
--- a/mallinkService/src/main/java/com/iformall/service/tags/jinmao/JinMaoUserTagsDeveloper.java
+++ b/mallinkService/src/main/java/com/iformall/service/tags/jinmao/JinMaoUserTagsDeveloper.java
@@ -1,19 +1,17 @@
 package com.iformall.service.tags.jinmao;
 
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.iformall.domain.po.WxCUserBasicInfo;
 import com.iformall.domain.po.WxTags;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.mapper.WxCUserBasicInfoMapper;
 import com.iformall.service.WxCUserTagsService;
 import com.iformall.service.helper.WxCUserTagsServiceHelper;
-import com.iformall.service.impl.WxCUserTagsServiceImpl;
 import com.iformall.service.tags.TagsDeveloper;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 @Service
 public class JinMaoUserTagsDeveloper implements TagsDeveloper{
diff --git a/mallinkService/src/main/java/com/iformall/service/tt/TtOrderService.java b/mallinkService/src/main/java/com/iformall/service/tt/TtOrderService.java
index a1cdfe328..595b472d5 100644
--- a/mallinkService/src/main/java/com/iformall/service/tt/TtOrderService.java
+++ b/mallinkService/src/main/java/com/iformall/service/tt/TtOrderService.java
@@ -1,15 +1,12 @@
 package com.iformall.service.tt;
 
 import com.github.pagehelper.PageInfo;
-import com.iformall.common.ErrorCode;
 import com.iformall.common.ResultData;
-import com.iformall.domain.dto.OrderSaveDto;
 import com.iformall.domain.po.WxAppinfo;
 import com.iformall.domain.po.WxPayAccount;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.tt.TtOrder;
 import com.iformall.enums.EnumPayWay;
-import org.springframework.scheduling.annotation.Async;
 
 import java.util.Date;
 import java.util.List;
diff --git a/mallinkService/src/main/java/com/iformall/service/tt/TtUpSettleinService.java b/mallinkService/src/main/java/com/iformall/service/tt/TtUpSettleinService.java
index 082d8508f..4df8827de 100644
--- a/mallinkService/src/main/java/com/iformall/service/tt/TtUpSettleinService.java
+++ b/mallinkService/src/main/java/com/iformall/service/tt/TtUpSettleinService.java
@@ -2,10 +2,7 @@ package com.iformall.service.tt;
 
 import com.github.pagehelper.PageInfo;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.domain.po.tt.TtCoupon;
 import com.iformall.domain.po.tt.TtUpSettlein;
-import org.springframework.scheduling.annotation.Async;
 
 import java.util.List;
 
diff --git a/mallinkService/src/main/java/com/iformall/service/tt/TtVideoLibraryService.java b/mallinkService/src/main/java/com/iformall/service/tt/TtVideoLibraryService.java
index 8a00be163..63930c528 100644
--- a/mallinkService/src/main/java/com/iformall/service/tt/TtVideoLibraryService.java
+++ b/mallinkService/src/main/java/com/iformall/service/tt/TtVideoLibraryService.java
@@ -1,7 +1,6 @@
 package com.iformall.service.tt;
 
 import com.github.pagehelper.PageInfo;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.tt.TtVideoLibrary;
 import org.springframework.scheduling.annotation.Async;
 
diff --git a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtCouponServiceImpl.java
index eaa507b3d..b281992f8 100644
--- a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtCouponServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtCouponServiceImpl.java
@@ -14,7 +14,10 @@ import com.iformall.domain.po.tt.TtUserCollect;
 import com.iformall.enums.EnumTtCouponStatus;
 import com.iformall.enums.EnumTtCouponType;
 import com.iformall.enums.EnumYesOrNo;
-import com.iformall.mapper.*;
+import com.iformall.mapper.TtCouponMapper;
+import com.iformall.mapper.TtUserCollectMapper;
+import com.iformall.mapper.TtUserFollowMapper;
+import com.iformall.mapper.WxMerchantMapper;
 import com.iformall.service.tt.TtCouponService;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -24,7 +27,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 
 @Service
diff --git a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java
index cda211c07..157c190af 100644
--- a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java
@@ -5,7 +5,9 @@ import com.github.pagehelper.PageInfo;
 import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.WxAppinfo;
+import com.iformall.domain.po.WxMerchant;
+import com.iformall.domain.po.WxPayAccount;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.tt.TtCUser;
 import com.iformall.domain.po.tt.TtCoupon;
@@ -16,8 +18,13 @@ import com.iformall.douyin.pay.preOrder.CreatePreOrderResult;
 import com.iformall.douyin.pay.preOrder.DouYinCreatePreOrder;
 import com.iformall.enums.*;
 import com.iformall.exception.MallinkException;
-import com.iformall.mapper.*;
-import com.iformall.service.*;
+import com.iformall.mapper.TtCUserMapper;
+import com.iformall.mapper.TtCouponMapper;
+import com.iformall.mapper.TtOrderMapper;
+import com.iformall.mapper.WxMerchantMapper;
+import com.iformall.service.TtCUserService;
+import com.iformall.service.WxAppinfoService;
+import com.iformall.service.WxPayAccountService;
 import com.iformall.service.tt.TtOrderService;
 import com.iformall.utils.Constant;
 import com.iformall.utils.RedisLock;
@@ -29,8 +36,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 
 @Service
diff --git a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtUpSettleinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtUpSettleinServiceImpl.java
index a576b04d4..d89cf2bbf 100644
--- a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtUpSettleinServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtUpSettleinServiceImpl.java
@@ -5,7 +5,7 @@ import com.github.pagehelper.PageInfo;
 import com.iformall.common.IdWorker;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.tt.TtUpSettlein;
-import com.iformall.mapper.*;
+import com.iformall.mapper.TtUpSettleinMapper;
 import com.iformall.service.tt.TtUpSettleinService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtVideoLibraryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtVideoLibraryServiceImpl.java
index 8d73b4b70..6bb160b5c 100644
--- a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtVideoLibraryServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtVideoLibraryServiceImpl.java
@@ -2,36 +2,17 @@ package com.iformall.service.tt.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.iformall.common.ErrorCode;
 import com.iformall.common.IdWorker;
-import com.iformall.common.ResultData;
-import com.iformall.domain.po.WxAppinfo;
-import com.iformall.domain.po.WxCUserBasicInfo;
-import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.domain.po.tt.TtCoupon;
-import com.iformall.domain.po.tt.TtOrder;
 import com.iformall.domain.po.tt.TtVideoLibrary;
-import com.iformall.douyin.pay.DouYinPayHelper;
-import com.iformall.douyin.pay.orderQuery.OrderQueryResult;
-import com.iformall.douyin.pay.preOrder.CreatePreOrderResult;
-import com.iformall.douyin.pay.preOrder.DouYinCreatePreOrder;
-import com.iformall.enums.*;
-import com.iformall.exception.MallinkException;
-import com.iformall.mapper.TtOrderMapper;
+import com.iformall.enums.EnumYesOrNo;
 import com.iformall.mapper.TtVideoLibraryMapper;
-import com.iformall.service.WxAppinfoService;
-import com.iformall.service.WxCUserBasicInfoService;
-import com.iformall.service.tt.TtCouponService;
-import com.iformall.service.tt.TtOrderService;
 import com.iformall.service.tt.TtVideoLibraryService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
 
 
 @Service
diff --git a/mallinkService/src/main/java/com/iformall/service/util/CouponCacheUtils.java b/mallinkService/src/main/java/com/iformall/service/util/CouponCacheUtils.java
index 844b5e44f..a7e43007f 100644
--- a/mallinkService/src/main/java/com/iformall/service/util/CouponCacheUtils.java
+++ b/mallinkService/src/main/java/com/iformall/service/util/CouponCacheUtils.java
@@ -1,18 +1,16 @@
 package com.iformall.service.util;
 
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.data.redis.core.RedisTemplate;
-
 import com.github.pagehelper.PageInfo;
 import com.iformall.domain.po.WxCoupon;
 import com.iformall.domain.po.WxCouponChannel;
-import com.iformall.domain.po.WxMall;
 import com.iformall.domain.vo.WxMerchantVo;
 import com.iformall.enums.EnumCacheKey;
 import com.iformall.utils.RedisCacheUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.data.redis.core.RedisTemplate;
+
+import java.util.List;
+import java.util.Map;
 
 public class CouponCacheUtils {
 	
diff --git a/mallinkService/src/main/java/com/iformall/sms/SMSResult.java b/mallinkService/src/main/java/com/iformall/sms/SMSResult.java
index 30969af21..cf4e1401e 100644
--- a/mallinkService/src/main/java/com/iformall/sms/SMSResult.java
+++ b/mallinkService/src/main/java/com/iformall/sms/SMSResult.java
@@ -1,7 +1,5 @@
 package com.iformall.sms;
 
-import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
-import com.iformall.sms.aliyun.bean.SMS;
 import lombok.Data;
 
 
diff --git a/mallinkService/src/main/java/com/iformall/sms/aliyun/AliyunSMS.java b/mallinkService/src/main/java/com/iformall/sms/aliyun/AliyunSMS.java
index f290c6edc..58d064be7 100644
--- a/mallinkService/src/main/java/com/iformall/sms/aliyun/AliyunSMS.java
+++ b/mallinkService/src/main/java/com/iformall/sms/aliyun/AliyunSMS.java
@@ -12,10 +12,8 @@ import com.iformall.sms.EnumSMSChannel;
 import com.iformall.sms.SMSExcutor;
 import com.iformall.sms.SMSResult;
 import com.iformall.sms.aliyun.bean.*;
-import com.iformall.utils.DateUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.text.SimpleDateFormat;
diff --git a/mallinkService/src/main/java/com/iformall/sms/wiwide/WiwideEntry.java b/mallinkService/src/main/java/com/iformall/sms/wiwide/WiwideEntry.java
index f878b1e45..52a4671aa 100644
--- a/mallinkService/src/main/java/com/iformall/sms/wiwide/WiwideEntry.java
+++ b/mallinkService/src/main/java/com/iformall/sms/wiwide/WiwideEntry.java
@@ -1,23 +1,16 @@
 package com.iformall.sms.wiwide;
 
-import java.io.UnsupportedEncodingException;
-import java.io.UnsupportedEncodingException;
-import java.security.Key;
-import java.util.Calendar;
-import java.util.Date;
-
-import javax.crypto.Cipher;
-import javax.crypto.spec.SecretKeySpec;
-
 import com.iformall.common.ErrorCode;
 import com.iformall.domain.po.WxWiWideInfo;
 import com.iformall.exception.MallinkException;
 import com.iformall.utils.Base64Util;
-
-import com.iformall.utils.DataUtil;
 import lombok.extern.slf4j.Slf4j;
 
-import static cn.afterturn.easypoi.excel.entity.enmus.CellValueType.Date;
+import javax.crypto.Cipher;
+import javax.crypto.spec.SecretKeySpec;
+import java.io.UnsupportedEncodingException;
+import java.security.Key;
+import java.util.Date;
 
 @Slf4j
 public class WiwideEntry {
diff --git a/mallinkService/src/main/java/com/iformall/utils/CreditUtil.java b/mallinkService/src/main/java/com/iformall/utils/CreditUtil.java
index c7c138130..8f130c4c0 100644
--- a/mallinkService/src/main/java/com/iformall/utils/CreditUtil.java
+++ b/mallinkService/src/main/java/com/iformall/utils/CreditUtil.java
@@ -1,14 +1,15 @@
 package com.iformall.utils;
 
 import com.alibaba.fastjson.JSONObject;
-import com.aliyun.oss.common.utils.DateUtil;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.WxCUserBasicInfo;
+import com.iformall.domain.po.WxLevelConfig;
+import com.iformall.domain.po.WxMerchantScoreRules;
+import com.iformall.domain.po.WxScoreRules;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.enums.EnumScoreRules;
 import com.iformall.enums.EnumScoreScaleRules;
 import com.iformall.enums.EnumYesOrNo;
 import com.iformall.mapper.WxLevelConfigMapper;
-import com.iformall.mapper.WxMerchantScoreRulesMapper;
 import com.iformall.service.WxMerchantScoreRulesService;
 import com.iformall.service.WxScoreRulesService;
 import lombok.extern.slf4j.Slf4j;
diff --git a/mallinkService/src/main/java/com/iformall/utils/DateUtils.java b/mallinkService/src/main/java/com/iformall/utils/DateUtils.java
index 0a92e0532..85ace34ad 100755
--- a/mallinkService/src/main/java/com/iformall/utils/DateUtils.java
+++ b/mallinkService/src/main/java/com/iformall/utils/DateUtils.java
@@ -8,7 +8,10 @@ import java.sql.Timestamp;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.*;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.Period;
+import java.time.ZoneId;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
 
diff --git a/mallinkService/src/main/java/com/iformall/utils/HttpUtil.java b/mallinkService/src/main/java/com/iformall/utils/HttpUtil.java
index 98964a6bd..92ea98295 100644
--- a/mallinkService/src/main/java/com/iformall/utils/HttpUtil.java
+++ b/mallinkService/src/main/java/com/iformall/utils/HttpUtil.java
@@ -6,27 +6,19 @@ import okhttp3.Request;
 import okhttp3.RequestBody;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.*;
-import org.apache.http.client.CookieStore;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
 import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.BasicCookieStore;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.protocol.HTTP;
-import org.apache.http.ssl.SSLContexts;
 import org.apache.http.util.EntityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.github.binarywang.wxpay.service.WxPayService;
-
-import cn.binarywang.wx.miniapp.api.WxMaService;
-
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.KeyManager;
 import javax.net.ssl.KeyManagerFactory;
@@ -35,12 +27,7 @@ import java.io.*;
 import java.net.URI;
 import java.net.URL;
 import java.nio.charset.Charset;
-import java.security.KeyManagementException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.security.UnrecoverableKeyException;
+import java.security.*;
 import java.security.cert.CertificateException;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/mallinkService/src/main/java/com/iformall/utils/JsonUtil.java b/mallinkService/src/main/java/com/iformall/utils/JsonUtil.java
index 6fd4daa35..838ea5f6f 100644
--- a/mallinkService/src/main/java/com/iformall/utils/JsonUtil.java
+++ b/mallinkService/src/main/java/com/iformall/utils/JsonUtil.java
@@ -12,6 +12,7 @@ import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.HashMap;
diff --git a/mallinkService/src/main/java/com/iformall/utils/MaUtil.java b/mallinkService/src/main/java/com/iformall/utils/MaUtil.java
index 1773b6385..b71504e04 100644
--- a/mallinkService/src/main/java/com/iformall/utils/MaUtil.java
+++ b/mallinkService/src/main/java/com/iformall/utils/MaUtil.java
@@ -3,8 +3,6 @@ package com.iformall.utils;
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
 import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.github.binarywang.wxpay.config.WxPayConfig;
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
@@ -13,16 +11,9 @@ import com.iformall.domain.po.WxAppinfo;
 import com.iformall.domain.po.WxPayAccount;
 import com.iformall.douyin.miniapp.api.TtMaService;
 import com.iformall.douyin.miniapp.api.impl.TtMaServiceImpl;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
 import com.iformall.douyin.pay.TtPayService;
 import com.iformall.douyin.pay.impl.TtPayServiceImpl;
 import com.iformall.douyin.payv2.config.TtPayConfig;
-import com.iformall.douyin.payv2.result.Templateeffabilityimpl;
 import com.iformall.douyin.web.api.goodlifesaas.TtGoodLifeSaasService;
 import com.iformall.douyin.web.api.goodlifesaas.impl.TtGoodLifeSaasServiceImpl;
 import com.iformall.douyin.web.api.order.TtWebPayService;
@@ -33,7 +24,6 @@ import com.iformall.douyin.web.config.TtWebDefaultConfigImpl;
 import com.iformall.douyin.web.enums.TtWebApiBeginEnum;
 import com.iformall.mapper.WxAppinfoMapper;
 import com.iformall.service.WxAppinfoService;
-import lombok.extern.flogger.Flogger;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -41,6 +31,10 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
 @Service
 public class MaUtil {
 
diff --git a/mallinkService/src/main/java/com/iformall/utils/RedisCacheUtils.java b/mallinkService/src/main/java/com/iformall/utils/RedisCacheUtils.java
index d4a3f31e7..790cdb8e3 100644
--- a/mallinkService/src/main/java/com/iformall/utils/RedisCacheUtils.java
+++ b/mallinkService/src/main/java/com/iformall/utils/RedisCacheUtils.java
@@ -1,18 +1,16 @@
 package com.iformall.utils;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.ValueOperations;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.TypeReference;
-import com.iformall.domain.po.WxLevelConfig;
-
 public class RedisCacheUtils {
 
 	private static  T parseJson(String json,Class clazz) {
diff --git a/mallinkService/src/main/java/com/iformall/utils/RedisLock.java b/mallinkService/src/main/java/com/iformall/utils/RedisLock.java
index 1ad01957a..c4bd76802 100644
--- a/mallinkService/src/main/java/com/iformall/utils/RedisLock.java
+++ b/mallinkService/src/main/java/com/iformall/utils/RedisLock.java
@@ -1,5 +1,6 @@
 package com.iformall.utils;
 
+import com.iformall.enums.EnumCacheKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -8,8 +9,6 @@ import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 
-import com.iformall.enums.EnumCacheKey;
-
 import java.util.concurrent.TimeUnit;
 
 /**
diff --git a/mallinkService/src/main/java/com/iformall/utils/UserUtil.java b/mallinkService/src/main/java/com/iformall/utils/UserUtil.java
index 5d9f80a67..4f2130488 100644
--- a/mallinkService/src/main/java/com/iformall/utils/UserUtil.java
+++ b/mallinkService/src/main/java/com/iformall/utils/UserUtil.java
@@ -1,7 +1,6 @@
 package com.iformall.utils;
 
 import com.iformall.common.ErrorCode;
-import com.iformall.domain.po.WxCUser;
 import com.iformall.domain.po.WxCUserBasicInfo;
 import com.iformall.exception.MallinkException;
 import org.apache.commons.lang3.StringUtils;
diff --git a/mallinkService/src/main/java/com/iformall/utils/WordUtil.java b/mallinkService/src/main/java/com/iformall/utils/WordUtil.java
index e37f45469..3d92ce4c5 100644
--- a/mallinkService/src/main/java/com/iformall/utils/WordUtil.java
+++ b/mallinkService/src/main/java/com/iformall/utils/WordUtil.java
@@ -3,10 +3,14 @@ package com.iformall.utils;
 import cn.afterturn.easypoi.word.WordExportUtil;
 import com.iformall.domain.vo.WordDocTableVo;
 import org.apache.commons.io.FileUtils;
-import org.apache.poi.xwpf.usermodel.*;
+import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.apache.poi.xwpf.usermodel.XWPFTable;
+import org.apache.poi.xwpf.usermodel.XWPFTableCell;
+import org.apache.poi.xwpf.usermodel.XWPFTableRow;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.util.Assert;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
diff --git a/mallinkService/src/main/java/com/iformall/utils/sign/SignUtils.java b/mallinkService/src/main/java/com/iformall/utils/sign/SignUtils.java
index 6cead21f0..777eeda4e 100644
--- a/mallinkService/src/main/java/com/iformall/utils/sign/SignUtils.java
+++ b/mallinkService/src/main/java/com/iformall/utils/sign/SignUtils.java
@@ -5,7 +5,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.security.MessageDigest;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Map;
 
 public class SignUtils {
 
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/config/RestFilter.java b/mallinkTTAdmin/src/main/java/com/iformall/config/RestFilter.java
index 4f9298433..b5d331492 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/config/RestFilter.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/config/RestFilter.java
@@ -1,16 +1,10 @@
 package com.iformall.config;
 
-import java.io.IOException;
-import java.util.Optional;
- 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import javax.servlet.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Optional;
  
 /**
  * 前后端分离RESTful接口过滤器
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/config/ShiroConfig.java b/mallinkTTAdmin/src/main/java/com/iformall/config/ShiroConfig.java
index 7e16e23c8..9b3ec82ae 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/config/ShiroConfig.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/config/ShiroConfig.java
@@ -1,6 +1,5 @@
 package com.iformall.config;
 
-import com.iformall.service.MallPermissionService;
 import com.iformall.shiro.MyRetryLimitCredentialsMatcher;
 import com.iformall.shiro.MyShiroRealm;
 import org.apache.shiro.mgt.SecurityManager;
@@ -13,8 +12,6 @@ import org.apache.shiro.web.session.mgt.DefaultWebSessionManager;
 import org.crazycake.shiro.RedisCacheManager;
 import org.crazycake.shiro.RedisManager;
 import org.crazycake.shiro.RedisSessionDAO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/config/ShiroLoginFilter.java b/mallinkTTAdmin/src/main/java/com/iformall/config/ShiroLoginFilter.java
index 67c07385e..b3cb49d5a 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/config/ShiroLoginFilter.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/config/ShiroLoginFilter.java
@@ -1,13 +1,12 @@
 package com.iformall.config;
 
+import com.alibaba.fastjson.JSON;
+import com.iformall.common.ResultData;
+import org.apache.shiro.web.filter.authc.FormAuthenticationFilter;
+
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
-
-import org.apache.shiro.web.filter.authc.FormAuthenticationFilter;
-
-import com.alibaba.fastjson.JSON;
-import com.iformall.common.ResultData;
 public class ShiroLoginFilter extends FormAuthenticationFilter {
 
     @Override
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/base/BaseController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/base/BaseController.java
index 6c1fff10e..8063ec1c8 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/controller/base/BaseController.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/base/BaseController.java
@@ -1,22 +1,13 @@
 package com.iformall.controller.base;
 
-import java.beans.PropertyEditorSupport;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
 import com.iformall.common.ErrorCode;
 import com.iformall.domain.po.MallUserInfo;
-import com.iformall.domain.po.WxAppinfo;
 import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.douyin.miniapp.api.TtMaService;
 import com.iformall.exception.MallinkException;
 import com.iformall.service.WxAppinfoService;
 import com.iformall.shiro.UserSession;
-import com.iformall.utils.Constant;
 import com.iformall.utils.IPUtil;
 import com.iformall.utils.MaUtil;
-import me.chanjar.weixin.common.error.WxErrorException;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.session.Session;
@@ -28,6 +19,10 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
+import java.beans.PropertyEditorSupport;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 @RestController
 public class BaseController {
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/EnumController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/EnumController.java
index 9f92ae5b8..99ce9906c 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/EnumController.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/EnumController.java
@@ -8,10 +8,16 @@ import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.lang.reflect.Method;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping("enum")
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java
index 8ac33d2bc..381ddb409 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java
@@ -7,9 +7,9 @@ import com.iformall.common.ErrorCode;
 import com.iformall.common.Result;
 import com.iformall.common.ResultData;
 import com.iformall.controller.base.BaseController;
-import com.iformall.domain.po.base.BaseEntity;
 import com.iformall.domain.po.WxBrand;
 import com.iformall.domain.po.WxMerchant;
+import com.iformall.domain.po.base.BaseEntity;
 import com.iformall.enums.EnumDelFlag;
 import com.iformall.enums.EnumYesOrNo;
 import com.iformall.service.WxBrandService;
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMerchantBUserController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMerchantBUserController.java
index bf6af813f..50a87abd0 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMerchantBUserController.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMerchantBUserController.java
@@ -9,7 +9,9 @@ import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("wxMerchantBUser")
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java
index 060091003..070366d77 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java
@@ -8,19 +8,15 @@ import com.iformall.common.ErrorCode;
 import com.iformall.common.Result;
 import com.iformall.common.ResultData;
 import com.iformall.controller.base.BaseController;
-import com.iformall.domain.po.base.BaseEntity;
 import com.iformall.domain.po.WxMerchant;
-import com.iformall.domain.po.WxProfitSharingReceiver;
+import com.iformall.domain.po.base.BaseEntity;
 import com.iformall.domain.vo.WxMerchantTradeDetailVo;
 import com.iformall.domain.vo.WxMerchantTradeVo;
 import com.iformall.domain.vo.WxMerchantVo;
-import com.iformall.enums.EnumAppPlat;
 import com.iformall.enums.EnumMerchantStatus;
-import com.iformall.enums.EnumPayWay;
 import com.iformall.enums.EnumYesOrNo;
 import com.iformall.service.QrCodeService;
 import com.iformall.service.WxMerchantService;
-import com.iformall.utils.Constant;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -33,7 +29,6 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author gongbiao
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMerchantShopController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMerchantShopController.java
index 49a23b3f6..7cccc547d 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMerchantShopController.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMerchantShopController.java
@@ -13,7 +13,10 @@ import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("wxMerchantShop")
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMiniappThemeController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMiniappThemeController.java
index 764f6c017..98778f393 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMiniappThemeController.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMiniappThemeController.java
@@ -6,36 +6,19 @@ import com.iformall.annotation.TenantIgnore;
 import com.iformall.common.ErrorCode;
 import com.iformall.common.Result;
 import com.iformall.common.ResultData;
-import com.iformall.config.WechatWebProperties;
 import com.iformall.controller.base.BaseController;
-import com.iformall.domain.po.*;
-import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.domain.vo.WxWeappInfo;
-import com.iformall.enums.EnumGroupSupport;
-import com.iformall.enums.EnumInvestUserType;
+import com.iformall.domain.po.WxMiniappTheme;
+import com.iformall.domain.po.WxThemeMall;
 import com.iformall.enums.EnumThemeType;
-import com.iformall.enums.EnumUserAdmin;
-import com.iformall.service.*;
-import com.iformall.shiro.PasswordHelper;
-import com.iformall.utils.Constant;
+import com.iformall.service.WxMiniappThemeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
 @RestController
 @Api(description = "MiniappTheme相关接口")
 @RequestMapping("wxMiniappTheme")
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java
index 398c02df9..634d1564b 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java
@@ -25,7 +25,10 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 @RestController
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java
index a8adc5c15..6786c4454 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java
@@ -5,8 +5,8 @@ import com.iformall.annotation.SystemControllerLog;
 import com.iformall.common.Result;
 import com.iformall.common.ResultData;
 import com.iformall.controller.base.BaseController;
-import com.iformall.domain.po.base.BaseEntity;
 import com.iformall.domain.po.WxShop;
+import com.iformall.domain.po.base.BaseEntity;
 import com.iformall.service.WxShopService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxTagsController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxTagsController.java
index f41abb8fc..57b3d2872 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxTagsController.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxTagsController.java
@@ -1,9 +1,13 @@
 package com.iformall.controller.basic;
 
-import java.util.Arrays;
-
 import com.iformall.annotation.SystemControllerLog;
+import com.iformall.common.Result;
+import com.iformall.common.ResultData;
 import com.iformall.controller.base.BaseController;
+import com.iformall.service.WxCUserTagsService;
+import com.iformall.service.WxTagsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,13 +15,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.iformall.common.Result;
-import com.iformall.common.ResultData;
-import com.iformall.service.WxCUserTagsService;
-import com.iformall.service.WxTagsService;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import java.util.Arrays;
 
 @RestController
 @RequestMapping("wxTags")
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java
index 2a7770e4f..1f97252c6 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java
@@ -5,8 +5,8 @@ import com.iformall.annotation.SystemControllerLog;
 import com.iformall.common.Result;
 import com.iformall.common.ResultData;
 import com.iformall.controller.base.BaseController;
-import com.iformall.domain.po.base.BaseEntity;
 import com.iformall.domain.po.WxMsgCallback;
+import com.iformall.domain.po.base.BaseEntity;
 import com.iformall.service.WxMsgCallbackService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java
index f74765559..e8444e84c 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java
@@ -9,7 +9,6 @@ import com.iformall.common.ResultData;
 import com.iformall.controller.base.BaseController;
 import com.iformall.domain.po.WxTemplateMsg;
 import com.iformall.domain.po.base.BaseEntity;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.msg.WxMsg;
 import com.iformall.enums.EnumSendWay;
 import com.iformall.enums.EnumTemplateType;
@@ -27,7 +26,9 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
 import java.io.FileOutputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
 
 /**
  * @author gongbiao
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java
index 8a9ee6640..2245f80a4 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java
@@ -5,8 +5,8 @@ import com.iformall.annotation.SystemControllerLog;
 import com.iformall.common.Result;
 import com.iformall.common.ResultData;
 import com.iformall.controller.base.BaseController;
-import com.iformall.domain.po.base.BaseEntity;
 import com.iformall.domain.po.WxMsgModel;
+import com.iformall.domain.po.base.BaseEntity;
 import com.iformall.service.WxMsgModelService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java
index fdfebc041..524761f54 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java
@@ -5,17 +5,18 @@ import com.iformall.controller.base.BaseController;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.msg.*;
 import com.iformall.enums.*;
-import com.iformall.mapper.WxMsgMapper;
 import com.iformall.mq.MqBaseProducer;
 import com.iformall.service.WxMsgRecordService;
-import com.iformall.service.msg.MsgSendService;
 import com.iformall.service.msg.impl.SendCallBackSmsServiceImpl;
 import com.iformall.utils.JsonUtil;
 import io.swagger.annotations.Api;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import java.util.List;
 
 @RestController
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java
index 7e720295a..6368bf685 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java
@@ -5,8 +5,8 @@ import com.iformall.annotation.SystemControllerLog;
 import com.iformall.common.Result;
 import com.iformall.common.ResultData;
 import com.iformall.controller.base.BaseController;
-import com.iformall.domain.po.base.BaseEntity;
 import com.iformall.domain.po.WxMsgSignature;
+import com.iformall.domain.po.base.BaseEntity;
 import com.iformall.service.WxMsgSignatureService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java
index 52a7eb909..4820107dd 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java
@@ -6,7 +6,6 @@ import com.iformall.common.Result;
 import com.iformall.common.ResultData;
 import com.iformall.controller.base.BaseController;
 import com.iformall.domain.po.WxMsgValidationcode;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.service.WxMsgValidationcodeService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java
index cd9a0814f..daf79fed6 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java
@@ -1,15 +1,12 @@
 package com.iformall.controller.msg;
 
-import com.github.pagehelper.PageInfo;
 import com.iformall.annotation.SystemControllerLog;
 import com.iformall.common.Result;
 import com.iformall.common.ResultData;
 import com.iformall.controller.base.BaseController;
 import com.iformall.domain.po.WxMsgValidationcodeModel;
-import com.iformall.enums.EnumMsgModelReplace;
 import com.iformall.service.WxMsgValidationcodeModelService;
 import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/HomeController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/HomeController.java
index ad1266945..a3a000a9b 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/HomeController.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/HomeController.java
@@ -3,16 +3,22 @@ package com.iformall.controller.sys;
 import com.alibaba.fastjson.JSON;
 import com.google.code.kaptcha.Constants;
 import com.google.code.kaptcha.Producer;
+import com.iformall.annotation.SystemControllerLog;
 import com.iformall.common.ErrorCode;
 import com.iformall.common.Result;
 import com.iformall.common.ResultData;
 import com.iformall.controller.base.BaseController;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.MallUserInfo;
+import com.iformall.domain.po.WxAppinfo;
+import com.iformall.domain.po.WxMall;
+import com.iformall.domain.po.WxMsgValidationcode;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.MallUserInfoVo;
-import com.iformall.enums.*;
+import com.iformall.enums.EnumGroupSupport;
+import com.iformall.enums.EnumMallUserAction;
+import com.iformall.enums.EnumMallUserStatus;
+import com.iformall.enums.EnumMsgModel;
 import com.iformall.exception.MallinkException;
-import com.iformall.annotation.SystemControllerLog;
 import com.iformall.service.*;
 import com.iformall.shiro.UserSession;
 import com.iformall.shiro.UseriFormallToken;
@@ -33,7 +39,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
 import javax.imageio.ImageIO;
 import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java
index 70125f588..6a9d6142c 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java
@@ -6,7 +6,10 @@ import com.iformall.common.ErrorCode;
 import com.iformall.common.Result;
 import com.iformall.common.ResultData;
 import com.iformall.controller.base.BaseController;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.MallRole;
+import com.iformall.domain.po.MallRolePermission;
+import com.iformall.domain.po.MallUserInfo;
+import com.iformall.domain.po.MallUserRole;
 import com.iformall.domain.po.base.BaseEntity;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.enums.EnumUserAdmin;
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/MallUserActionController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/MallUserActionController.java
index ce9921d22..580a84c82 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/MallUserActionController.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/MallUserActionController.java
@@ -12,7 +12,10 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("mallUserAction")
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java
index 39158e41d..768c11555 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java
@@ -6,7 +6,10 @@ import com.iformall.common.ErrorCode;
 import com.iformall.common.Result;
 import com.iformall.common.ResultData;
 import com.iformall.controller.base.BaseController;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.MallRole;
+import com.iformall.domain.po.MallUserInfo;
+import com.iformall.domain.po.MallUserRole;
+import com.iformall.domain.po.WxMsgValidationcode;
 import com.iformall.domain.po.base.BaseEntity;
 import com.iformall.enums.EnumMallUserStatus;
 import com.iformall.enums.EnumUserAdmin;
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java
index ce8bd4740..2783b23e2 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java
@@ -1,40 +1,27 @@
 package com.iformall.controller.sys;
 
 import com.iformall.annotation.SystemControllerLog;
-import com.iformall.common.ErrorCode;
 import com.iformall.common.Result;
 import com.iformall.common.ResultData;
 import com.iformall.controller.base.BaseController;
 import com.iformall.domain.po.MallPermission;
-import com.iformall.domain.po.MallRole;
-import com.iformall.domain.po.MallRolePermission;
 import com.iformall.domain.po.MallUserInfo;
 import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.enums.EnumMenuType;
-import com.iformall.enums.EnumPermissionType;
-import com.iformall.exception.MallinkException;
 import com.iformall.service.MallPermissionService;
-import com.iformall.service.MallRolePermissionService;
-import com.iformall.service.MallRoleService;
 import com.iformall.service.MallUserInfoService;
-import com.iformall.utils.Constant;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.apache.shiro.util.Assert;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.method.HandlerMethod;
-import org.springframework.web.servlet.mvc.condition.PatternsRequestCondition;
-import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
-import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * @author Stormeye Wu
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/SysNoticeController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/SysNoticeController.java
index e3274b55a..a255b82e4 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/SysNoticeController.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/SysNoticeController.java
@@ -8,7 +8,10 @@ import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import java.util.List;
 
 /**
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/UploadController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/UploadController.java
index 496c8af0d..9b201e9a3 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/UploadController.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/UploadController.java
@@ -13,12 +13,18 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping(value = "upload")
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java
index 595c428d5..839a276fb 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java
@@ -43,7 +43,9 @@ import org.springframework.data.redis.core.RedisCallback;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
 import redis.clients.jedis.Protocol;
 import redis.clients.jedis.util.SafeEncoder;
 
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java
index f4613cd31..845880eea 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java
@@ -8,7 +8,10 @@ import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("wxAdminLog")
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java
index 50ce6cae3..198289afc 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java
@@ -3,8 +3,8 @@ package com.iformall.controller.sys;
 import com.iformall.annotation.SystemControllerLog;
 import com.iformall.common.ResultData;
 import com.iformall.controller.base.BaseController;
-import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.WxBusiness;
+import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.vo.WxBusinessDataVo;
 import com.iformall.service.ExcelService;
 import com.iformall.service.WxBusinessService;
@@ -16,11 +16,18 @@ import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping("wxBusiness")
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtCouponController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtCouponController.java
index 0150649bf..c983c92e7 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtCouponController.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtCouponController.java
@@ -9,7 +9,10 @@ import com.iformall.domain.po.WxMerchant;
 import com.iformall.domain.po.base.BaseEntity;
 import com.iformall.domain.po.base.TenantEntity;
 import com.iformall.domain.po.tt.TtCoupon;
-import com.iformall.enums.*;
+import com.iformall.enums.EnumDelFlag;
+import com.iformall.enums.EnumMerchantStatus;
+import com.iformall.enums.EnumTtCouponStatus;
+import com.iformall.enums.EnumTtCouponType;
 import com.iformall.exception.MallinkException;
 import com.iformall.service.WxFlowService;
 import com.iformall.service.WxMerchantService;
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtOrderController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtOrderController.java
index 1551ff002..31ef6972e 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtOrderController.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtOrderController.java
@@ -3,10 +3,7 @@ package com.iformall.controller.tt;
 import com.iformall.common.ErrorCode;
 import com.iformall.common.ResultData;
 import com.iformall.controller.base.BaseController;
-import com.iformall.domain.po.WxAppinfo;
 import com.iformall.domain.po.tt.TtOrder;
-import com.iformall.enums.EnumPayWay;
-import com.iformall.exception.MallinkException;
 import com.iformall.service.WxAppinfoService;
 import com.iformall.service.WxCUserBasicInfoService;
 import com.iformall.service.tt.TtOrderService;
@@ -19,10 +16,10 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Map;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("ttOrder")
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtUpSettleinController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtUpSettleinController.java
index a5309d5c0..3758f4782 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtUpSettleinController.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtUpSettleinController.java
@@ -4,14 +4,9 @@ import com.iformall.annotation.SystemControllerLog;
 import com.iformall.common.ErrorCode;
 import com.iformall.common.ResultData;
 import com.iformall.controller.base.BaseController;
-import com.iformall.domain.po.WxMerchant;
 import com.iformall.domain.po.base.BaseEntity;
-import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.domain.po.tt.TtCoupon;
 import com.iformall.domain.po.tt.TtUpSettlein;
 import com.iformall.enums.EnumDelFlag;
-import com.iformall.enums.EnumMerchantStatus;
-import com.iformall.exception.MallinkException;
 import com.iformall.service.tt.TtUpSettleinService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -23,8 +18,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 
 @RestController
 @RequestMapping("upSettlein")
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/WxCampaignController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/WxCampaignController.java
index e50e9bf48..4c4089daf 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/WxCampaignController.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/WxCampaignController.java
@@ -4,17 +4,14 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.github.pagehelper.PageInfo;
 import com.iformall.annotation.SystemControllerLog;
-import com.iformall.common.ErrorCode;
 import com.iformall.common.Result;
 import com.iformall.common.ResultData;
 import com.iformall.controller.base.BaseController;
 import com.iformall.domain.po.WxCampaign;
-import com.iformall.domain.po.WxCoupon;
-import com.iformall.domain.po.WxCouponChannel;
 import com.iformall.domain.po.base.BaseEntity;
 import com.iformall.domain.po.tt.TtCoupon;
-import com.iformall.domain.vo.WxCouponChannelVo;
-import com.iformall.enums.*;
+import com.iformall.enums.EnumAppPlat;
+import com.iformall.enums.EnumCampaignStatus;
 import com.iformall.service.WxCampaignService;
 import com.iformall.service.WxCouponChannelService;
 import com.iformall.service.WxCouponService;
@@ -29,7 +26,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Date;
 import java.util.List;
 
 @RestController
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/video/VideoController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/video/VideoController.java
index 4757ec130..5d08983a2 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/controller/video/VideoController.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/video/VideoController.java
@@ -5,11 +5,9 @@ import com.iformall.common.ResultData;
 import com.iformall.controller.base.BaseController;
 import com.iformall.video.VideoFactory;
 import com.iformall.video.entity.VideUploadResult;
-
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java
index 266db19dc..0ee3eeb36 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java
@@ -4,8 +4,10 @@ import com.github.pagehelper.PageInfo;
 import com.iformall.annotation.SystemControllerLog;
 import com.iformall.common.ResultData;
 import com.iformall.controller.base.BaseController;
-import com.iformall.domain.po.*;
-import com.iformall.domain.po.base.TenantEntity;
+import com.iformall.domain.po.MallUserInfo;
+import com.iformall.domain.po.WxFlowConfig;
+import com.iformall.domain.po.WxFlowModel;
+import com.iformall.domain.po.WxFlowRecord;
 import com.iformall.enums.EnumFlowRecordStatus;
 import com.iformall.service.WxFlowService;
 import io.swagger.annotations.Api;
@@ -18,7 +20,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import java.util.*;
+
+import java.util.List;
+import java.util.Map;
 
 @RestController
 @Api(description = "工作流相关接口")
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/flowable/ContractTaskFinishHandler.java b/mallinkTTAdmin/src/main/java/com/iformall/flowable/ContractTaskFinishHandler.java
index 39982396e..4ec15fe03 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/flowable/ContractTaskFinishHandler.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/flowable/ContractTaskFinishHandler.java
@@ -1,16 +1,11 @@
 package com.iformall.flowable;
 
-import com.iformall.enums.EnumRentContractAppStatus;
 import com.iformall.service.WxFlowService;
 import com.iformall.service.WxPropertyContractService;
-import com.iformall.service.impl.WxFlowServiceImpl;
-import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.delegate.TaskListener;
 import org.flowable.task.service.delegate.DelegateTask;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 合同审批完成,修改状态
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/interceptor/CurrentTenantInterceptor.java b/mallinkTTAdmin/src/main/java/com/iformall/interceptor/CurrentTenantInterceptor.java
index aa77a078b..0693f4927 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/interceptor/CurrentTenantInterceptor.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/interceptor/CurrentTenantInterceptor.java
@@ -1,13 +1,14 @@
 package com.iformall.interceptor;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.stereotype.Component;
-import org.springframework.web.method.HandlerMethod;
-import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 import com.iformall.annotation.TenantIgnore;
 import com.iformall.common.TenantThreadLocal;
 import com.iformall.shiro.UserSession;
+import org.springframework.stereotype.Component;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * 权限(Token)验证
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java b/mallinkTTAdmin/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java
index aebf7d874..a04274158 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java
@@ -6,9 +6,7 @@ import org.slf4j.LoggerFactory;
 
 import javax.servlet.*;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.Arrays;
 
 public class HttpServletRequestWrapperFilter implements Filter {
     private static final Logger logger = LoggerFactory.getLogger(HttpServletRequestWrapperFilter.class);
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java b/mallinkTTAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java
index d7b493d12..f9c9ff048 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java
@@ -25,7 +25,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.nio.charset.Charset;
 import java.util.Enumeration;
-import java.util.concurrent.TimeUnit;
 
 /**
  * 幂等检查
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/log/SystemLogAspect.java b/mallinkTTAdmin/src/main/java/com/iformall/log/SystemLogAspect.java
index 465889699..768de40a7 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/log/SystemLogAspect.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/log/SystemLogAspect.java
@@ -9,7 +9,6 @@ import com.iformall.enums.EnumMallUserAction;
 import com.iformall.service.MallUserActionService;
 import com.iformall.shiro.UserSession;
 import com.iformall.utils.IPUtil;
-import org.apache.shiro.SecurityUtils;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterThrowing;
 import org.aspectj.lang.annotation.Aspect;
@@ -23,9 +22,7 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
 import java.lang.reflect.Method;
-import java.util.Arrays;
 import java.util.Date;
 
 @Aspect
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/log/UserDataRuleAspect.java b/mallinkTTAdmin/src/main/java/com/iformall/log/UserDataRuleAspect.java
index acd100a64..8cf23e9bf 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/log/UserDataRuleAspect.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/log/UserDataRuleAspect.java
@@ -4,9 +4,9 @@ package com.iformall.log;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.iformall.annotation.UserDataRuleAnnotation;
-import com.iformall.domain.po.base.BaseEntity;
 import com.iformall.domain.po.MallUserInfo;
 import com.iformall.domain.po.WxUserDataRule;
+import com.iformall.domain.po.base.BaseEntity;
 import com.iformall.mapper.WxRentContractMapper;
 import com.iformall.service.WxUserDataRuleService;
 import com.iformall.shiro.UserSession;
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java b/mallinkTTAdmin/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java
index 8bc199a20..aad3ef032 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java
@@ -16,7 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
 
 import java.util.Date;
 import java.util.HashMap;
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/shiro/MyShiroRealm.java b/mallinkTTAdmin/src/main/java/com/iformall/shiro/MyShiroRealm.java
index 2689cc3c8..411f86fb9 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/shiro/MyShiroRealm.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/shiro/MyShiroRealm.java
@@ -1,8 +1,7 @@
 package com.iformall.shiro;
 
-import javax.annotation.Resource;
-
 import com.iformall.common.ErrorCode;
+import com.iformall.domain.po.MallUserInfo;
 import com.iformall.enums.EnumMallUserStatus;
 import com.iformall.service.MallUserInfoService;
 import org.apache.commons.lang3.StringUtils;
@@ -15,8 +14,7 @@ import org.apache.shiro.session.Session;
 import org.apache.shiro.subject.PrincipalCollection;
 import org.apache.shiro.util.ByteSource;
 
-import com.iformall.domain.po.MallUserInfo;
-
+import javax.annotation.Resource;
 import java.util.Set;
 
 /**
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/shiro/ShiroService.java b/mallinkTTAdmin/src/main/java/com/iformall/shiro/ShiroService.java
index 5c311ac54..a9621c7b7 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/shiro/ShiroService.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/shiro/ShiroService.java
@@ -1,8 +1,6 @@
 package com.iformall.shiro;
 
-import java.util.LinkedHashMap;
-import java.util.Map;
-
+import com.iformall.service.MallPermissionService;
 import org.apache.shiro.spring.web.ShiroFilterFactoryBean;
 import org.apache.shiro.web.filter.mgt.DefaultFilterChainManager;
 import org.apache.shiro.web.filter.mgt.PathMatchingFilterChainResolver;
@@ -10,7 +8,8 @@ import org.apache.shiro.web.servlet.AbstractShiroFilter;
 import org.crazycake.shiro.RedisSessionDAO;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.iformall.service.MallPermissionService;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 /**
  * Created by yangqj on 2017/4/30.
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkTTAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java
index 030d4a568..eaaf19b56 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java
@@ -1,18 +1,12 @@
 package com.iformall.tenant;
 
-import com.iformall.common.TenantThreadLocal;
 import com.iformall.plugin.autoTenantId.TenantInfo;
-import com.iformall.shiro.UserSession;
-
-import java.util.Arrays;
-import java.util.List;
-
 import org.apache.ibatis.mapping.MappedStatement;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.session.InvalidSessionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+
 public class TenantInfoImpl implements TenantInfo {
 
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
diff --git a/mallinkTTCApi/src/main/java/com/iformall/TTCApplication.java b/mallinkTTCApi/src/main/java/com/iformall/TTCApplication.java
index d2b7d46f4..8de7ee5f5 100644
--- a/mallinkTTCApi/src/main/java/com/iformall/TTCApplication.java
+++ b/mallinkTTCApi/src/main/java/com/iformall/TTCApplication.java
@@ -1,5 +1,6 @@
 package com.iformall;
 
+import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties;
 import org.mybatis.spring.annotation.MapperScan;
 import org.rocketmq.starter.annotation.EnableRocketMQ;
 import org.springframework.beans.factory.annotation.Value;
@@ -8,8 +9,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 
-import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties;
-
 /**
  * @author chenkx
  * @date   2017-12-26
diff --git a/mallinkTTCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java b/mallinkTTCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java
index f001c7912..ecc62f784 100644
--- a/mallinkTTCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java
+++ b/mallinkTTCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java
@@ -3,10 +3,7 @@ package com.iformall.aop;
 
 import com.alibaba.fastjson.JSONObject;
 import com.iformall.annotation.RedisCache;
-import com.iformall.common.ErrorCode;
-import com.iformall.domain.po.WxCUser;
 import com.iformall.domain.po.base.BaseCUserEntity;
-import com.iformall.exception.MallinkException;
 import com.iformall.service.CUserTokenService;
 import com.iformall.utils.HashUtil;
 import com.iformall.utils.RedisLock;
diff --git a/mallinkTTCApi/src/main/java/com/iformall/callback/TtOrderCallbackController.java b/mallinkTTCApi/src/main/java/com/iformall/callback/TtOrderCallbackController.java
index f291b1e36..ce2fecde6 100644
--- a/mallinkTTCApi/src/main/java/com/iformall/callback/TtOrderCallbackController.java
+++ b/mallinkTTCApi/src/main/java/com/iformall/callback/TtOrderCallbackController.java
@@ -12,7 +12,10 @@ import com.iformall.service.tt.TtOrderService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
diff --git a/mallinkTTCApi/src/main/java/com/iformall/callback/TtShopCallbackController.java b/mallinkTTCApi/src/main/java/com/iformall/callback/TtShopCallbackController.java
index 83e348146..582eddf6a 100644
--- a/mallinkTTCApi/src/main/java/com/iformall/callback/TtShopCallbackController.java
+++ b/mallinkTTCApi/src/main/java/com/iformall/callback/TtShopCallbackController.java
@@ -3,9 +3,6 @@ package com.iformall.callback;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.iformall.controller.BaseController;
-import com.iformall.domain.po.WxAppinfo;
-import com.iformall.domain.po.WxPayAccount;
-import com.iformall.douyin.pay.DouYinPayHelper;
 import com.iformall.interceptor.BodyReaderHttpServletRequestWrapper;
 import com.iformall.service.WxAppinfoService;
 import com.iformall.service.WxPayAccountService;
@@ -13,7 +10,10 @@ import com.iformall.service.tt.TtOrderService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
diff --git a/mallinkTTCApi/src/main/java/com/iformall/config/RedisConfig.java b/mallinkTTCApi/src/main/java/com/iformall/config/RedisConfig.java
index 02e61114a..3266ae294 100644
--- a/mallinkTTCApi/src/main/java/com/iformall/config/RedisConfig.java
+++ b/mallinkTTCApi/src/main/java/com/iformall/config/RedisConfig.java
@@ -27,7 +27,6 @@ import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
 import java.time.Duration;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/mallinkTTCApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkTTCApi/src/main/java/com/iformall/controller/BaseController.java
index 798b185bf..6103e4764 100644
--- a/mallinkTTCApi/src/main/java/com/iformall/controller/BaseController.java
+++ b/mallinkTTCApi/src/main/java/com/iformall/controller/BaseController.java
@@ -1,12 +1,10 @@
 package com.iformall.controller;
 
 import com.iformall.common.ErrorCode;
-import com.iformall.domain.po.tt.TtCUser;
-import com.iformall.domain.po.WxAppinfo;
 import com.iformall.domain.po.WxCUserBasicInfo;
 import com.iformall.domain.po.base.BaseCUserEntity;
 import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.douyin.miniapp.api.TtMaService;
+import com.iformall.domain.po.tt.TtCUser;
 import com.iformall.enums.EnumEnableType;
 import com.iformall.exception.MallinkException;
 import com.iformall.service.CUserTokenService;
@@ -16,7 +14,6 @@ import com.iformall.utils.Constant;
 import com.iformall.utils.IPUtil;
 import com.iformall.utils.MaUtil;
 import com.iformall.utils.RedisCacheUtils;
-import me.chanjar.weixin.common.error.WxErrorException;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/mallinkTTCApi/src/main/java/com/iformall/controller/TtCouponController.java b/mallinkTTCApi/src/main/java/com/iformall/controller/TtCouponController.java
index ee02b39d9..555e60d2f 100644
--- a/mallinkTTCApi/src/main/java/com/iformall/controller/TtCouponController.java
+++ b/mallinkTTCApi/src/main/java/com/iformall/controller/TtCouponController.java
@@ -2,7 +2,6 @@ package com.iformall.controller;
 
 import com.iformall.common.ErrorCode;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.WxMerchant;
 import com.iformall.domain.po.base.BaseEntity;
 import com.iformall.domain.po.tt.TtCoupon;
 import com.iformall.enums.EnumTtCouponStatus;
diff --git a/mallinkTTCApi/src/main/java/com/iformall/controller/TtOrderController.java b/mallinkTTCApi/src/main/java/com/iformall/controller/TtOrderController.java
index 91bceab2d..324540b3c 100644
--- a/mallinkTTCApi/src/main/java/com/iformall/controller/TtOrderController.java
+++ b/mallinkTTCApi/src/main/java/com/iformall/controller/TtOrderController.java
@@ -2,11 +2,14 @@ package com.iformall.controller;
 
 import com.iformall.common.ErrorCode;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.*;
+import com.iformall.domain.po.WxAppinfo;
+import com.iformall.domain.po.WxPayAccount;
 import com.iformall.domain.po.tt.TtOrder;
-import com.iformall.enums.*;
+import com.iformall.enums.EnumAppPlat;
+import com.iformall.enums.EnumPayWay;
 import com.iformall.exception.MallinkException;
-import com.iformall.service.*;
+import com.iformall.service.WxAppinfoService;
+import com.iformall.service.WxPayAccountService;
 import com.iformall.service.tt.TtOrderService;
 import com.iformall.utils.Constant;
 import io.swagger.annotations.Api;
@@ -19,7 +22,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 @RestController
diff --git a/mallinkTTCApi/src/main/java/com/iformall/controller/TtUserGrantController.java b/mallinkTTCApi/src/main/java/com/iformall/controller/TtUserGrantController.java
index 7ab1a41f3..0488fba0c 100644
--- a/mallinkTTCApi/src/main/java/com/iformall/controller/TtUserGrantController.java
+++ b/mallinkTTCApi/src/main/java/com/iformall/controller/TtUserGrantController.java
@@ -3,20 +3,21 @@ package com.iformall.controller;
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
-import cn.binarywang.wx.miniapp.util.crypt.WxMaCryptUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.iformall.annotation.AuthIgnore;
 import com.iformall.annotation.TenantIgnore;
 import com.iformall.common.ErrorCode;
 import com.iformall.common.Result;
 import com.iformall.common.ResultData;
-import com.iformall.domain.po.*;
-import com.iformall.domain.po.base.TenantEntity;
+import com.iformall.domain.po.WxAppinfo;
+import com.iformall.domain.po.WxCUserBasicInfo;
 import com.iformall.domain.po.tt.TtCUser;
 import com.iformall.domain.vo.WxCUserVo;
 import com.iformall.douyin.miniapp.api.TtMaService;
-import com.iformall.enums.*;
-import com.iformall.service.*;
+import com.iformall.enums.EnumEnableType;
+import com.iformall.service.TtCUserService;
+import com.iformall.service.WxAppinfoService;
+import com.iformall.service.WxCUserBasicInfoService;
 import com.iformall.utils.Constant;
 import com.iformall.utils.IPUtil;
 import com.iformall.utils.RedisCacheUtils;
diff --git a/mallinkTTCApi/src/main/java/com/iformall/controller/WxCampaignController.java b/mallinkTTCApi/src/main/java/com/iformall/controller/WxCampaignController.java
index d8465f289..7708d1cf9 100644
--- a/mallinkTTCApi/src/main/java/com/iformall/controller/WxCampaignController.java
+++ b/mallinkTTCApi/src/main/java/com/iformall/controller/WxCampaignController.java
@@ -6,14 +6,10 @@ import com.iformall.annotation.RedisCache;
 import com.iformall.common.Result;
 import com.iformall.common.ResultData;
 import com.iformall.domain.po.WxCampaign;
-import com.iformall.domain.po.WxCouponChannel;
 import com.iformall.domain.po.base.BaseEntity;
 import com.iformall.domain.po.tt.TtCoupon;
-import com.iformall.domain.vo.WxCouponChannelVo;
 import com.iformall.enums.EnumCampaignStatus;
-import com.iformall.enums.EnumCouponChannelType;
 import com.iformall.enums.EnumPayWay;
-import com.iformall.enums.EnumProjectPlat;
 import com.iformall.service.WxCampaignService;
 import com.iformall.service.WxCouponChannelService;
 import com.iformall.service.tt.TtCouponService;
@@ -30,7 +26,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.Date;
 import java.util.List;
 
 
diff --git a/mallinkTTCApi/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkTTCApi/src/main/java/com/iformall/controller/WxMerchantController.java
index 45b707be9..8ab51f1c9 100644
--- a/mallinkTTCApi/src/main/java/com/iformall/controller/WxMerchantController.java
+++ b/mallinkTTCApi/src/main/java/com/iformall/controller/WxMerchantController.java
@@ -4,26 +4,20 @@ import com.iformall.common.ErrorCode;
 import com.iformall.common.ResultData;
 import com.iformall.domain.dto.WxMerchantDto;
 import com.iformall.domain.po.WxMerchant;
-import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.domain.po.tt.TtCoupon;
-import com.iformall.domain.vo.WxMerchantVo;
 import com.iformall.enums.EnumMerchantPublic;
 import com.iformall.enums.EnumMerchantStatus;
-import com.iformall.enums.EnumTtCouponStatus;
 import com.iformall.enums.EnumYesOrNo;
-import com.iformall.exception.MallinkException;
 import com.iformall.service.WxMerchantService;
-import com.iformall.utils.HashUtil;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author Stormeye
diff --git a/mallinkTTCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java b/mallinkTTCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java
index a2bfabb07..f909df06e 100644
--- a/mallinkTTCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java
+++ b/mallinkTTCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java
@@ -2,9 +2,7 @@ package com.iformall.interceptor;
 
 
 import com.iformall.annotation.AuthIgnore;
-import com.iformall.annotation.TenantIgnore;
 import com.iformall.common.ErrorCode;
-import com.iformall.common.TenantThreadLocal;
 import com.iformall.domain.po.base.BaseCUserEntity;
 import com.iformall.exception.MallinkException;
 import com.iformall.service.CUserTokenService;
diff --git a/mallinkTTCApi/src/main/java/com/iformall/interceptor/RequestInterceptor.java b/mallinkTTCApi/src/main/java/com/iformall/interceptor/RequestInterceptor.java
index ff7e81880..8778c394a 100644
--- a/mallinkTTCApi/src/main/java/com/iformall/interceptor/RequestInterceptor.java
+++ b/mallinkTTCApi/src/main/java/com/iformall/interceptor/RequestInterceptor.java
@@ -25,7 +25,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.nio.charset.Charset;
 import java.util.Enumeration;
-import java.util.concurrent.TimeUnit;
 
 /**
  * 幂等检查
diff --git a/mallinkTTCApi/src/main/java/com/iformall/interceptor/WebLogAspect.java b/mallinkTTCApi/src/main/java/com/iformall/interceptor/WebLogAspect.java
index c66aeef83..b1aafc33c 100644
--- a/mallinkTTCApi/src/main/java/com/iformall/interceptor/WebLogAspect.java
+++ b/mallinkTTCApi/src/main/java/com/iformall/interceptor/WebLogAspect.java
@@ -14,7 +14,6 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
 
 @Aspect
 @Component
diff --git a/mallinkTTCApi/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java b/mallinkTTCApi/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java
index db7f5b15a..783e22049 100644
--- a/mallinkTTCApi/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java
+++ b/mallinkTTCApi/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java
@@ -1,17 +1,13 @@
 package com.iformall.resolver;
 
 import com.iformall.annotation.LoginUser;
-import com.iformall.domain.po.WxCUserBasicInfo;
 import com.iformall.domain.po.base.BaseCUserEntity;
-import com.iformall.service.CUserTokenService;
 import com.iformall.service.WxCUserBasicInfoService;
-import com.iformall.utils.Constant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.MethodParameter;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.support.WebDataBinderFactory;
 import org.springframework.web.context.request.NativeWebRequest;
-import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.ModelAndViewContainer;
 
diff --git a/mallinkTTCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkTTCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java
index 9a12ed205..ef3d4b865 100644
--- a/mallinkTTCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java
+++ b/mallinkTTCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java
@@ -1,20 +1,12 @@
 package com.iformall.tenant;
 
-import com.iformall.common.TenantThreadLocal;
 import com.iformall.plugin.autoTenantId.TenantInfo;
-import com.iformall.utils.Constant;
 import org.apache.ibatis.mapping.MappedStatement;
-import org.apache.shiro.session.InvalidSessionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
 
-import java.util.Arrays;
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
-
 public class TenantInfoImpl implements TenantInfo {
 
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
diff --git a/mallinkVideo/src/main/java/com/iformall/video/VideoExcutor.java b/mallinkVideo/src/main/java/com/iformall/video/VideoExcutor.java
index d782d352b..fc04ea5b0 100644
--- a/mallinkVideo/src/main/java/com/iformall/video/VideoExcutor.java
+++ b/mallinkVideo/src/main/java/com/iformall/video/VideoExcutor.java
@@ -1,10 +1,9 @@
 package com.iformall.video;
 
-import java.io.File;
-import java.io.InputStream;
-
 import com.iformall.video.entity.VideUploadResult;
 
+import java.io.InputStream;
+
 public interface VideoExcutor {
 
 	/**
diff --git a/mallinkVideo/src/main/java/com/iformall/video/VideoFactory.java b/mallinkVideo/src/main/java/com/iformall/video/VideoFactory.java
index e8afbaddb..490baf83e 100644
--- a/mallinkVideo/src/main/java/com/iformall/video/VideoFactory.java
+++ b/mallinkVideo/src/main/java/com/iformall/video/VideoFactory.java
@@ -1,14 +1,11 @@
 package com.iformall.video;
 
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
+import com.iformall.video.aliyun.AliyunVideoExcutor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
-import com.iformall.video.aliyun.AliyunVideoExcutor;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 
 @Service
diff --git a/mallinkVideo/src/main/java/com/iformall/video/aliyun/AliyunVideoExcutor.java b/mallinkVideo/src/main/java/com/iformall/video/aliyun/AliyunVideoExcutor.java
index 7daefbf1e..c5ecddb32 100644
--- a/mallinkVideo/src/main/java/com/iformall/video/aliyun/AliyunVideoExcutor.java
+++ b/mallinkVideo/src/main/java/com/iformall/video/aliyun/AliyunVideoExcutor.java
@@ -1,24 +1,12 @@
 package com.iformall.video.aliyun;
 
-import java.io.File;
-import java.io.InputStream;
-import java.util.List;
-import java.util.UUID;
-
 import com.alibaba.fastjson.JSON;
-import com.aliyuncs.vod.model.v20170321.CreateUploadVideoResponse;
-import com.aliyuncs.vod.model.v20170321.GetPlayInfoResponse;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Component;
 import com.aliyuncs.DefaultAcsClient;
 import com.aliyuncs.exceptions.ClientException;
 import com.aliyuncs.profile.DefaultProfile;
+import com.aliyuncs.vod.model.v20170321.CreateUploadVideoResponse;
+import com.aliyuncs.vod.model.v20170321.GetPlayInfoResponse;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.iformall.video.VideoExcutor;
 import com.iformall.video.aliyun.config.AliyunVideoConfig;
 import com.iformall.video.aliyun.sdk.server.AliyunVedioServer;
@@ -26,6 +14,16 @@ import com.iformall.video.aliyun.sdk.server.UploadCacheHelper;
 import com.iformall.video.aliyun.thread.AliyunVideoUploadThread;
 import com.iformall.video.entity.VideUploadResult;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+
+import java.io.File;
+import java.io.InputStream;
+import java.util.List;
 
 @Component
 @Slf4j
diff --git a/mallinkVideo/src/main/java/com/iformall/video/aliyun/config/AliyunVideoConfig.java b/mallinkVideo/src/main/java/com/iformall/video/aliyun/config/AliyunVideoConfig.java
index de2698302..2877fa643 100644
--- a/mallinkVideo/src/main/java/com/iformall/video/aliyun/config/AliyunVideoConfig.java
+++ b/mallinkVideo/src/main/java/com/iformall/video/aliyun/config/AliyunVideoConfig.java
@@ -1,10 +1,9 @@
 package com.iformall.video.aliyun.config;
 
+import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 
-import lombok.Data;
-
 @Data
 @Configuration
 @ConfigurationProperties(prefix = "video.aliyun")
diff --git a/mallinkVideo/src/main/java/com/iformall/video/aliyun/sdk/server/AliyunVedioServer.java b/mallinkVideo/src/main/java/com/iformall/video/aliyun/sdk/server/AliyunVedioServer.java
index 416c3f9df..4058abc23 100644
--- a/mallinkVideo/src/main/java/com/iformall/video/aliyun/sdk/server/AliyunVedioServer.java
+++ b/mallinkVideo/src/main/java/com/iformall/video/aliyun/sdk/server/AliyunVedioServer.java
@@ -1,37 +1,24 @@
 package com.iformall.video.aliyun.sdk.server;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Base64;
-import java.util.List;
-
-import org.springframework.data.redis.core.RedisTemplate;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.aliyun.oss.OSS;
-import com.aliyun.oss.OSSClient;
 import com.aliyun.oss.OSSClientBuilder;
 import com.aliyun.oss.model.PutObjectRequest;
 import com.aliyun.oss.model.PutObjectResult;
 import com.aliyuncs.DefaultAcsClient;
+import com.aliyuncs.exceptions.ClientException;
+import com.aliyuncs.http.FormatType;
 import com.aliyuncs.profile.DefaultProfile;
-import com.aliyuncs.vod.model.v20170321.CreateUploadVideoRequest;
-import com.aliyuncs.vod.model.v20170321.CreateUploadVideoResponse;
-import com.aliyuncs.vod.model.v20170321.GetPlayInfoRequest;
-import com.aliyuncs.vod.model.v20170321.GetPlayInfoResponse;
-import com.aliyuncs.vod.model.v20170321.RefreshUploadVideoRequest;
-import com.aliyuncs.vod.model.v20170321.RefreshUploadVideoResponse;
+import com.aliyuncs.vod.model.v20170321.*;
 import com.iformall.video.aliyun.config.AliyunVideoConfig;
-
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.RedisTemplate;
 
-import com.aliyuncs.exceptions.ClientException;
-import com.aliyuncs.http.FormatType;
+import java.io.File;
+import java.io.UnsupportedEncodingException;
+import java.util.Base64;
+import java.util.List;
 
 @Slf4j
 public class AliyunVedioServer {
diff --git a/mallinkVideo/src/main/java/com/iformall/video/aliyun/sdk/server/OssUploadClient.java b/mallinkVideo/src/main/java/com/iformall/video/aliyun/sdk/server/OssUploadClient.java
index 5db990ae0..99408076e 100644
--- a/mallinkVideo/src/main/java/com/iformall/video/aliyun/sdk/server/OssUploadClient.java
+++ b/mallinkVideo/src/main/java/com/iformall/video/aliyun/sdk/server/OssUploadClient.java
@@ -1,7 +1,6 @@
 package com.iformall.video.aliyun.sdk.server;
 
 import com.aliyun.oss.OSS;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
diff --git a/mallinkVideo/src/main/java/com/iformall/video/aliyun/sdk/server/PutObjectProgressListener.java b/mallinkVideo/src/main/java/com/iformall/video/aliyun/sdk/server/PutObjectProgressListener.java
index c6af29f79..425934b2e 100644
--- a/mallinkVideo/src/main/java/com/iformall/video/aliyun/sdk/server/PutObjectProgressListener.java
+++ b/mallinkVideo/src/main/java/com/iformall/video/aliyun/sdk/server/PutObjectProgressListener.java
@@ -1,13 +1,12 @@
 package com.iformall.video.aliyun.sdk.server;
 
-import java.io.File;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.data.redis.core.RedisTemplate;
-
 import com.aliyun.oss.event.ProgressEvent;
 import com.aliyun.oss.event.ProgressEventType;
 import com.aliyun.oss.event.ProgressListener;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.data.redis.core.RedisTemplate;
+
+import java.io.File;
 
 public class PutObjectProgressListener implements ProgressListener{
 	private String videoId = "";
diff --git a/mallinkVideo/src/main/java/com/iformall/video/aliyun/sdk/server/UploadCacheHelper.java b/mallinkVideo/src/main/java/com/iformall/video/aliyun/sdk/server/UploadCacheHelper.java
index b14132c1d..a19300db1 100644
--- a/mallinkVideo/src/main/java/com/iformall/video/aliyun/sdk/server/UploadCacheHelper.java
+++ b/mallinkVideo/src/main/java/com/iformall/video/aliyun/sdk/server/UploadCacheHelper.java
@@ -1,12 +1,12 @@
 package com.iformall.video.aliyun.sdk.server;
 
-import java.util.concurrent.TimeUnit;
-
 import com.alibaba.fastjson.JSON;
 import com.iformall.video.entity.VideUploadResult;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 
+import java.util.concurrent.TimeUnit;
+
 public class UploadCacheHelper {
 
 	private static String PRE = "video:upload:aliyun:progress:";
diff --git a/mallinkVideo/src/main/java/com/iformall/video/aliyun/thread/AliyunVedioThreadExecutorConfig.java b/mallinkVideo/src/main/java/com/iformall/video/aliyun/thread/AliyunVedioThreadExecutorConfig.java
index a4cfb8290..ade50208c 100644
--- a/mallinkVideo/src/main/java/com/iformall/video/aliyun/thread/AliyunVedioThreadExecutorConfig.java
+++ b/mallinkVideo/src/main/java/com/iformall/video/aliyun/thread/AliyunVedioThreadExecutorConfig.java
@@ -1,21 +1,15 @@
 package com.iformall.video.aliyun.thread;
 
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.task.AsyncTaskExecutor;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
-import com.iformall.video.aliyun.config.AliyunVideoConfig;
-
-import lombok.Data;
-
 import java.util.concurrent.Executor;
 import java.util.concurrent.ThreadPoolExecutor;
 
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
 @Data
 @Configuration
 @EnableAsync
diff --git a/mallinkVideo/src/main/java/com/iformall/video/aliyun/thread/AliyunVideoUploadThread.java b/mallinkVideo/src/main/java/com/iformall/video/aliyun/thread/AliyunVideoUploadThread.java
index 9bd9460b0..1616d20d4 100644
--- a/mallinkVideo/src/main/java/com/iformall/video/aliyun/thread/AliyunVideoUploadThread.java
+++ b/mallinkVideo/src/main/java/com/iformall/video/aliyun/thread/AliyunVideoUploadThread.java
@@ -1,7 +1,5 @@
 package com.iformall.video.aliyun.thread;
 
-import org.springframework.stereotype.Service;
-
 import com.aliyuncs.vod.model.v20170321.CreateUploadVideoResponse;
 import com.iformall.video.aliyun.config.AliyunVideoConfig;
 import com.iformall.video.aliyun.sdk.server.AliyunVedioServer;
@@ -9,6 +7,7 @@ import com.iformall.video.aliyun.sdk.server.UploadCacheHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
 
 
 //https://blog.csdn.net/m0_37701381/article/details/81072774
diff --git a/mallinkWebSocketServer/src/main/java/com/iformall/config/MyBatisConfiguration.java b/mallinkWebSocketServer/src/main/java/com/iformall/config/MyBatisConfiguration.java
index 09d29c340..eff982f24 100644
--- a/mallinkWebSocketServer/src/main/java/com/iformall/config/MyBatisConfiguration.java
+++ b/mallinkWebSocketServer/src/main/java/com/iformall/config/MyBatisConfiguration.java
@@ -2,15 +2,12 @@ package com.iformall.config;
 
 import com.iformall.plugin.MyBatisItercepters;
 import com.iformall.plugin.MyBatisPlus;
-import com.iformall.plugin.shard.impl.EnumShardingRule;
-import com.iformall.plugin.shard.impl.ShardingSphere;
-import com.iformall.plugin.shard.plugin.ShardingSpherePlugin;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
+
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Properties;
 
 @EnableTransactionManagement
 @Configuration
diff --git a/mallinkWebSocketServer/src/main/java/com/iformall/config/WebSocketConfig.java b/mallinkWebSocketServer/src/main/java/com/iformall/config/WebSocketConfig.java
index 1ef071f94..71b6bbc1c 100644
--- a/mallinkWebSocketServer/src/main/java/com/iformall/config/WebSocketConfig.java
+++ b/mallinkWebSocketServer/src/main/java/com/iformall/config/WebSocketConfig.java
@@ -4,7 +4,6 @@ import com.iformall.interceptor.AuthHandshakeInterceptor;
 import com.iformall.model.User;
 import com.iformall.service.UserService;
 import com.iformall.util.Constance;
-import lombok.Data;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
@@ -12,7 +11,6 @@ import org.springframework.amqp.rabbit.core.RabbitAdmin;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.simp.SimpMessageHeaderAccessor;
@@ -22,14 +20,10 @@ import org.springframework.messaging.simp.stomp.StompCommand;
 import org.springframework.messaging.simp.stomp.StompHeaderAccessor;
 import org.springframework.messaging.support.ChannelInterceptor;
 import org.springframework.messaging.support.MessageHeaderAccessor;
-import org.springframework.scheduling.concurrent.DefaultManagedTaskScheduler;
-import org.springframework.web.socket.WebSocketHandler;
 import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
 import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
 import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
-import org.springframework.web.socket.server.support.DefaultHandshakeHandler;
 
-import java.security.Principal;
 import java.util.LinkedList;
 import java.util.Map;
 
diff --git a/mallinkWebSocketServer/src/main/java/com/iformall/controller/websocket/ReceiverController.java b/mallinkWebSocketServer/src/main/java/com/iformall/controller/websocket/ReceiverController.java
index 1f4118288..99b7ea563 100644
--- a/mallinkWebSocketServer/src/main/java/com/iformall/controller/websocket/ReceiverController.java
+++ b/mallinkWebSocketServer/src/main/java/com/iformall/controller/websocket/ReceiverController.java
@@ -5,7 +5,6 @@ import com.iformall.interceptor.AuthHandshakeInterceptor;
 import com.iformall.model.Message;
 import com.iformall.service.UserService;
 import com.iformall.util.Constance;
-import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/MyBatisItercepters.java b/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/MyBatisItercepters.java
index 9fdf28d0d..251506cad 100644
--- a/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/MyBatisItercepters.java
+++ b/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/MyBatisItercepters.java
@@ -1,13 +1,11 @@
 package com.iformall.plugin;
 
+import com.iformall.plugin.entity.ChainValue;
 import org.apache.ibatis.executor.statement.StatementHandler;
 import org.apache.ibatis.plugin.*;
 import org.apache.ibatis.session.ResultHandler;
 
-import com.iformall.plugin.entity.ChainValue;
-
 import java.sql.Connection;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/MyBatisPlus.java b/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/MyBatisPlus.java
index 28e61dbb0..ac3cc1adc 100644
--- a/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/MyBatisPlus.java
+++ b/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/MyBatisPlus.java
@@ -1,11 +1,9 @@
 package com.iformall.plugin;
 
-import java.util.List;
-import java.util.Map;
-
+import com.iformall.plugin.entity.ChainValue;
 import org.apache.ibatis.plugin.Invocation;
 
-import com.iformall.plugin.entity.ChainValue;
+import java.util.Map;
 
 public interface MyBatisPlus {
 
diff --git a/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/autoTenantId/MultiTenancy.java b/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/autoTenantId/MultiTenancy.java
index bdeaf3b96..bff7b79f5 100644
--- a/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/autoTenantId/MultiTenancy.java
+++ b/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/autoTenantId/MultiTenancy.java
@@ -1,5 +1,7 @@
 package com.iformall.plugin.autoTenantId;
 
+import com.iformall.plugin.MyBatisPlus;
+import com.iformall.plugin.entity.ChainValue;
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.Parenthesis;
@@ -26,22 +28,12 @@ import org.apache.ibatis.executor.statement.StatementHandler;
 import org.apache.ibatis.mapping.BoundSql;
 import org.apache.ibatis.mapping.MappedStatement;
 import org.apache.ibatis.mapping.SqlCommandType;
-import org.apache.ibatis.plugin.*;
+import org.apache.ibatis.plugin.Invocation;
 import org.apache.ibatis.reflection.MetaObject;
 import org.apache.ibatis.reflection.SystemMetaObject;
 import org.apache.ibatis.session.Configuration;
-import org.apache.ibatis.session.ResultHandler;
-
-import com.iformall.plugin.MyBatisPlus;
-import com.iformall.plugin.entity.ChainValue;
 
-import java.sql.Connection;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
+import java.util.*;
 
 /**
  *共享数据库的多租户系统实现
diff --git a/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/autoTenantId/TenantInfo.java b/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/autoTenantId/TenantInfo.java
index 7d0b7911b..72a91ed87 100644
--- a/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/autoTenantId/TenantInfo.java
+++ b/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/autoTenantId/TenantInfo.java
@@ -1,9 +1,9 @@
 package com.iformall.plugin.autoTenantId;
 
-import java.util.List;
-
 import org.apache.ibatis.mapping.MappedStatement;
 
+import java.util.List;
+
 /**
  * 需要实现该接口用于获取租户id
  * Created by Stormeye on 2018/10/22.
diff --git a/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/entity/ChainValue.java b/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/entity/ChainValue.java
index 1acf26069..439faf975 100644
--- a/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/entity/ChainValue.java
+++ b/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/entity/ChainValue.java
@@ -1,11 +1,7 @@
 package com.iformall.plugin.entity;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 /**
  * 链里的值
diff --git a/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/shard/annotation/IgnoreSharding.java b/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/shard/annotation/IgnoreSharding.java
index c8388fb10..2e5b00198 100644
--- a/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/shard/annotation/IgnoreSharding.java
+++ b/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/shard/annotation/IgnoreSharding.java
@@ -1,10 +1,6 @@
 package com.iformall.plugin.shard.annotation;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
  * 在mapper方法上面用
diff --git a/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/shard/impl/ShardingRuleExcuter.java b/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/shard/impl/ShardingRuleExcuter.java
index fa5987a2f..432d81f4c 100644
--- a/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/shard/impl/ShardingRuleExcuter.java
+++ b/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/shard/impl/ShardingRuleExcuter.java
@@ -1,12 +1,12 @@
 package com.iformall.plugin.shard.impl;
 
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
 import com.alibaba.druid.util.StringUtils;
 import com.iformall.plugin.shard.impl.rule.ShardingRuleDefaultService;
 import com.iformall.plugin.shard.impl.rule.ShardingRuleService;
 
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
 public class ShardingRuleExcuter {
 
 	private static Map serviceMap = null;
diff --git a/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/shard/plugin/ShardingSpherePlugin.java b/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/shard/plugin/ShardingSpherePlugin.java
index 60927c9de..6bcbe2ae8 100644
--- a/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/shard/plugin/ShardingSpherePlugin.java
+++ b/mybatis-multi-tenancy/src/main/java/com/iformall/plugin/shard/plugin/ShardingSpherePlugin.java
@@ -1,5 +1,11 @@
 package com.iformall.plugin.shard.plugin;
 
+import com.iformall.plugin.MyBatisPlus;
+import com.iformall.plugin.entity.ChainValue;
+import com.iformall.plugin.entity.ChainValueHelper;
+import com.iformall.plugin.shard.impl.ShardingRuleExcuter;
+import com.iformall.plugin.shard.impl.ShardingSphere;
+import com.iformall.plugin.shard.impl.ShardingTableExcuter;
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.parser.CCJSqlParserUtil;
 import net.sf.jsqlparser.schema.Table;
@@ -7,33 +13,22 @@ import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.create.table.CreateTable;
 import net.sf.jsqlparser.statement.delete.Delete;
 import net.sf.jsqlparser.statement.insert.Insert;
-import net.sf.jsqlparser.statement.select.*;
+import net.sf.jsqlparser.statement.select.Select;
 import net.sf.jsqlparser.statement.update.Update;
 import net.sf.jsqlparser.util.TablesNamesFinder;
 import org.apache.ibatis.executor.statement.StatementHandler;
-import org.apache.ibatis.logging.LogFactory;
 import org.apache.ibatis.mapping.BoundSql;
 import org.apache.ibatis.mapping.MappedStatement;
 import org.apache.ibatis.mapping.StatementType;
-import org.apache.ibatis.plugin.*;
+import org.apache.ibatis.plugin.Invocation;
 import org.apache.ibatis.reflection.MetaObject;
 import org.apache.ibatis.reflection.SystemMetaObject;
 
-import com.alibaba.druid.wall.violation.ErrorCode;
-import com.iformall.plugin.MyBatisPlus;
-import com.iformall.plugin.entity.ChainValue;
-import com.iformall.plugin.entity.ChainValueHelper;
-import com.iformall.plugin.shard.annotation.IgnoreSharding;
-import com.iformall.plugin.shard.impl.ShardingRuleExcuter;
-import com.iformall.plugin.shard.impl.ShardingSphere;
-import com.iformall.plugin.shard.impl.ShardingTableExcuter;
-
 import java.lang.reflect.Method;
 import java.math.BigDecimal;
 import java.sql.Date;
 import java.sql.Time;
 import java.sql.Timestamp;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
diff --git a/mybatis-multi-tenancy/src/test/java/com/iformall/plugin/TenantInfoImpl.java b/mybatis-multi-tenancy/src/test/java/com/iformall/plugin/TenantInfoImpl.java
index 50d76a1e7..d33aed803 100644
--- a/mybatis-multi-tenancy/src/test/java/com/iformall/plugin/TenantInfoImpl.java
+++ b/mybatis-multi-tenancy/src/test/java/com/iformall/plugin/TenantInfoImpl.java
@@ -1,10 +1,9 @@
 package com.iformall.plugin;
 
-import java.util.List;
-
+import com.iformall.plugin.autoTenantId.TenantInfo;
 import org.apache.ibatis.mapping.MappedStatement;
 
-import com.iformall.plugin.autoTenantId.TenantInfo;
+import java.util.List;
 
 /**
  * 自行实现TenantInfo获取
diff --git a/mybatis-multi-tenancy/src/test/java/com/iformall/plugin/test/MybatisTest.java b/mybatis-multi-tenancy/src/test/java/com/iformall/plugin/test/MybatisTest.java
index 7aa062426..6298a504c 100644
--- a/mybatis-multi-tenancy/src/test/java/com/iformall/plugin/test/MybatisTest.java
+++ b/mybatis-multi-tenancy/src/test/java/com/iformall/plugin/test/MybatisTest.java
@@ -4,7 +4,6 @@ import com.iformall.plugin.mapper.UserMapper;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.session.SqlSessionFactoryBuilder;
-import org.junit.Test;
 
 import java.io.InputStream;
 import java.util.HashMap;