From 533f47400957e9bdaf55fe4ce5f178ecbfaa3e91 Mon Sep 17 00:00:00 2001
From: quantulr <35954003+quantulr@users.noreply.github.com>
Date: Sat, 18 May 2024 17:09:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 167 ++++++-
 .../java/com/wisdo/mmining/api/BannerApi.java |  48 +-
 .../java/com/wisdo/mmining/api/GoodsApi.java  |  74 ++-
 .../java/com/wisdo/mmining/api/OrderApi.java  |  30 +-
 .../java/com/wisdo/mmining/api/PayApi.java    | 203 ++++----
 .../java/com/wisdo/mmining/api/UserApi.java   | 459 +++++++++---------
 .../java/com/wisdo/mmining/api/WechatApi.java |  47 +-
 .../wisdo/mmining/api/dto/AfterSalesDto.java  |  12 +
 .../com/wisdo/mmining/api/dto/AmountDto.java  |   1 -
 .../wisdo/mmining/api/dto/IntegralDto.java    |   1 -
 .../mmining/controller/BannerController.java  |  37 +-
 .../mmining/controller/BlukController.java    |  71 ++-
 .../mmining/controller/CompanyController.java |  55 ++-
 .../mmining/controller/DeptController.java    |  70 +--
 .../controller/DiscountController.java        |  26 +-
 .../controller/FeedbackController.java        |  30 +-
 .../mmining/controller/FreightController.java |  22 +-
 .../mmining/controller/GoodsController.java   | 330 ++++++-------
 .../controller/GoodsTypeController.java       |  87 ++--
 .../controller/IntegralRolesController.java   |  13 +-
 .../mmining/controller/JoinController.java    |  16 +-
 .../controller/OperationLogController.java    |  12 +-
 .../mmining/controller/OrderController.java   |  47 +-
 .../mmining/controller/PackageController.java |  30 +-
 .../controller/PermissionController.java      |  29 +-
 .../mmining/controller/ProfitsController.java |  11 +-
 .../mmining/controller/RoleController.java    |  45 +-
 .../controller/RolePermissionController.java  |   5 +-
 .../mmining/controller/StoresController.java  |  29 +-
 .../mmining/controller/SysController.java     |  77 +--
 .../mmining/controller/UploadController.java  |   2 +-
 .../mmining/controller/UserController.java    |  64 ++-
 .../mmining/controller/VipController.java     |  35 +-
 .../mmining/controller/VolumeController.java  |  26 +-
 .../mmining/controller/WelFareController.java |  75 ++-
 .../controller/WelfareCustomController.java   |  39 +-
 .../controller/WisdUserController.java        | 203 ++++----
 .../controller/WithdrawalController.java      |  66 +--
 .../mmining/controller/WxUserController.java  |  64 ++-
 .../dto/DeliveryRefundMoneyDto.java           |  12 +
 .../controller/dto/RefundRemarkesDto.java     |  11 +
 .../wisdo/mmining/controller/vo/BlukVo.java   |   3 +-
 .../java/com/wisdo/mmining/entity/City.java   |   2 +-
 .../wisdo/mmining/entity/ExceptionLog.java    |  20 +-
 .../wisdo/mmining/entity/OperationLog.java    |  20 +-
 .../com/wisdo/mmining/entity/Permission.java  |  68 +--
 .../java/com/wisdo/mmining/entity/Role.java   |  58 ++-
 .../wisdo/mmining/entity/RolePermission.java  |  16 +-
 .../java/com/wisdo/mmining/entity/User.java   |  30 +-
 .../com/wisdo/mmining/entity/WisdAbout.java   |  20 +-
 .../com/wisdo/mmining/entity/WisdBack.java    |  20 +-
 .../com/wisdo/mmining/entity/WisdBanner.java  |  18 +-
 .../com/wisdo/mmining/entity/WisdBill.java    |  20 +-
 .../com/wisdo/mmining/entity/WisdBulk.java    |  22 +-
 .../wisdo/mmining/entity/WisdCashVolume.java  |  26 +-
 .../com/wisdo/mmining/entity/WisdCompany.java |  22 +-
 .../wisdo/mmining/entity/WisdContract.java    |  32 +-
 .../com/wisdo/mmining/entity/WisdDept.java    |  22 +-
 .../wisdo/mmining/entity/WisdFeedback.java    |  22 +-
 .../com/wisdo/mmining/entity/WisdFreight.java |  22 +-
 .../com/wisdo/mmining/entity/WisdGoods.java   |  18 +-
 .../wisdo/mmining/entity/WisdGoodsSpec.java   |  22 +-
 .../wisdo/mmining/entity/WisdGoodsType.java   |  20 +-
 .../wisdo/mmining/entity/WisdIntegral.java    |  22 +-
 .../mmining/entity/WisdIntegrlRoles.java      |  20 +-
 .../com/wisdo/mmining/entity/WisdJoin.java    |  24 +-
 .../wisdo/mmining/entity/WisdOrderDetail.java |  24 +-
 .../com/wisdo/mmining/entity/WisdPackage.java |  22 +-
 .../com/wisdo/mmining/entity/WisdProfits.java |  22 +-
 .../wisdo/mmining/entity/WisdSettlement.java  |  21 +-
 .../com/wisdo/mmining/entity/WisdStores.java  |  22 +-
 .../com/wisdo/mmining/entity/WisdUser.java    |  18 +-
 .../wisdo/mmining/entity/WisdUserAddress.java |  20 +-
 .../wisdo/mmining/entity/WisdUserCart.java    |  22 +-
 .../wisdo/mmining/entity/WisdUserPackage.java |  22 +-
 .../mmining/entity/WisdUserPayrecord.java     |  22 +-
 .../wisdo/mmining/entity/WisdUserVolume.java  |  22 +-
 .../com/wisdo/mmining/entity/WisdVip.java     |  22 +-
 .../com/wisdo/mmining/entity/WisdWelfare.java |  22 +-
 .../wisdo/mmining/entity/WisdWithdrawal.java  |  20 +-
 .../com/wisdo/mmining/entity/WisdWxuser.java  |  18 +-
 .../com/wisdo/mmining/mapper/BackMapper.java  |   1 -
 .../wisdo/mmining/mapper/ContractMapper.java  |   2 +-
 .../com/wisdo/mmining/mapper/OrderMapper.java |   1 +
 .../mmining/mapper/PermissionMapper.java      |  18 +-
 .../com/wisdo/mmining/mapper/RoleMapper.java  |  18 +-
 .../mmining/mapper/RolePermissionMapper.java  |   4 +-
 .../com/wisdo/mmining/mapper/UserMapper.java  |  11 +-
 .../mmining/mapper/WithdrawalMapper.java      |   2 +-
 .../wisdo/mmining/service/BannerService.java  |   2 +
 .../mmining/service/CashVolumeService.java    |  10 +-
 .../wisdo/mmining/service/CompanyService.java |   2 +
 .../mmining/service/ContractService.java      |   2 +
 .../wisdo/mmining/service/DeptService.java    |   6 +-
 .../mmining/service/FeedBackService.java      |   3 +-
 .../wisdo/mmining/service/GoodsService.java   |  37 +-
 .../mmining/service/GoodsSpecService.java     |   3 +-
 .../mmining/service/GoodsTypeService.java     |   3 +
 .../wisdo/mmining/service/JoinService.java    |   3 +-
 .../mmining/service/OperationLogService.java  |   7 +-
 .../mmining/service/OrderDetailService.java   |   1 +
 .../wisdo/mmining/service/OrderService.java   |   8 +-
 .../wisdo/mmining/service/PackageService.java |  10 +-
 .../mmining/service/PermissionService.java    |  23 +-
 .../service/RolePermissionService.java        |   4 +-
 .../wisdo/mmining/service/RoleService.java    |  23 +-
 .../wisdo/mmining/service/StoresService.java  |   1 +
 .../wisdo/mmining/service/UserService.java    |  30 +-
 .../com/wisdo/mmining/service/VipService.java |   3 +
 .../wisdo/mmining/service/WelfareService.java |   1 +
 .../mmining/service/WisdUserService.java      |   9 +-
 .../mmining/service/WithdrawalService.java    |   3 +-
 .../wisdo/mmining/service/WxuserService.java  |   2 +
 .../service/impl/BannerServiceImpl.java       |   8 +-
 .../mmining/service/impl/BillServiceImpl.java |  14 +-
 .../mmining/service/impl/BlukServiceImpl.java |   1 -
 .../service/impl/CashVolumeServiceImpl.java   | 110 +++--
 .../service/impl/CompanyServiceImpl.java      |   6 +-
 .../service/impl/ContractServiceImpl.java     |  39 +-
 .../mmining/service/impl/DeptServiceImpl.java |  23 +-
 .../service/impl/FeedBackServiceImpl.java     |  10 +-
 .../service/impl/GoodsServiceImpl.java        |  13 +-
 .../service/impl/GoodsSpecServiceImpl.java    |  21 +-
 .../service/impl/GoodsTypeServiceImpl.java    |  32 +-
 .../mmining/service/impl/JoinServiceImpl.java |   6 +-
 .../service/impl/OperationLogServiceImpl.java |   4 +-
 .../service/impl/OrderDetailServiceImpl.java  |   4 +-
 .../service/impl/OrderServiceImpl.java        |  15 +-
 .../service/impl/PackageServiceImpl.java      |  51 +-
 .../service/impl/PermissionServiceImpl.java   |  12 +-
 .../service/impl/ProfitsServiceImpl.java      |  74 +--
 .../impl/RolePermissionServiceImpl.java       |   2 +-
 .../mmining/service/impl/RoleServiceImpl.java |  32 +-
 .../service/impl/SettlementServiceImpl.java   |   2 +-
 .../service/impl/StoresServiceImpl.java       |   8 +-
 .../service/impl/UserPackageServiceImpl.java  |  16 +-
 .../mmining/service/impl/UserServiceImpl.java |  24 +-
 .../mmining/service/impl/VipServiceImpl.java  |  24 +-
 .../service/impl/WelfareServiceImpl.java      |   4 +-
 .../service/impl/WisdUserServiceImpl.java     | 132 ++---
 .../service/impl/WithdrawalServiceImpl.java   |  12 +-
 .../service/impl/WxuserServiceImpl.java       |  69 ++-
 .../wisdo/mmining/utils/CreateStrUtil.java    |   2 +-
 .../com/wisdo/mmining/utils/DistanceUtil.java |   2 +
 .../com/wisdo/mmining/utils/HttpClients.java  |  30 +-
 .../com/wisdo/mmining/utils/HttpUtil.java     |   6 +-
 .../com/wisdo/mmining/utils/HttpUtils.java    |  51 +-
 .../wisdo/mmining/utils/LogisticsUtil.java    |   2 +-
 .../java/com/wisdo/mmining/utils/PayUtil.java |  40 +-
 .../com/wisdo/mmining/utils/PhoneUtils.java   |   4 +-
 .../com/wisdo/mmining/utils/PkPerson.java     |   2 -
 .../com/wisdo/mmining/utils/QRCodeUtil.java   |  52 +-
 .../com/wisdo/mmining/utils/RSAUtils.java     |  83 ++--
 .../com/wisdo/mmining/utils/RankQueue.java    |   2 +-
 .../java/com/wisdo/mmining/utils/SmsSend.java |   8 +-
 .../java/com/wisdo/mmining/utils/Tools.java   |   9 +-
 .../com/wisdo/mmining/utils/WxBase64.java     |  34 +-
 .../com/wisdo/mmining/utils/WxConfig.java     |   8 +-
 .../com/wisdo/mmining/utils/WxPayUtil.java    |   6 +-
 .../java/com/wisdo/mmining/utils/WxUtil.java  |   9 +-
 .../wisdo/mmining/utils/smsUtils/SmsSend.java |   6 +-
 .../mmining/utils/smsUtils/SmsSenderUtil.java |  64 +--
 .../utils/smsUtils/SmsSingleSender.java       | 203 ++++----
 .../utils/smsUtils/SmsSingleSenderResult.java |  22 +-
 .../view/pages/order/order_refund_list.jsp    |   6 +-
 .../pages/order/order_refund_logistics.jsp    | 171 ++++++-
 .../view/pages/order/order_refund_remarke.jsp | 119 ++++-
 167 files changed, 2975 insertions(+), 2576 deletions(-)
 create mode 100644 src/main/java/com/wisdo/mmining/api/dto/AfterSalesDto.java
 create mode 100644 src/main/java/com/wisdo/mmining/controller/dto/DeliveryRefundMoneyDto.java
 create mode 100644 src/main/java/com/wisdo/mmining/controller/dto/RefundRemarkesDto.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b34203c..373742c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,14 +5,172 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="bdad98b9-7a5e-48f7-b79e-ed6a34d55dab" name="Default Changelist" comment="第一次提交">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/api/dto/AfterSalesDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/dto/DeliveryRefundMoneyDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/dto/RefundRemarkesDto.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/api/BannerApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/api/BannerApi.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/api/GoodsApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/api/GoodsApi.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/api/OrderApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/api/OrderApi.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/api/PayApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/api/PayApi.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/api/UserApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/api/UserApi.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/api/WechatApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/api/WechatApi.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/api/dto/AmountDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/api/dto/AmountDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/api/dto/IntegralDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/api/dto/IntegralDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/BannerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/BannerController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/BlukController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/BlukController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/CompanyController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/CompanyController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/DeptController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/DeptController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/DiscountController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/DiscountController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/FeedbackController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/FeedbackController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/FreightController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/FreightController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/GoodsController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/GoodsController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/GoodsTypeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/GoodsTypeController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/IntegralRolesController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/IntegralRolesController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/JoinController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/JoinController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/OperationLogController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/OperationLogController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/OrderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/OrderController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/dto/PackageDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/dto/PackageDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdOeder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdOeder.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/PackageController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/PackageController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/PermissionController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/PermissionController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/ProfitsController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/ProfitsController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/RoleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/RoleController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/RolePermissionController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/RolePermissionController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/StoresController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/StoresController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/SysController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/SysController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/UploadController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/UploadController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/UserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/UserController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/VipController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/VipController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/VolumeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/VolumeController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/WelFareController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/WelFareController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/WelfareCustomController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/WelfareCustomController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/WisdUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/WisdUserController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/WithdrawalController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/WithdrawalController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/WxUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/WxUserController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/vo/BlukVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/vo/BlukVo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/City.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/City.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/ExceptionLog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/ExceptionLog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/OperationLog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/OperationLog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/Permission.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/Permission.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/Role.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/Role.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/RolePermission.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/RolePermission.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/User.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdAbout.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdAbout.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdBack.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdBack.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdBanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdBanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdBill.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdBill.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdBulk.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdBulk.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdCashVolume.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdCashVolume.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdCompany.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdCompany.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdContract.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdContract.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdDept.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdDept.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdFeedback.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdFeedback.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdFreight.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdFreight.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdGoods.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdGoods.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdGoodsSpec.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdGoodsSpec.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdGoodsType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdGoodsType.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdIntegral.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdIntegral.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdIntegrlRoles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdIntegrlRoles.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdJoin.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdJoin.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdOrderDetail.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdOrderDetail.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdProfits.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdProfits.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdSettlement.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdSettlement.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdStores.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdStores.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdUserAddress.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdUserAddress.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdUserCart.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdUserCart.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdUserPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdUserPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdUserPayrecord.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdUserPayrecord.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdUserVolume.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdUserVolume.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdVip.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdVip.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdWelfare.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdWelfare.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdWithdrawal.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdWithdrawal.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdWxuser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdWxuser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/mapper/BackMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/mapper/BackMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/mapper/ContractMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/mapper/ContractMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/mapper/OrderMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/mapper/OrderMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/mapper/PermissionMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/mapper/PermissionMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/mapper/RoleMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/mapper/RoleMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/mapper/RolePermissionMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/mapper/RolePermissionMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/mapper/UserMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/mapper/UserMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/mapper/WithdrawalMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/mapper/WithdrawalMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/BannerService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/BannerService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/CashVolumeService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/CashVolumeService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/CompanyService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/CompanyService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/ContractService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/ContractService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/DeptService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/DeptService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/FeedBackService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/FeedBackService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/GoodsService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/GoodsService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/GoodsSpecService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/GoodsSpecService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/GoodsTypeService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/GoodsTypeService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/JoinService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/JoinService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/OperationLogService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/OperationLogService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/OrderDetailService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/OrderDetailService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/OrderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/OrderService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/PackageService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/PackageService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/PermissionService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/PermissionService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/RolePermissionService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/RolePermissionService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/RoleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/RoleService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/StoresService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/StoresService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/UserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/UserService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/VipService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/VipService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/WelfareService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/WelfareService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/WisdUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/WisdUserService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/WithdrawalService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/WithdrawalService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/WxuserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/WxuserService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/BannerServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/BannerServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/BillServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/BillServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/BlukServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/BlukServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/CashVolumeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/CashVolumeServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/CompanyServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/CompanyServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/ContractServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/ContractServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/DeptServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/DeptServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/FeedBackServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/FeedBackServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/GoodsServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/GoodsServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/GoodsSpecServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/GoodsSpecServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/GoodsTypeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/GoodsTypeServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/JoinServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/JoinServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/OperationLogServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/OperationLogServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/OrderDetailServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/OrderDetailServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/OrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/OrderServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/application-db.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-db.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/PackageServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/PackageServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/PermissionServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/PermissionServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/ProfitsServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/ProfitsServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/RolePermissionServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/RolePermissionServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/RoleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/RoleServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/SettlementServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/SettlementServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/StoresServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/StoresServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/UserPackageServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/UserPackageServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/UserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/UserServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/VipServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/VipServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/WelfareServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/WelfareServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/WisdUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/WisdUserServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/WithdrawalServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/WithdrawalServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/WxuserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/WxuserServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/CreateStrUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/CreateStrUtil.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/DistanceUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/DistanceUtil.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/HttpClients.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/HttpClients.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/HttpUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/HttpUtil.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/HttpUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/HttpUtils.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/LogisticsUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/LogisticsUtil.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/PayUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/PayUtil.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/PhoneUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/PhoneUtils.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/PkPerson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/PkPerson.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/QRCodeUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/QRCodeUtil.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/RSAUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/RSAUtils.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/RankQueue.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/RankQueue.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/SmsSend.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/SmsSend.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/Tools.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/Tools.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/WxBase64.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/WxBase64.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/WxConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/WxConfig.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/WxPayUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/WxPayUtil.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/WxUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/WxUtil.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/smsUtils/SmsSend.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/smsUtils/SmsSend.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/smsUtils/SmsSenderUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/smsUtils/SmsSenderUtil.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/smsUtils/SmsSingleSender.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/smsUtils/SmsSingleSender.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/smsUtils/SmsSingleSenderResult.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/utils/smsUtils/SmsSingleSenderResult.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/order/order_refund_list.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/order/order_refund_list.jsp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/order/order_refund_logistics.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/order/order_refund_logistics.jsp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/order/order_refund_remarke.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/order/order_refund_remarke.jsp" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -626,7 +784,8 @@
       <workItem from="1715733500690" duration="26406000" />
       <workItem from="1715820168403" duration="9618000" />
       <workItem from="1715830422976" duration="3631000" />
-      <workItem from="1715906701068" duration="17004000" />
+      <workItem from="1715906701068" duration="17604000" />
+      <workItem from="1715993624044" duration="21488000" />
     </task>
     <task id="LOCAL-00001" summary="第一次提交">
       <created>1623736948713</created>
diff --git a/src/main/java/com/wisdo/mmining/api/BannerApi.java b/src/main/java/com/wisdo/mmining/api/BannerApi.java
index 2167c63..1afb2b7 100644
--- a/src/main/java/com/wisdo/mmining/api/BannerApi.java
+++ b/src/main/java/com/wisdo/mmining/api/BannerApi.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.wisdo.mmining.entity.WisdBanner;
 import com.wisdo.mmining.entity.WisdJoin;
 import com.wisdo.mmining.entity.WisdWelfare;
-import com.wisdo.mmining.redis.RedisService;
 import com.wisdo.mmining.result.Result;
 import com.wisdo.mmining.result.ResultUtil;
 import com.wisdo.mmining.service.BannerService;
@@ -12,11 +11,8 @@ import com.wisdo.mmining.service.JoinService;
 import com.wisdo.mmining.service.WelfareService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -40,48 +36,48 @@ public class BannerApi {
     @GetMapping("getBanner")
     public Result getBanner(Integer type) {
         QueryWrapper<WisdBanner> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("banner_type",type);
-        if (type==1){
+        queryWrapper.eq("banner_type", type);
+        if (type == 1) {
             queryWrapper.orderByAsc("sort");
         }
-        List<WisdBanner> wisdBanner=bannerService.list(queryWrapper);
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG,wisdBanner);
+        List<WisdBanner> wisdBanner = bannerService.list(queryWrapper);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG, wisdBanner);
     }
 
     @ApiOperation(value = "轮播图跳转富文本")
     @GetMapping("getBannerJump")
     public Result getBannerJump(Long id) {
         QueryWrapper<WisdWelfare> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("id",id);
-        WisdWelfare wisdWelfare=welfareService.getOne(queryWrapper);
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG,wisdWelfare);
+        queryWrapper.eq("id", id);
+        WisdWelfare wisdWelfare = welfareService.getOne(queryWrapper);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG, wisdWelfare);
     }
 
     @ApiOperation(value = "首页模块图片")
     @GetMapping("getBannerImg")
     public Result getBannerImg() {
         QueryWrapper<WisdBanner> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("banner_type",6).or().eq("banner_type",7).or().eq("banner_type",8).or().eq("banner_type",9).or().eq("banner_type",10).or().eq("banner_type",11);
-        List<WisdBanner> wisdBannerList=bannerService.list(queryWrapper);
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG,wisdBannerList);
+        queryWrapper.eq("banner_type", 6).or().eq("banner_type", 7).or().eq("banner_type", 8).or().eq("banner_type", 9).or().eq("banner_type", 10).or().eq("banner_type", 11);
+        List<WisdBanner> wisdBannerList = bannerService.list(queryWrapper);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG, wisdBannerList);
     }
 
     @ApiOperation(value = "获取福利定制富文本")
     @GetMapping("getWelfareCustom")
     public Result getWelfareCustom() {
         QueryWrapper<WisdWelfare> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("welfare_type",1);
-        WisdWelfare wisdWelfare=welfareService.getOne(queryWrapper);
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG,wisdWelfare);
+        queryWrapper.eq("welfare_type", 1);
+        WisdWelfare wisdWelfare = welfareService.getOne(queryWrapper);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG, wisdWelfare);
     }
 
     @ApiOperation(value = "福利定制申请")
     @PostMapping("addWelfareCustom")
     public Result addWelfareCustom(@RequestBody WisdJoin wisdJoin) {
-        Boolean flag=joinService.save(wisdJoin);
-        if (flag){
+        Boolean flag = joinService.save(wisdJoin);
+        if (flag) {
             return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG);
-        }else {
+        } else {
             return new Result(ResultUtil.ERROR, ResultUtil.ERROR_MSG);
         }
     }
@@ -90,18 +86,18 @@ public class BannerApi {
     @GetMapping("getDistribution")
     public Result getDistribution() {
         QueryWrapper<WisdWelfare> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("welfare_type",2);
-        WisdWelfare wisdWelfare=welfareService.getOne(queryWrapper);
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG,wisdWelfare);
+        queryWrapper.eq("welfare_type", 2);
+        WisdWelfare wisdWelfare = welfareService.getOne(queryWrapper);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG, wisdWelfare);
     }
 
     @ApiOperation(value = "获取促销富文本")
     @GetMapping("getPromotion")
     public Result getPromotion() {
         QueryWrapper<WisdWelfare> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("welfare_type",6);
-        WisdWelfare wisdWelfare=welfareService.getOne(queryWrapper);
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG,wisdWelfare);
+        queryWrapper.eq("welfare_type", 6);
+        WisdWelfare wisdWelfare = welfareService.getOne(queryWrapper);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG, wisdWelfare);
     }
 
 
diff --git a/src/main/java/com/wisdo/mmining/api/GoodsApi.java b/src/main/java/com/wisdo/mmining/api/GoodsApi.java
index 2a298b5..5e2db42 100644
--- a/src/main/java/com/wisdo/mmining/api/GoodsApi.java
+++ b/src/main/java/com/wisdo/mmining/api/GoodsApi.java
@@ -1,7 +1,5 @@
 package com.wisdo.mmining.api;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -19,8 +17,6 @@ import org.apache.solr.client.solrj.response.QueryResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-import java.lang.reflect.Array;
 import java.math.BigDecimal;
 import java.util.*;
 
@@ -145,8 +141,8 @@ public class GoodsApi {
         queryWrapper.and(wrapper -> wisdThreeGoodsTypeList.forEach(wisdGoodsType -> {
             wrapper.or().eq("goods_type_id", wisdGoodsType.getId());
         }));
-        Page<WisdGoods> p = new Page<>(page,num);
-        IPage<WisdGoods> wisdGoodsList1 = goodsService.page(p,queryWrapper);
+        Page<WisdGoods> p = new Page<>(page, num);
+        IPage<WisdGoods> wisdGoodsList1 = goodsService.page(p, queryWrapper);
         for (WisdGoods wisdGoods : wisdGoodsList1.getRecords()) {
             QueryWrapper<WisdGoodsSpec> queryWrapper1 = new QueryWrapper<>();
             queryWrapper1.eq("goods_id", wisdGoods.getId());
@@ -199,15 +195,15 @@ public class GoodsApi {
 //        queryWrapper.eq("is_seasonal", 0);
 //        queryWrapper.eq("status", 1);
         QueryWrapper<WisdContract> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("contract_number",goodsName);
-        WisdContract wisdContract=contractService.getOne(queryWrapper);
-        List<WisdGoods> wisdGoodsList1=new ArrayList<>();
-        if (wisdContract==null) {
+        queryWrapper.eq("contract_number", goodsName);
+        WisdContract wisdContract = contractService.getOne(queryWrapper);
+        List<WisdGoods> wisdGoodsList1 = new ArrayList<>();
+        if (wisdContract == null) {
             wisdGoodsList1 = goodsService.searchGoods(goodsName);
-        }else {
-            String[] goodIds=wisdContract.getGoodsId().split(",");
-            for (int i=0;i<goodIds.length;i++){
-                WisdGoods wisdGoods=goodsService.getById(Long.parseLong(goodIds[i]));
+        } else {
+            String[] goodIds = wisdContract.getGoodsId().split(",");
+            for (int i = 0; i < goodIds.length; i++) {
+                WisdGoods wisdGoods = goodsService.getById(Long.parseLong(goodIds[i]));
                 wisdGoodsList1.add(wisdGoods);
             }
         }
@@ -218,22 +214,22 @@ public class GoodsApi {
     @ApiOperation(value = "根据三级分类id获取商品")
     @GetMapping("getGoodsByThreeType")
     public Result getGoodsByThreeType(Long threeTypeId, Long userId, Integer goodsSales, Integer smallprice, Integer bigprice, Integer news, String goodsName, Integer isDiscount, Double oneProfitsS, Double oneProfitsE, Double twoProfitsS, Double twoProfitsE, int page, int num) throws Exception {
-        String[] goodsname=goodsName.split("");
-        String goodsNames="%";
-        for (int i=0;i<goodsname.length;i++){
-            goodsNames+=goodsname[i]+"%";
+        String[] goodsname = goodsName.split("");
+        String goodsNames = "%";
+        for (int i = 0; i < goodsname.length; i++) {
+            goodsNames += goodsname[i] + "%";
         }
-        IPage<WisdGoods> wisdGoodsList1=null;
+        IPage<WisdGoods> wisdGoodsList1 = null;
         QueryWrapper<WisdGoods> queryWrapper = new QueryWrapper<>();
         if (goodsName != "" && !"".equals(goodsName)) {
             QueryWrapper<WisdContract> contractQueryWrapper = new QueryWrapper<>();
-            contractQueryWrapper.eq("contract_number",goodsName);
-            WisdContract wisdContract=contractService.getOne(contractQueryWrapper);
-            if (wisdContract!=null){
+            contractQueryWrapper.eq("contract_number", goodsName);
+            WisdContract wisdContract = contractService.getOne(contractQueryWrapper);
+            if (wisdContract != null) {
                 String[] idArray = wisdContract.getGoodsId().split(",");
                 QueryWrapper<WisdGoods> goodsQueryWrapper = new QueryWrapper<>();
                 goodsQueryWrapper.and(wrapper -> Arrays.stream(idArray).forEach(id -> {
-                    if (id!=null) {
+                    if (id != null) {
                         wrapper.or().eq("id", id);
                     }
                 }));
@@ -263,15 +259,15 @@ public class GoodsApi {
                 }
                 Page<WisdGoods> p = new Page<>(page, num);
                 wisdGoodsList1 = goodsService.page(p, goodsQueryWrapper);
-            }else {
-                String str="goodsName:"+goodsName;
-                SolrQuery solrQuery=new SolrQuery(str);//查询所有
-                solrQuery.setStart((page-1)*num);//设置起始条数
+            } else {
+                String str = "goodsName:" + goodsName;
+                SolrQuery solrQuery = new SolrQuery(str);//查询所有
+                solrQuery.setStart((page - 1) * num);//设置起始条数
                 solrQuery.setRows(num);
                 QueryResponse query = solrClient.query(solrQuery);
 
                 Long numFound = query.getResults().getNumFound();
-                System.out.println("总记录数："+numFound);
+                System.out.println("总记录数：" + numFound);
 
 
                 List<WisdGoods> beans = query.getBeans(WisdGoods.class);
@@ -281,7 +277,7 @@ public class GoodsApi {
                             wrapper.or().eq("id", goods.getId());
                         }
                     }));
-                }else {
+                } else {
                     return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG, wisdGoodsList1);
                 }
                 //queryWrapper.like("goods_name", goodsNames);
@@ -314,7 +310,7 @@ public class GoodsApi {
                 wisdGoodsList1 = goodsService.page(p, queryWrapper);
                 wisdGoodsList1.setTotal(numFound);
             }
-        }else {
+        } else {
 
             if (threeTypeId != 0) {
                 queryWrapper.eq("goods_type_id", threeTypeId);
@@ -569,7 +565,7 @@ public class GoodsApi {
                         queryWrapper4.eq("spec_id", wisdGoodsSpec.getId());
                         queryWrapper4.eq("is_enable", 1);
                         List<WisdBulk> wisdBulkList = blukService.list(queryWrapper4);
-                        if (wisdBulkList.size()!=0) {
+                        if (wisdBulkList.size() != 0) {
                             DoubleSummaryStatistics summaryStatistics = wisdBulkList.stream().mapToDouble((s) -> s.getGoodsBulkPrice().doubleValue()).summaryStatistics();
                             Double average = summaryStatistics.getAverage();
                             if (average == 0) {
@@ -585,8 +581,8 @@ public class GoodsApi {
                                     wisdGoods.setRecommendedBulyPrice(average);
                                 }
                             }
-                        }else {
-                            if(wisdGoods.getGoodsClassify()!=2) {
+                        } else {
+                            if (wisdGoods.getGoodsClassify() != 2) {
                                 wisdGoods.setRecommendedBulyPrice(wisdGoods.getGoodsBlukPrice().doubleValue());
                             }
                         }
@@ -598,7 +594,7 @@ public class GoodsApi {
                 queryWrapper4.eq("spec_id", wisdGoodsSpecList.get(0).getId());
                 queryWrapper4.eq("is_enable", 1);
                 List<WisdBulk> wisdBulkList = blukService.list(queryWrapper4);
-                if (wisdBulkList.size()!=0) {
+                if (wisdBulkList.size() != 0) {
                     DoubleSummaryStatistics summaryStatistics = wisdBulkList.stream().mapToDouble((s) -> s.getGoodsBulkPrice().doubleValue()).summaryStatistics();
                     Double average = summaryStatistics.getAverage();
                     if (average == 0) {
@@ -610,8 +606,8 @@ public class GoodsApi {
                             wisdGoods.setRecommendedBulyPrice(average);
                         }
                     }
-                }else {
-                    if(wisdGoods.getGoodsClassify()!=2) {
+                } else {
+                    if (wisdGoods.getGoodsClassify() != 2) {
                         wisdGoods.setRecommendedBulyPrice(wisdGoods.getGoodsBlukPrice().doubleValue());
                     }
                 }
@@ -622,7 +618,7 @@ public class GoodsApi {
             queryWrapper4.eq("spec_id", wisdGoodsSpecList.get(0).getId());
             queryWrapper4.eq("is_enable", 1);
             List<WisdBulk> wisdBulkList = blukService.list(queryWrapper4);
-            if (wisdBulkList.size()!=0) {
+            if (wisdBulkList.size() != 0) {
                 DoubleSummaryStatistics summaryStatistics = wisdBulkList.stream().mapToDouble((s) -> s.getGoodsBulkPrice().doubleValue()).summaryStatistics();
                 Double average = summaryStatistics.getAverage();
                 if (average == 0) {
@@ -634,8 +630,8 @@ public class GoodsApi {
                         wisdGoods.setRecommendedBulyPrice(average);
                     }
                 }
-            }else {
-                if(wisdGoods.getGoodsClassify()!=2) {
+            } else {
+                if (wisdGoods.getGoodsClassify() != 2) {
                     wisdGoods.setRecommendedBulyPrice(wisdGoods.getGoodsBlukPrice().doubleValue());
                 }
             }
diff --git a/src/main/java/com/wisdo/mmining/api/OrderApi.java b/src/main/java/com/wisdo/mmining/api/OrderApi.java
index 26a96f2..cbfd118 100644
--- a/src/main/java/com/wisdo/mmining/api/OrderApi.java
+++ b/src/main/java/com/wisdo/mmining/api/OrderApi.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.wisdo.mmining.api.dto.AfterSalesDto;
 import com.wisdo.mmining.api.dto.AmountDto;
 import com.wisdo.mmining.api.dto.GoodsDto;
 import com.wisdo.mmining.controller.dto.PackageDto;
@@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 
 /**
@@ -102,21 +104,21 @@ public class OrderApi {
                 return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG, map);
             }
         } else {
-            BigDecimal userDiscount = new BigDecimal(new Double(wisdWxuser.getUserDiscount()) / 100);
-            BigDecimal discount = userDiscount.setScale(2, BigDecimal.ROUND_HALF_DOWN);
+            BigDecimal userDiscount = BigDecimal.valueOf(new Double(wisdWxuser.getUserDiscount()) / 100);
+            BigDecimal discount = userDiscount.setScale(2, RoundingMode.HALF_DOWN);
             if (wisdWxuser.getUserDiscountBalance().compareTo(priceSum) == 1) {
-                BigDecimal newprice = priceSum.multiply(discount).setScale(2, BigDecimal.ROUND_HALF_DOWN);
+                BigDecimal newprice = priceSum.multiply(discount).setScale(2, RoundingMode.HALF_DOWN);
                 map.put("volumeBalance", priceSum);
                 map.put("priceSum", newprice);
                 return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG, map);
             } else {
-                BigDecimal newprice = priceSum.multiply(discount).setScale(2, BigDecimal.ROUND_HALF_DOWN);
+                BigDecimal newprice = priceSum.multiply(discount).setScale(2, RoundingMode.HALF_DOWN);
                 if (wisdWxuser.getUserDiscountBalance().compareTo(newprice) == 1) {
                     map.put("volumeBalance", priceSum);
                     map.put("priceSum", newprice);
                     return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG, map);
                 } else if (wisdWxuser.getUserDiscountBalance().compareTo(newprice) == -1) {
-                    BigDecimal discountPrice = wisdWxuser.getUserDiscountBalance().divide(discount, 2, BigDecimal.ROUND_DOWN);
+                    BigDecimal discountPrice = wisdWxuser.getUserDiscountBalance().divide(discount, 2, RoundingMode.DOWN);
                     map.put("volumeBalance", discountPrice);
                     map.put("priceSum", wisdWxuser.getUserDiscountBalance());
                     return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG, map);
@@ -190,8 +192,8 @@ public class OrderApi {
 
     @ApiOperation(value = "申请退换货")
     @PostMapping("afterSales")
-    public Result afterSales(Long orderId, String orderRefund, String orderRefundImg, Integer status, Long packageId) throws JsonProcessingException {
-        WisdOeder wisdOeder = orderService.getById(orderId);
+    public Result afterSales(@RequestBody AfterSalesDto afterSalesDto) throws JsonProcessingException {
+        WisdOeder wisdOeder = orderService.getById(afterSalesDto.getOrderId());
         Long orderNumber = (new Date()).getTime();
         wisdOeder.setOrderRefundNum("T" + orderNumber);
         if (wisdOeder.getOrderPayWay() == 3) {
@@ -276,26 +278,26 @@ public class OrderApi {
 //            }
         } else {
 //            wisdOeder.setStatus(status);
-            wisdOeder.setAfterSalesStatus(status);
+            wisdOeder.setAfterSalesStatus(afterSalesDto.getStatus());
             String logisticsJson = wisdOeder.getLogistics();
             ObjectMapper objectMapper = new ObjectMapper();
             List<PackageDto> packages = objectMapper.readValue(logisticsJson, new TypeReference<List<PackageDto>>() {
             });
             for (PackageDto pack : packages) {
-                if (pack.getId().equals(packageId)) {
-                    pack.setAfterSalesStatus(status);
+                if (pack.getId().equals(afterSalesDto.getPackageId())) {
+                    pack.setAfterSalesStatus(afterSalesDto.getStatus());
                 }
             }
             String newLogisticsJson = objectMapper.writeValueAsString(packages);
             wisdOeder.setLogistics(newLogisticsJson);
-            if (status == 61) {
+            if (afterSalesDto.getStatus() == 61) {
                 wisdOeder.setOrderRefundType(1);
-            } else if (status == 62) {
+            } else if (afterSalesDto.getStatus() == 62) {
                 wisdOeder.setOrderRefundType(2);
             }
         }
-        wisdOeder.setOrderRefund(orderRefund);
-        wisdOeder.setOrderRefundImg(orderRefundImg);
+        wisdOeder.setOrderRefund(afterSalesDto.getOrderRefund());
+        wisdOeder.setOrderRefundImg(afterSalesDto.getOrderRefundImg());
         wisdOeder.setOrderRefundTime(new Date());
         Boolean flag = orderService.updateById(wisdOeder);
         if (flag) {
diff --git a/src/main/java/com/wisdo/mmining/api/PayApi.java b/src/main/java/com/wisdo/mmining/api/PayApi.java
index 8c5114d..333994d 100644
--- a/src/main/java/com/wisdo/mmining/api/PayApi.java
+++ b/src/main/java/com/wisdo/mmining/api/PayApi.java
@@ -70,34 +70,27 @@ public class PayApi {
     private BillService billService;
 
 
-    public Boolean promotionNum(Long userId,WisdGoods wisdGoods,Integer goodsNum){
+    public Boolean promotionNum(Long userId, WisdGoods wisdGoods, Integer goodsNum) {
         QueryWrapper<WisdOeder> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("user_id",userId);
-        queryWrapper.ne("status",5);
-        queryWrapper.ne("status",1);
-        queryWrapper.eq("is_promotion",1);
-        List<WisdOeder> wisdOederList=orderService.list(queryWrapper);
-        Integer count=0;
-        if (wisdOederList.isEmpty()){
-            if (goodsNum<=wisdGoods.getPromotionNum()){
-                return true;
-            }else {
-                return false;
-            }
+        queryWrapper.eq("user_id", userId);
+        queryWrapper.ne("status", 5);
+        queryWrapper.ne("status", 1);
+        queryWrapper.eq("is_promotion", 1);
+        List<WisdOeder> wisdOederList = orderService.list(queryWrapper);
+        Integer count = 0;
+        if (wisdOederList.isEmpty()) {
+            return goodsNum <= wisdGoods.getPromotionNum();
         }
-        for (WisdOeder wisdOeder:wisdOederList){
+        for (WisdOeder wisdOeder : wisdOederList) {
             QueryWrapper<WisdOrderDetail> orderDetailQueryWrapper = new QueryWrapper<>();
-            orderDetailQueryWrapper.eq("order_id",wisdOeder.getId());
-            orderDetailQueryWrapper.eq("goods_id",wisdGoods.getId());
-            WisdOrderDetail wisdOrderDetail=orderDetailService.getOne(orderDetailQueryWrapper);
-            if (wisdOrderDetail!=null) {
+            orderDetailQueryWrapper.eq("order_id", wisdOeder.getId());
+            orderDetailQueryWrapper.eq("goods_id", wisdGoods.getId());
+            WisdOrderDetail wisdOrderDetail = orderDetailService.getOne(orderDetailQueryWrapper);
+            if (wisdOrderDetail != null) {
                 count += wisdOrderDetail.getGoodsNum();
             }
         }
-        if (count<=wisdGoods.getPromotionNum()){
-            return true;
-        }
-        return false;
+        return count <= wisdGoods.getPromotionNum();
     }
 
     @ApiOperation(value = "订单支付(微信)")
@@ -107,18 +100,18 @@ public class PayApi {
     })
     @PutMapping("payOrder")
     @ResponseBody
-    public Result payOrder(Long userId,  String orderNumber,  HttpServletRequest request) {
-        if (userId==null) {
+    public Result payOrder(Long userId, String orderNumber, HttpServletRequest request) {
+        if (userId == null) {
             return new Result(ResultUtil.ERROR, "请重新登录");
         }
         if (orderNumber == null) {
-            return new Result(ResultUtil.ERROR, "参数为空" );
+            return new Result(ResultUtil.ERROR, "参数为空");
         }
-        WisdWxuser wisdWxuser=wxuserService.getById(userId);
+        WisdWxuser wisdWxuser = wxuserService.getById(userId);
         if (wisdWxuser == null) {
             return new Result(ResultUtil.ERROR, "请再试一次");
         }
-        String openid=wisdWxuser.getWxOpenid();
+        String openid = wisdWxuser.getWxOpenid();
         WisdOeder order = orderService.getOrderByNumber(orderNumber);
         if (order == null || (order != null && !order.getOrderNumber().equals(orderNumber))) {
             return new Result(ResultUtil.ERROR, "请重新下单");
@@ -130,16 +123,16 @@ public class PayApi {
         List<WisdOrderDetail> orderDetailList = orderDetailService.getByOrderId(order.getId());
         for (WisdOrderDetail orderDetail : orderDetailList) {
             WisdGoodsSpec goodsSpec = goodsSpecService.getInfoById(orderDetail.getSpecId());
-            if (order.getOrderPayWay()!=3) {
+            if (order.getOrderPayWay() != 3) {
                 if (orderDetail.getGoodsNum() > goodsSpec.getSpecStock()) {
                     return new Result(ResultUtil.ERROR, "商品库存不足", null);
                 }
             }
         }
-        if (order.getOrderPayWay()==1 ) {
-            WisdGoods wisdGoods=goodsService.getById(orderDetailList.get(0).getGoodsId());
-            if (wisdGoods.getIsPromotion()==1) {
-                if (wisdGoods.getPromotionNum()!=-1) {
+        if (order.getOrderPayWay() == 1) {
+            WisdGoods wisdGoods = goodsService.getById(orderDetailList.get(0).getGoodsId());
+            if (wisdGoods.getIsPromotion() == 1) {
+                if (wisdGoods.getPromotionNum() != -1) {
                     if (!promotionNum(order.getUserId(), wisdGoods, orderDetailList.get(0).getGoodsNum())) {
                         return new Result(ResultUtil.ERROR, "此商品限购，已超出购买次数");
                     }
@@ -147,131 +140,131 @@ public class PayApi {
             }
         }
 
-        WisdUser wisdUser=wisdUserService.getByUserId(wisdWxuser.getCompanyUserId());
-        if (order.getOrderPayWay()==4) {
+        WisdUser wisdUser = wisdUserService.getByUserId(wisdWxuser.getCompanyUserId());
+        if (order.getOrderPayWay() == 4) {
             if (wisdUser.getUserVolumeBalance().compareTo(order.getOrderOtherPay()) == -1) {
                 return new Result(ResultUtil.ERROR, "现金券余额不足");
             }
         }
-        if (order.getOrderPayWay()==5) {
+        if (order.getOrderPayWay() == 5) {
             if (wisdUser.getUserDiscountBalance().compareTo(order.getOrderOtherPay()) == -1) {
                 return new Result(ResultUtil.ERROR, "现金折扣券余额不足");
             }
         }
         WisdGoods wisdGoods = goodsService.getById(orderDetailList.get(0).getGoodsId());
-        if (order.getOrderActualPay().compareTo(new BigDecimal(0))==1) {
+        if (order.getOrderActualPay().compareTo(new BigDecimal(0)) == 1) {
             String title = wisdGoods.getGoodsName() + (orderDetailList.size() > 0 ? "等" : "");
             //Map<String, Object> mm = xcxPay(title, order.getOrderMoney().doubleValue(), order.getOrderNumber(), customer.getWxOpenid(), request);
             Map<String, Object> mm = xcxPay(title, order.getOrderActualPay().doubleValue(), order.getOrderNumber(), openid, request);
             if (mm.get("code").equals(1)) {
-                return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG,mm);
+                return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG, mm);
             } else {
                 return new Result(ResultUtil.ERROR, "请再试一次");
             }
-        }else {
-            if (order.getOrderPayWay()==4){
-                if (wisdUser.getUserVolumeBalance().compareTo(order.getOrderOtherPay())==-1){
+        } else {
+            if (order.getOrderPayWay() == 4) {
+                if (wisdUser.getUserVolumeBalance().compareTo(order.getOrderOtherPay()) == -1) {
                     return new Result(ResultUtil.ERROR, "现金券余额不足");
-                }else {
-                    BigDecimal newVoluemBalance=wisdUser.getUserVolumeBalance().subtract(order.getOrderOtherPay());
+                } else {
+                    BigDecimal newVoluemBalance = wisdUser.getUserVolumeBalance().subtract(order.getOrderOtherPay());
                     wisdUser.setUserVolumeBalance(newVoluemBalance);
                     wisdWxuser.setUserVolumeBalance(newVoluemBalance);
-                    Boolean flag1=wisdUserService.saveOrUpdate(wisdUser);
-                    Boolean flag2=wxuserService.saveOrUpdate(wisdWxuser);
-                    if (!flag1&&!flag2){
+                    Boolean flag1 = wisdUserService.saveOrUpdate(wisdUser);
+                    Boolean flag2 = wxuserService.saveOrUpdate(wisdWxuser);
+                    if (!flag1 && !flag2) {
                         return new Result(ResultUtil.ERROR, "支付失败");
-                    }else {
+                    } else {
                         order.setOrderPayTime(new Date());
                         order.setStatus(2);
                         SalesAndStock(orderDetailList);
-                        billService.addBill(2,3,orderNumber,userId,"订单支付 · "+wisdGoods.getGoodsName() + (orderDetailList.size() > 0 ? "等" : ""),order.getOrderOtherPay());
+                        billService.addBill(2, 3, orderNumber, userId, "订单支付 · " + wisdGoods.getGoodsName() + (orderDetailList.size() > 0 ? "等" : ""), order.getOrderOtherPay());
                     }
                 }
             }
-            if (order.getOrderPayWay()==5){
-                if (wisdUser.getUserDiscountBalance().compareTo(order.getOrderOtherPay())==-1){
+            if (order.getOrderPayWay() == 5) {
+                if (wisdUser.getUserDiscountBalance().compareTo(order.getOrderOtherPay()) == -1) {
                     return new Result(ResultUtil.ERROR, "现金折扣券余额不足");
-                }else {
-                    BigDecimal newDiscountBalance=wisdUser.getUserDiscountBalance().subtract(order.getOrderOtherPay());
+                } else {
+                    BigDecimal newDiscountBalance = wisdUser.getUserDiscountBalance().subtract(order.getOrderOtherPay());
                     wisdUser.setUserDiscountBalance(newDiscountBalance);
                     wisdWxuser.setUserDiscountBalance(newDiscountBalance);
-                    Boolean flag1=wisdUserService.saveOrUpdate(wisdUser);
-                    Boolean flag2=wxuserService.saveOrUpdate(wisdWxuser);
-                    if (!flag1&&!flag2){
+                    Boolean flag1 = wisdUserService.saveOrUpdate(wisdUser);
+                    Boolean flag2 = wxuserService.saveOrUpdate(wisdWxuser);
+                    if (!flag1 && !flag2) {
                         return new Result(ResultUtil.ERROR, "支付失败");
-                    }else {
+                    } else {
                         order.setOrderPayTime(new Date());
                         order.setStatus(2);
                         SalesAndStock(orderDetailList);
-                        billService.addBill(2,2,orderNumber,userId,"订单支付 · "+wisdGoods.getGoodsName() + (orderDetailList.size() > 0 ? "等" : ""),order.getOrderOtherPay());
+                        billService.addBill(2, 2, orderNumber, userId, "订单支付 · " + wisdGoods.getGoodsName() + (orderDetailList.size() > 0 ? "等" : ""), order.getOrderOtherPay());
                     }
                 }
             }
-            if (order.getOrderPayWay()==2){
-                if (wisdWxuser.getUserIntegral()==0){
+            if (order.getOrderPayWay() == 2) {
+                if (wisdWxuser.getUserIntegral() == 0) {
                     return new Result(ResultUtil.ERROR, "积分不足");
                 }
-                if (wisdWxuser.getUserIntegral()<order.getOrderOtherPay().intValue()){
+                if (wisdWxuser.getUserIntegral() < order.getOrderOtherPay().intValue()) {
                     return new Result(ResultUtil.ERROR, "积分不足");
-                }else {
-                    Integer newIntegral=wisdWxuser.getUserIntegral()-order.getOrderOtherPay().intValue();
+                } else {
+                    Integer newIntegral = wisdWxuser.getUserIntegral() - order.getOrderOtherPay().intValue();
                     wisdWxuser.setUserIntegral(newIntegral);
-                    Boolean flag2=wxuserService.saveOrUpdate(wisdWxuser);
-                    if (!flag2){
+                    Boolean flag2 = wxuserService.saveOrUpdate(wisdWxuser);
+                    if (!flag2) {
                         return new Result(ResultUtil.ERROR, "支付失败");
-                    }else {
+                    } else {
                         order.setOrderPayTime(new Date());
                         order.setStatus(2);
                         SalesAndStock(orderDetailList);
-                        billService.addBill(2,4,orderNumber,userId,"订单支付 · "+wisdGoods.getGoodsName() + (orderDetailList.size() > 0 ? "等" : ""),order.getOrderOtherPay());
+                        billService.addBill(2, 4, orderNumber, userId, "订单支付 · " + wisdGoods.getGoodsName() + (orderDetailList.size() > 0 ? "等" : ""), order.getOrderOtherPay());
                     }
                 }
             }
 
-            if (order.getOrderPayWay()==3){
-                WisdPackage wisdPackage=packageService.getById(order.getPackageId());
-                if (!wisdPackage.getGoodsId().contains(orderDetailList.get(0).getGoodsId().toString())){
+            if (order.getOrderPayWay() == 3) {
+                WisdPackage wisdPackage = packageService.getById(order.getPackageId());
+                if (!wisdPackage.getGoodsId().contains(orderDetailList.get(0).getGoodsId().toString())) {
                     return new Result(ResultUtil.ERROR, "该套餐券不能购买此商品");
                 }
                 QueryWrapper<WisdUserPackage> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("user_id",wisdUser.getId());
-                queryWrapper.eq("package_id",order.getPackageId());
-                WisdUserPackage wisdUserPackage=userPackageService.getOne(queryWrapper);
-                if (wisdUserPackage.getIsUsed()==1){
+                queryWrapper.eq("user_id", wisdUser.getId());
+                queryWrapper.eq("package_id", order.getPackageId());
+                WisdUserPackage wisdUserPackage = userPackageService.getOne(queryWrapper);
+                if (wisdUserPackage.getIsUsed() == 1) {
                     return new Result(ResultUtil.ERROR, "该套餐券已使用");
                 }
                 wisdUserPackage.setIsUsed(1);
-                Boolean flag3=userPackageService.saveOrUpdate(wisdUserPackage);
-                if (!flag3){
+                Boolean flag3 = userPackageService.saveOrUpdate(wisdUserPackage);
+                if (!flag3) {
                     return new Result(ResultUtil.ERROR, "支付失败");
-                }else {
+                } else {
                     order.setOrderPayTime(new Date());
                     order.setStatus(2);
-                    for (WisdOrderDetail wisdOrderDetail:orderDetailList){
+                    for (WisdOrderDetail wisdOrderDetail : orderDetailList) {
                         WisdGoods goods = goodsService.getById(wisdOrderDetail.getGoodsId());
-                        goods.setGoodsSales(goods.getGoodsSales()+wisdOrderDetail.getGoodsNum());
+                        goods.setGoodsSales(goods.getGoodsSales() + wisdOrderDetail.getGoodsNum());
                         goodsService.saveOrUpdate(goods);
                     }
-                    billService.addBill(2,1,orderNumber,userId,"订单支付 · "+wisdGoods.getGoodsName() + (orderDetailList.size() > 0 ? "等" : ""),new BigDecimal(1));
+                    billService.addBill(2, 1, orderNumber, userId, "订单支付 · " + wisdGoods.getGoodsName() + (orderDetailList.size() > 0 ? "等" : ""), new BigDecimal(1));
                 }
             }
         }
-        Boolean flag4=orderService.saveOrUpdate(order);
+        Boolean flag4 = orderService.saveOrUpdate(order);
         if (flag4) {
             return new Result("2", ResultUtil.SUCCESS_MSG);
-        }else {
+        } else {
             return new Result(ResultUtil.ERROR, ResultUtil.ERROR_MSG);
         }
     }
 
 
-    public void SalesAndStock(List<WisdOrderDetail> orderDetailList){
-        for (WisdOrderDetail wisdOrderDetail:orderDetailList){
+    public void SalesAndStock(List<WisdOrderDetail> orderDetailList) {
+        for (WisdOrderDetail wisdOrderDetail : orderDetailList) {
             WisdGoods goods = goodsService.getById(wisdOrderDetail.getGoodsId());
-            goods.setGoodsSales(goods.getGoodsSales()+wisdOrderDetail.getGoodsNum());
+            goods.setGoodsSales(goods.getGoodsSales() + wisdOrderDetail.getGoodsNum());
             goodsService.saveOrUpdate(goods);
-            WisdGoodsSpec wisdGoodsSpec=goodsSpecService.getInfoById(wisdOrderDetail.getSpecId());
-            wisdGoodsSpec.setSpecStock(wisdGoodsSpec.getSpecStock()-wisdOrderDetail.getGoodsNum());
+            WisdGoodsSpec wisdGoodsSpec = goodsSpecService.getInfoById(wisdOrderDetail.getSpecId());
+            wisdGoodsSpec.setSpecStock(wisdGoodsSpec.getSpecStock() - wisdOrderDetail.getGoodsNum());
             goodsSpecService.saveOrUpdate(wisdGoodsSpec);
         }
     }
@@ -379,7 +372,7 @@ public class PayApi {
     @RequestMapping("wxNotify")
     public void wxNotify(HttpServletRequest request, HttpServletResponse response) throws Exception {
         System.out.println("进入支付回调地址————————————————————————————————");
-        BufferedReader br = new BufferedReader(new InputStreamReader((ServletInputStream) request.getInputStream()));
+        BufferedReader br = new BufferedReader(new InputStreamReader(request.getInputStream()));
         String line = null;
         StringBuilder sb = new StringBuilder();
         while ((line = br.readLine()) != null) {
@@ -400,8 +393,8 @@ public class PayApi {
                 String orderNo = map.get("out_trade_no").toString();
                 if (!StringUtils.isEmpty(orderNo)) {
                     WisdOeder order = orderService.getOrderByNumber(orderNo);
-                    WisdWxuser wisdWxuser=wxuserService.getById(order.getUserId());
-                    WisdUser wisdUser=wisdUserService.getByUserId(wisdWxuser.getCompanyUserId());
+                    WisdWxuser wisdWxuser = wxuserService.getById(order.getUserId());
+                    WisdUser wisdUser = wisdUserService.getByUserId(wisdWxuser.getCompanyUserId());
                     List<WisdOrderDetail> orderDetailList = orderDetailService.getByOrderId(order.getId());
                     WisdGoods wisdGoods = goodsService.getById(orderDetailList.get(0).getGoodsId());
                     if (order != null && order.getStatus().equals(1)) {
@@ -410,26 +403,26 @@ public class PayApi {
                         Boolean flag = orderService.saveOrUpdate(order);
                         if (flag) {
                             SalesAndStock(orderDetailList);
-                            billService.addBill(2,5,order.getOrderNumber(),order.getUserId(),"订单支付 · "+wisdGoods.getGoodsName() + (orderDetailList.size() > 0 ? "等" : ""),order.getOrderActualPay());
-                            if (order.getOrderPayWay()==4){
-                                BigDecimal newVoluemBalance=wisdUser.getUserVolumeBalance().subtract(order.getOrderOtherPay());
+                            billService.addBill(2, 5, order.getOrderNumber(), order.getUserId(), "订单支付 · " + wisdGoods.getGoodsName() + (orderDetailList.size() > 0 ? "等" : ""), order.getOrderActualPay());
+                            if (order.getOrderPayWay() == 4) {
+                                BigDecimal newVoluemBalance = wisdUser.getUserVolumeBalance().subtract(order.getOrderOtherPay());
                                 wisdUser.setUserVolumeBalance(newVoluemBalance);
                                 wisdWxuser.setUserVolumeBalance(newVoluemBalance);
-                                Boolean flag1=wisdUserService.saveOrUpdate(wisdUser);
-                                Boolean flag2=wxuserService.saveOrUpdate(wisdWxuser);
+                                Boolean flag1 = wisdUserService.saveOrUpdate(wisdUser);
+                                Boolean flag2 = wxuserService.saveOrUpdate(wisdWxuser);
                                 order.setOrderPayTime(new Date());
                                 order.setStatus(2);
-                                billService.addBill(2,3,order.getOrderNumber(),order.getUserId(),"订单支付 · "+wisdGoods.getGoodsName() + (orderDetailList.size() > 0 ? "等" : ""),order.getOrderOtherPay());
+                                billService.addBill(2, 3, order.getOrderNumber(), order.getUserId(), "订单支付 · " + wisdGoods.getGoodsName() + (orderDetailList.size() > 0 ? "等" : ""), order.getOrderOtherPay());
                             }
-                            if (order.getOrderPayWay()==5){
-                                BigDecimal newDiscountBalance=wisdUser.getUserDiscountBalance().subtract(order.getOrderOtherPay());
+                            if (order.getOrderPayWay() == 5) {
+                                BigDecimal newDiscountBalance = wisdUser.getUserDiscountBalance().subtract(order.getOrderOtherPay());
                                 wisdUser.setUserDiscountBalance(newDiscountBalance);
                                 wisdWxuser.setUserDiscountBalance(newDiscountBalance);
-                                Boolean flag1=wisdUserService.saveOrUpdate(wisdUser);
-                                Boolean flag2=wxuserService.saveOrUpdate(wisdWxuser);
+                                Boolean flag1 = wisdUserService.saveOrUpdate(wisdUser);
+                                Boolean flag2 = wxuserService.saveOrUpdate(wisdWxuser);
                                 order.setOrderPayTime(new Date());
                                 order.setStatus(2);
-                                billService.addBill(2,2,order.getOrderNumber(),order.getUserId(),"订单支付 · "+wisdGoods.getGoodsName() + (orderDetailList.size() > 0 ? "等" : ""),order.getOrderOtherPay());
+                                billService.addBill(2, 2, order.getOrderNumber(), order.getUserId(), "订单支付 · " + wisdGoods.getGoodsName() + (orderDetailList.size() > 0 ? "等" : ""), order.getOrderOtherPay());
                             }
                         }
                     }
@@ -474,8 +467,8 @@ public class PayApi {
         String xml = "<xml>" + "<mch_appid>" + WeiXinPayConfig.XCX_APPID + "</mch_appid>"
                 + "<mchid>" + WeiXinPayConfig.mch_id + "</mchid>"
                 + "<nonce_str>" + nonce_str + "</nonce_str>"
-                + "<partner_trade_no>" + "" + "</partner_trade_no>"
-                + "<openid>" + "" + "</openid>"
+                + "<partner_trade_no>" + "</partner_trade_no>"
+                + "<openid>" + "</openid>"
                 + "<spbill_create_ip>" + spbill_create_ip + "</spbill_create_ip>"
                 + "<check_name>" + "NO_CHECK" + "</check_name>"
                 + "<amount>" + DoubleUtil.yuanToFen(money) + "</amount>"
@@ -596,15 +589,15 @@ public class PayApi {
         String xml = "<xml>" + "<appid>" + WeiXinPayConfig.XCX_APPID + "</appid>"
                 + "<mch_id>" + WeiXinPayConfig.mch_id + "</mch_id>"
                 + "<nonce_str>" + nonce_str + "</nonce_str>"
-                + "<out_refund_no>" + "" + "</out_refund_no>"
-                + "<out_trade_no>" + "" + "</out_trade_no>"
+                + "<out_refund_no>" + "</out_refund_no>"
+                + "<out_trade_no>" + "</out_trade_no>"
                 + "<total_fee>" + DoubleUtil.yuanToFen(money) + "</total_fee>"
                 + "<refund_fee>" + DoubleUtil.yuanToFen(money) + "</refund_fee>"
                 + "<sign>" + mysign + "</sign>"
                 + "</xml>";
 
         try {
-            String weixinPost = doRefund(WeiXinPayConfig.refund_url, xml).toString();
+            String weixinPost = doRefund(WeiXinPayConfig.refund_url, xml);
             Map map = PayUtil.doXMLParse(weixinPost);
             System.out.println("weixinPost" + map);
             if ("SUCCESS".equalsIgnoreCase(map.get("result_code").toString()) &&//提现成功返回
@@ -662,7 +655,7 @@ public class PayApi {
                 + "</xml>";
 
         try {
-            String weixinPost = PayUtil.httpRequest(url,"POST", xml);
+            String weixinPost = PayUtil.httpRequest(url, "POST", xml);
             Map map = PayUtil.doXMLParse(weixinPost);
             System.out.println("weixinPost" + map);
             if ("SUCCESS".equalsIgnoreCase(map.get("result_code").toString()) &&//提现成功返回
diff --git a/src/main/java/com/wisdo/mmining/api/UserApi.java b/src/main/java/com/wisdo/mmining/api/UserApi.java
index 614479f..823025f 100644
--- a/src/main/java/com/wisdo/mmining/api/UserApi.java
+++ b/src/main/java/com/wisdo/mmining/api/UserApi.java
@@ -1,6 +1,5 @@
 package com.wisdo.mmining.api;
 
-import com.alibaba.druid.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -14,8 +13,6 @@ import com.wisdo.mmining.util.UploadUtil;
 import com.wisdo.mmining.utils.DistanceUtil;
 import com.wisdo.mmining.utils.PhoneUtils;
 import com.wisdo.mmining.utils.smsUtils.SmsSend;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.gavaghan.geodesy.Ellipsoid;
 import org.gavaghan.geodesy.GlobalCoordinates;
@@ -84,40 +81,40 @@ public class UserApi {
     @ApiOperation(value = "获取个人信息")
     @GetMapping("getTwoGoodsType")
     public Result getTwoGoodsType(Long userId) {
-        WisdWxuser wisdWxuser=wxuserService.getById(userId);
-        Integer count=0;
-        if (wisdWxuser.getUserIscompany()==1) {
+        WisdWxuser wisdWxuser = wxuserService.getById(userId);
+        Integer count = 0;
+        if (wisdWxuser.getUserIscompany() == 1) {
             WisdUser wisdUser = wisdUserService.getByUserId(wisdWxuser.getCompanyUserId());
             QueryWrapper<WisdUserPackage> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("user_id",wisdUser.getId());
-            queryWrapper.eq("is_used",0);
-            count=userPackageService.count(queryWrapper);
-            WisdCompany wisdCompany=companyService.getById(wisdUser.getCompanyId());
+            queryWrapper.eq("user_id", wisdUser.getId());
+            queryWrapper.eq("is_used", 0);
+            count = userPackageService.count(queryWrapper);
+            WisdCompany wisdCompany = companyService.getById(wisdUser.getCompanyId());
             wisdWxuser.setCompanyName(wisdCompany.getCompanyName());
             wisdWxuser.setCompanyId(wisdCompany.getId());
         }
-        wisdWxuser.setOrderNum1(getOrderNum(userId,1));
-        wisdWxuser.setOrderNum2(getOrderNum(userId,2));
-        wisdWxuser.setOrderNum3(getOrderNum(userId,3));
-        wisdWxuser.setOrderNum4(getOrderNum(userId,6));
-        wisdWxuser.setOrderNum5(getOrderNum(userId,4));
+        wisdWxuser.setOrderNum1(getOrderNum(userId, 1));
+        wisdWxuser.setOrderNum2(getOrderNum(userId, 2));
+        wisdWxuser.setOrderNum3(getOrderNum(userId, 3));
+        wisdWxuser.setOrderNum4(getOrderNum(userId, 6));
+        wisdWxuser.setOrderNum5(getOrderNum(userId, 4));
         wisdWxuser.setPavkageNum(count);
-        WisdStores wisdStores=storesService.getById(wisdWxuser.getUserStoresId());
-        if (wisdStores!=null){
+        WisdStores wisdStores = storesService.getById(wisdWxuser.getUserStoresId());
+        if (wisdStores != null) {
             wisdWxuser.setWisdStores(wisdStores);
         }
         return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG, wisdWxuser);
     }
 
-    public Integer getOrderNum(Long userId,Integer status){
+    public Integer getOrderNum(Long userId, Integer status) {
         QueryWrapper<WisdOeder> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("user_id",userId);
-        if (status==6) {
+        queryWrapper.eq("user_id", userId);
+        if (status == 6) {
             queryWrapper.and(wrapper -> wrapper.eq("status", status).or().eq("status", 61).or().eq("status", 62).or().eq("status", 63).or().eq("status", 64).or().eq("status", 65).or().eq("status", 66));
-        }else {
+        } else {
             queryWrapper.eq("status", status);
         }
-        queryWrapper.eq("is_deleted",0);
+        queryWrapper.eq("is_deleted", 0);
         return orderService.count(queryWrapper);
     }
 
@@ -125,29 +122,29 @@ public class UserApi {
     @GetMapping("getUserAddress")
     public Result getUserAddress(Long userId) {
         QueryWrapper<WisdUserAddress> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("wxuser_id",userId);
+        queryWrapper.eq("wxuser_id", userId);
         queryWrapper.orderByDesc("address_default");
-        List<WisdUserAddress> wisdUserAddressList=userAddressService.list(queryWrapper);
-        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG,wisdUserAddressList);
+        List<WisdUserAddress> wisdUserAddressList = userAddressService.list(queryWrapper);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG, wisdUserAddressList);
     }
 
     @ApiOperation(value = "添加/修改收货地址")
     @PostMapping("addUserAddress")
     public Result addUserAddress(@RequestBody WisdUserAddress wisdUserAddress) {
-        if (wisdUserAddress.getAddressDefault()==1){
+        if (wisdUserAddress.getAddressDefault() == 1) {
             QueryWrapper<WisdUserAddress> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("address_default",1);
-            queryWrapper.eq("wxuser_id",wisdUserAddress.getWxuserId());
-            WisdUserAddress wisdUserAddress1=userAddressService.getOne(queryWrapper);
-            if (wisdUserAddress1!=null) {
+            queryWrapper.eq("address_default", 1);
+            queryWrapper.eq("wxuser_id", wisdUserAddress.getWxuserId());
+            WisdUserAddress wisdUserAddress1 = userAddressService.getOne(queryWrapper);
+            if (wisdUserAddress1 != null) {
                 wisdUserAddress1.setAddressDefault(0);
                 userAddressService.saveOrUpdate(wisdUserAddress1);
             }
         }
-        Boolean flag =userAddressService.saveOrUpdate(wisdUserAddress);
-        if (flag){
+        Boolean flag = userAddressService.saveOrUpdate(wisdUserAddress);
+        if (flag) {
             return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG);
-        }else {
+        } else {
             return new Result(ResultUtil.ERROR, ResultUtil.ERROR_MSG);
         }
     }
@@ -155,7 +152,7 @@ public class UserApi {
     @ApiOperation(value = "根据id获取收货地址")
     @GetMapping("getUserAddressDetail")
     public Result getUserAddressDetail(Long id) {
-        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG,userAddressService.getById(id));
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG, userAddressService.getById(id));
     }
 
     @ApiOperation(value = "删除收货地址")
@@ -163,19 +160,19 @@ public class UserApi {
     public Result delUserAddress(Long id) {
 //        List<Long> idList = new ArrayList<>();
 //        idList.add(id);
-        Boolean flag =userAddressService.removeById(id);
-        if (flag){
+        Boolean flag = userAddressService.removeById(id);
+        if (flag) {
             return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG);
-        }else {
+        } else {
             return new Result(ResultUtil.ERROR, ResultUtil.ERROR_MSG);
         }
     }
 
     @ApiOperation(value = "获取门店列表")
     @GetMapping("getStores")
-    public Result getStores(Double latitude,Double longitude) {
-        List<WisdStores> wisdStoresList=storesService.list();
-        for (WisdStores wisdStores:wisdStoresList){
+    public Result getStores(Double latitude, Double longitude) {
+        List<WisdStores> wisdStoresList = storesService.list();
+        for (WisdStores wisdStores : wisdStoresList) {
             //用户当前坐标
             GlobalCoordinates userSource = new GlobalCoordinates(latitude, longitude);
             //店铺位置坐标
@@ -190,7 +187,7 @@ public class UserApi {
                 return distance;
             }
         });
-        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG,wisdStoresList);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG, wisdStoresList);
     }
 
 
@@ -198,12 +195,12 @@ public class UserApi {
     @GetMapping("getCompany")
     public Result getCompany(String conpanyName) {
         QueryWrapper<WisdCompany> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("is_deleted",0);
-        if (!"".equals(conpanyName)&&conpanyName!=null){
-            queryWrapper.like("company_name",conpanyName);
+        queryWrapper.eq("is_deleted", 0);
+        if (!"".equals(conpanyName) && conpanyName != null) {
+            queryWrapper.like("company_name", conpanyName);
         }
-        List<WisdCompany> wisdCompany=companyService.list(queryWrapper);
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG,wisdCompany);
+        List<WisdCompany> wisdCompany = companyService.list(queryWrapper);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG, wisdCompany);
     }
 
     @GetMapping(value = "sendSms")
@@ -217,43 +214,43 @@ public class UserApi {
         if (!isMatch) {
             return ResultUtil.error("请填入正确的手机号");
         }
-        if (!PhoneUtils.isPhoneLegal(phone)){
-            return new Result(ResultUtil.ERROR,"请输入正确手机号");
+        if (!PhoneUtils.isPhoneLegal(phone)) {
+            return new Result(ResultUtil.ERROR, "请输入正确手机号");
         }
         String random = SmsSend.sendMsg(phone);
         //存入redis缓存
         redisService.set(phone, random, 3 * 60 * 1000);
         System.out.println(redisService.get(phone));
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA);
     }
 
 
     @ApiOperation(value = "信息修改")
     @PutMapping("updateInfo")
-    public Result updateInfo(String userName,Long userId,String phone,Long companyId) {
-        if (userName==null){
-            return new Result(ResultUtil.ERROR,"请输入姓名");
+    public Result updateInfo(String userName, Long userId, String phone, Long companyId) {
+        if (userName == null) {
+            return new Result(ResultUtil.ERROR, "请输入姓名");
         }
-        if (phone==null){
-            return new Result(ResultUtil.ERROR,"请输入手机号");
+        if (phone == null) {
+            return new Result(ResultUtil.ERROR, "请输入手机号");
         }
-        if (!PhoneUtils.isPhoneLegal(phone)){
-            return new Result(ResultUtil.ERROR,"请输入正确手机号");
+        if (!PhoneUtils.isPhoneLegal(phone)) {
+            return new Result(ResultUtil.ERROR, "请输入正确手机号");
         }
-        WisdWxuser wisdWxuser=wxuserService.getById(userId);
-        if (wisdWxuser==null){
-            return new Result(ResultUtil.ERROR,"该用户不存在");
+        WisdWxuser wisdWxuser = wxuserService.getById(userId);
+        if (wisdWxuser == null) {
+            return new Result(ResultUtil.ERROR, "该用户不存在");
         }
-        WisdCompany wisdCompany=companyService.getById(companyId);
-        if (wisdCompany==null){
-            return new Result(ResultUtil.ERROR,"该公司不存在");
+        WisdCompany wisdCompany = companyService.getById(companyId);
+        if (wisdCompany == null) {
+            return new Result(ResultUtil.ERROR, "该公司不存在");
         }
-        WisdUser wisdUser=wisdUserService.getByPhone(phone,companyId);
-        if (wisdUser==null){
-            return new Result(ResultUtil.ERROR,"此公司下不存在该员工");
+        WisdUser wisdUser = wisdUserService.getByPhone(phone, companyId);
+        if (wisdUser == null) {
+            return new Result(ResultUtil.ERROR, "此公司下不存在该员工");
         }
-        if (wisdUser.getUserName()!=userName){
-            return new Result(ResultUtil.ERROR,"姓名输入错误");
+        if (wisdUser.getUserName() != userName) {
+            return new Result(ResultUtil.ERROR, "姓名输入错误");
         }
         wisdWxuser.setCompanyUserId(wisdUser.getId());
         wisdWxuser.setUserId(wisdUser.getId());
@@ -265,44 +262,44 @@ public class UserApi {
         wisdWxuser.setUserDiscount(wisdUser.getUserDiscount());
         wisdWxuser.setUserIscompany(1);
         wisdWxuser.setPavkageNum(wisdUser.getPavkageNum());
-        Boolean flag=wxuserService.saveOrUpdate(wisdWxuser);
-        if (flag){
-            return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG);
-        }else {
-            return new Result(ResultUtil.ERROR,ResultUtil.ERROR_MSG);
+        Boolean flag = wxuserService.saveOrUpdate(wisdWxuser);
+        if (flag) {
+            return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG);
+        } else {
+            return new Result(ResultUtil.ERROR, ResultUtil.ERROR_MSG);
         }
     }
 
     @ApiOperation(value = "信息完善")
     @PutMapping("perfectInfo")
-    public Result perfectInfo(String userName,Long userId,String phone,String code,Long companyId) {
-        String codes=(String)redisService.get(phone);
-        if (codes==null&&!code.equals(codes)){
-            return new Result(ResultUtil.ERROR,"请输入正确验证码");
+    public Result perfectInfo(String userName, Long userId, String phone, String code, Long companyId) {
+        String codes = (String) redisService.get(phone);
+        if (codes == null && !code.equals(codes)) {
+            return new Result(ResultUtil.ERROR, "请输入正确验证码");
         }
-        if (userName==null){
-            return new Result(ResultUtil.ERROR,"请输入姓名");
+        if (userName == null) {
+            return new Result(ResultUtil.ERROR, "请输入姓名");
         }
-        if (phone==null){
-            return new Result(ResultUtil.ERROR,"请输入手机号");
+        if (phone == null) {
+            return new Result(ResultUtil.ERROR, "请输入手机号");
         }
-        if (!PhoneUtils.isPhoneLegal(phone)){
-            return new Result(ResultUtil.ERROR,"请输入正确手机号");
+        if (!PhoneUtils.isPhoneLegal(phone)) {
+            return new Result(ResultUtil.ERROR, "请输入正确手机号");
         }
-        WisdWxuser wisdWxuser=wxuserService.getById(userId);
-        if (wisdWxuser==null){
-            return new Result(ResultUtil.ERROR,"该用户不存在");
+        WisdWxuser wisdWxuser = wxuserService.getById(userId);
+        if (wisdWxuser == null) {
+            return new Result(ResultUtil.ERROR, "该用户不存在");
         }
-        WisdCompany wisdCompany=companyService.getById(companyId);
-        if (wisdCompany==null){
-            return new Result(ResultUtil.ERROR,"该公司不存在");
+        WisdCompany wisdCompany = companyService.getById(companyId);
+        if (wisdCompany == null) {
+            return new Result(ResultUtil.ERROR, "该公司不存在");
         }
-        WisdUser wisdUser=wisdUserService.getByPhone(phone,companyId);
-        if (wisdUser==null){
-            return new Result(ResultUtil.ERROR,"此公司下不存在该员工");
+        WisdUser wisdUser = wisdUserService.getByPhone(phone, companyId);
+        if (wisdUser == null) {
+            return new Result(ResultUtil.ERROR, "此公司下不存在该员工");
         }
-        if (!wisdUser.getUserName().equals(userName)){
-            return new Result(ResultUtil.ERROR,"姓名输入错误");
+        if (!wisdUser.getUserName().equals(userName)) {
+            return new Result(ResultUtil.ERROR, "姓名输入错误");
         }
         wisdWxuser.setCompanyUserId(wisdUser.getId());
         wisdWxuser.setUserId(wisdUser.getId());
@@ -314,71 +311,71 @@ public class UserApi {
         wisdWxuser.setUserDiscount(wisdUser.getUserDiscount());
         wisdWxuser.setUserIscompany(1);
         wisdWxuser.setPavkageNum(wisdUser.getPavkageNum());
-        Boolean flag=wxuserService.saveOrUpdate(wisdWxuser);
-        if (flag){
-            return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG);
-        }else {
-            return new Result(ResultUtil.ERROR,ResultUtil.ERROR_MSG);
+        Boolean flag = wxuserService.saveOrUpdate(wisdWxuser);
+        if (flag) {
+            return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG);
+        } else {
+            return new Result(ResultUtil.ERROR, ResultUtil.ERROR_MSG);
         }
     }
 
     @ApiOperation(value = "获取套餐券")
     @GetMapping("getUserPackage")
-    public Result getUserPackage(Long userId,Integer type) {
-        WisdWxuser wxuser=wxuserService.getById(userId);
+    public Result getUserPackage(Long userId, Integer type) {
+        WisdWxuser wxuser = wxuserService.getById(userId);
         QueryWrapper<WisdUserPackage> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("user_id",wxuser.getCompanyUserId());
-        queryWrapper.eq("is_used",type);
+        queryWrapper.eq("user_id", wxuser.getCompanyUserId());
+        queryWrapper.eq("is_used", type);
         queryWrapper.orderByDesc("create_time");
-        List<WisdUserPackage> wisdUserPackageList=userPackageService.list(queryWrapper);
-        List<WisdPackage> wisdPackageList=new ArrayList<>();
-        for (WisdUserPackage wisdUserPackage:wisdUserPackageList){
-            WisdPackage wisdPackage=packageService.getById(wisdUserPackage.getPackageId());
+        List<WisdUserPackage> wisdUserPackageList = userPackageService.list(queryWrapper);
+        List<WisdPackage> wisdPackageList = new ArrayList<>();
+        for (WisdUserPackage wisdUserPackage : wisdUserPackageList) {
+            WisdPackage wisdPackage = packageService.getById(wisdUserPackage.getPackageId());
             wisdPackageList.add(wisdPackage);
         }
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wisdPackageList);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wisdPackageList);
     }
 
     @ApiOperation(value = "根据套餐卷获取套餐商品")
     @GetMapping("getGoodsByPackage")
     public Result getGoodsByPackage(Long packageId) {
-        WisdPackage wisdPackage=packageService.getById(packageId);
-        String[] goodsIds=wisdPackage.getGoodsId().split(",");
-        List<WisdGoods> wisdGoodsList=new ArrayList<>();
-        for (int i=0;i<goodsIds.length;i++){
-            WisdGoods wisdGoods=goodsService.getInfoById(Long.parseLong(goodsIds[i]));
-            if (wisdGoods!=null) {
+        WisdPackage wisdPackage = packageService.getById(packageId);
+        String[] goodsIds = wisdPackage.getGoodsId().split(",");
+        List<WisdGoods> wisdGoodsList = new ArrayList<>();
+        for (int i = 0; i < goodsIds.length; i++) {
+            WisdGoods wisdGoods = goodsService.getInfoById(Long.parseLong(goodsIds[i]));
+            if (wisdGoods != null) {
                 wisdGoodsList.add(wisdGoods);
             }
         }
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wisdGoodsList);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wisdGoodsList);
     }
 
 
     @ApiOperation(value = "获取套餐商品详情")
     @GetMapping("getPackageGoods")
     public Result getPackageGoods(Long goodsId) {
-        WisdGoods wisdGoods=goodsService.getById(goodsId);
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wisdGoods);
+        WisdGoods wisdGoods = goodsService.getById(goodsId);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wisdGoods);
     }
 
     @ApiOperation(value = "问题反馈列表")
     @GetMapping("addFeedBack")
     public Result feedBackList(Long userId) {
         QueryWrapper<WisdFeedback> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("user_id",userId);
-        List<WisdFeedback> feedbackList=feedBackService.list(queryWrapper);
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG,feedbackList);
+        queryWrapper.eq("user_id", userId);
+        List<WisdFeedback> feedbackList = feedBackService.list(queryWrapper);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG, feedbackList);
     }
 
     @ApiOperation(value = "问题反馈提交")
     @PostMapping("addFeedBack")
     public Result addFeedBack(@RequestBody WisdFeedback wisdFeedback) {
-        Boolean flag=feedBackService.save(wisdFeedback);
-        if (flag){
-            return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG);
-        }else {
-            return new Result(ResultUtil.ERROR,ResultUtil.ERROR_MSG);
+        Boolean flag = feedBackService.save(wisdFeedback);
+        if (flag) {
+            return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG);
+        } else {
+            return new Result(ResultUtil.ERROR, ResultUtil.ERROR_MSG);
         }
     }
 
@@ -393,136 +390,136 @@ public class UserApi {
     @GetMapping("getAbout")
     public Result getAbout() {
         QueryWrapper<WisdWelfare> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("id",3);
-        WisdWelfare wisdWelfare=welfareService.getOne(queryWrapper);
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG,wisdWelfare);
+        queryWrapper.eq("id", 3);
+        WisdWelfare wisdWelfare = welfareService.getOne(queryWrapper);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG, wisdWelfare);
     }
+
     @ApiOperation(value = "获取会员介绍")
     @GetMapping("getVipAbout")
     public Result getVipAbout() {
         QueryWrapper<WisdWelfare> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("id",4);
-        WisdWelfare wisdWelfare=welfareService.getOne(queryWrapper);
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG,wisdWelfare);
+        queryWrapper.eq("id", 4);
+        WisdWelfare wisdWelfare = welfareService.getOne(queryWrapper);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG, wisdWelfare);
     }
 
     @ApiOperation(value = "我得团队")
     @GetMapping("getTeam")
     public Result getTeam(Long userId) {
-        WisdWxuser wisdWxuser=wxuserService.getById(userId);
-        WisdWxuser pwisdWxuser=wxuserService.getById(wisdWxuser.getUserPid());
+        WisdWxuser wisdWxuser = wxuserService.getById(userId);
+        WisdWxuser pwisdWxuser = wxuserService.getById(wisdWxuser.getUserPid());
         QueryWrapper<WisdWxuser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("user_pid",userId);
-        List<WisdWxuser> wisdWxuserList=wxuserService.list(queryWrapper);
-        Integer count=0;
-        for (WisdWxuser wisdWxuser1:wisdWxuserList){
+        queryWrapper.eq("user_pid", userId);
+        List<WisdWxuser> wisdWxuserList = wxuserService.list(queryWrapper);
+        Integer count = 0;
+        for (WisdWxuser wisdWxuser1 : wisdWxuserList) {
             QueryWrapper<WisdWxuser> queryWrapper1 = new QueryWrapper<>();
-            queryWrapper1.eq("user_pid",wisdWxuser1.getId());
-            Integer count1=wxuserService.count(queryWrapper1);
-            count+=count1;
+            queryWrapper1.eq("user_pid", wisdWxuser1.getId());
+            Integer count1 = wxuserService.count(queryWrapper1);
+            count += count1;
         }
         wisdWxuser.setOneLevelNum(wisdWxuserList.size());
         wisdWxuser.setTwoLevelNum(count);
         wisdWxuser.setSuperiorUser(pwisdWxuser);
         wisdWxuser.setUnderUserList(wisdWxuserList);
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG,wisdWxuser);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG, wisdWxuser);
     }
 
 
     @ApiOperation(value = "我的账单")
     @GetMapping("getBill")
-    public Result getBill(Long userId,Integer category) {
+    public Result getBill(Long userId, Integer category) {
         QueryWrapper<WisdBill> queryWrapper = new QueryWrapper<>();
-        if (category!=0){
-            queryWrapper.eq("bill_category",category);
+        if (category != 0) {
+            queryWrapper.eq("bill_category", category);
         }
-        if (category==4){
-            queryWrapper.and(wrapper ->wrapper.eq("bill_category",category).or().eq("bill_category",44));
+        if (category == 4) {
+            queryWrapper.and(wrapper -> wrapper.eq("bill_category", category).or().eq("bill_category", 44));
         }
-        queryWrapper.eq("user_id",userId);
+        queryWrapper.eq("user_id", userId);
         queryWrapper.orderByDesc("create_time");
-        List<WisdBill> wisdBillList=billService.list(queryWrapper);
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG,wisdBillList);
+        List<WisdBill> wisdBillList = billService.list(queryWrapper);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG, wisdBillList);
     }
 
 
-
     @ApiOperation(value = "积分收益")
     @GetMapping("getIntetralEarnings")
     public Result getIntetralEarnings(Long userId) {
-        IntegralDto integralDto=new IntegralDto();
-        WisdIntegrlRoles wisdIntegrlRoles=integralRolesService.getById(1);
+        IntegralDto integralDto = new IntegralDto();
+        WisdIntegrlRoles wisdIntegrlRoles = integralRolesService.getById(1);
         QueryWrapper<WisdBill> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("bill_category",44);
-        queryWrapper.eq("bill_type",1);
-        queryWrapper.eq("user_id",userId);
-        List<WisdBill> wisdBillList=billService.list(queryWrapper);
-        Integer integral=wisdBillList.stream().collect(Collectors.summingInt(WisdBill::getBillIntegral));
+        queryWrapper.eq("bill_category", 44);
+        queryWrapper.eq("bill_type", 1);
+        queryWrapper.eq("user_id", userId);
+        List<WisdBill> wisdBillList = billService.list(queryWrapper);
+        Integer integral = wisdBillList.stream().collect(Collectors.summingInt(WisdBill::getBillIntegral));
         Date now = new Date();
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");//设置日期格式
         String createTime = dateFormat.format(now);//格式化然后放入字符串中
-        queryWrapper.like("create_time",createTime);
-        List<WisdBill> wisdBillList1=billService.list(queryWrapper);
-        Integer nowintegral=wisdBillList1.stream().collect(Collectors.summingInt(WisdBill::getBillIntegral));
-        WisdWxuser wisdWxuser=wxuserService.getById(userId);
-        WisdWxuser pwisdWxuser=wxuserService.getById(wisdWxuser.getUserPid());
+        queryWrapper.like("create_time", createTime);
+        List<WisdBill> wisdBillList1 = billService.list(queryWrapper);
+        Integer nowintegral = wisdBillList1.stream().collect(Collectors.summingInt(WisdBill::getBillIntegral));
+        WisdWxuser wisdWxuser = wxuserService.getById(userId);
+        WisdWxuser pwisdWxuser = wxuserService.getById(wisdWxuser.getUserPid());
         QueryWrapper<WisdWxuser> queryWrapper3 = new QueryWrapper<>();
-        queryWrapper3.eq("user_pid",userId);
-        List<WisdWxuser> wisdWxuserList=wxuserService.list(queryWrapper3);
-        Integer count=0;
-        for (WisdWxuser wisdWxuser1:wisdWxuserList){
+        queryWrapper3.eq("user_pid", userId);
+        List<WisdWxuser> wisdWxuserList = wxuserService.list(queryWrapper3);
+        Integer count = 0;
+        for (WisdWxuser wisdWxuser1 : wisdWxuserList) {
             QueryWrapper<WisdWxuser> queryWrapper1 = new QueryWrapper<>();
-            queryWrapper1.eq("user_pid",wisdWxuser1.getId());
-            Integer count1=wxuserService.count(queryWrapper1);
-            count+=count1;
+            queryWrapper1.eq("user_pid", wisdWxuser1.getId());
+            Integer count1 = wxuserService.count(queryWrapper1);
+            count += count1;
         }
         QueryWrapper<WisdWxuser> queryWrapper2 = new QueryWrapper<>();
-        queryWrapper2.like("create_time",createTime);
-        queryWrapper2.like("user_pid",userId);
-        Integer nowteamNum=wxuserService.count(queryWrapper2);
+        queryWrapper2.like("create_time", createTime);
+        queryWrapper2.like("user_pid", userId);
+        Integer nowteamNum = wxuserService.count(queryWrapper2);
         integralDto.setWisdIntegrlRoles(wisdIntegrlRoles);
         integralDto.setNowdayIntegral(nowintegral);
         integralDto.setShareIntegral(integral);
-        integralDto.setTeamNum(wisdWxuserList.size()+count);
+        integralDto.setTeamNum(wisdWxuserList.size() + count);
         integralDto.setNowteamNum(nowteamNum);
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG,integralDto);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG, integralDto);
     }
 
 
     @ApiOperation(value = "店铺订单")
     @GetMapping("getMerchantsStores")
-    public Result getMerchantsStores(Long userId,Long storesId,Integer type,Integer page,Integer num) {
+    public Result getMerchantsStores(Long userId, Long storesId, Integer type, Integer page, Integer num) {
         QueryWrapper<WisdOeder> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("order_pick",1);
-        queryWrapper.eq("address_id",storesId);
+        queryWrapper.eq("order_pick", 1);
+        queryWrapper.eq("address_id", storesId);
         if (type == 1) {
-            queryWrapper.eq("status",2);
+            queryWrapper.eq("status", 2);
         }
         if (type == 2) {
-            queryWrapper.eq("status",4);
+            queryWrapper.eq("status", 4);
         }
-        queryWrapper.eq("is_deleted",0);
+        queryWrapper.eq("is_deleted", 0);
         queryWrapper.orderByDesc("create_time");
-        Page<WisdOeder> p = new Page<>(page,num);
-        IPage<WisdOeder> wisdOederList=orderService.page(p,queryWrapper);
-        for (WisdOeder wisdOeder:wisdOederList.getRecords()){
+        Page<WisdOeder> p = new Page<>(page, num);
+        IPage<WisdOeder> wisdOederList = orderService.page(p, queryWrapper);
+        for (WisdOeder wisdOeder : wisdOederList.getRecords()) {
             QueryWrapper<WisdOrderDetail> queryWrapper2 = new QueryWrapper<>();
-            queryWrapper2.eq("order_id",wisdOeder.getId());
-            List<WisdOrderDetail> wisdOrderDetailList=orderDetailService.list(queryWrapper2);
-            List<WisdGoods> wisdGoodsList=new ArrayList<>();
-            for (WisdOrderDetail wisdOrderDetail:wisdOrderDetailList){
-                WisdGoods wisdGoods=goodsService.getInfoById(wisdOrderDetail.getGoodsId());
-                WisdGoodsSpec wisdGoodsSpec=goodsSpecService.getInfoById(wisdOrderDetail.getSpecId());
-                WisdWxuser wisdWxuser=wxuserService.getById(userId);
-                if (wisdWxuser.getUserIscompany()==1&&wisdOeder.getOrderPayWay()!=3&&wisdOeder.getOrderPayWay()!=4&&wisdOeder.getOrderPayWay()!=5) {
-                    WisdUser wisdUser=wisdUserService.getByUserId(wisdWxuser.getUserId());
+            queryWrapper2.eq("order_id", wisdOeder.getId());
+            List<WisdOrderDetail> wisdOrderDetailList = orderDetailService.list(queryWrapper2);
+            List<WisdGoods> wisdGoodsList = new ArrayList<>();
+            for (WisdOrderDetail wisdOrderDetail : wisdOrderDetailList) {
+                WisdGoods wisdGoods = goodsService.getInfoById(wisdOrderDetail.getGoodsId());
+                WisdGoodsSpec wisdGoodsSpec = goodsSpecService.getInfoById(wisdOrderDetail.getSpecId());
+                WisdWxuser wisdWxuser = wxuserService.getById(userId);
+                if (wisdWxuser.getUserIscompany() == 1 && wisdOeder.getOrderPayWay() != 3 && wisdOeder.getOrderPayWay() != 4 && wisdOeder.getOrderPayWay() != 5) {
+                    WisdUser wisdUser = wisdUserService.getByUserId(wisdWxuser.getUserId());
                     QueryWrapper<WisdBulk> queryWrapper3 = new QueryWrapper<>();
                     queryWrapper3.eq("goods_id", wisdGoods.getId());
                     queryWrapper3.eq("company_id", wisdUser.getCompanyId());
                     queryWrapper3.eq("spec_id", wisdGoodsSpec.getId());
                     queryWrapper3.eq("is_enable", 1);
-                    WisdBulk wisdBulk=blukService.getOne(queryWrapper3);
-                    if (wisdBulk!=null) {
+                    WisdBulk wisdBulk = blukService.getOne(queryWrapper3);
+                    if (wisdBulk != null) {
                         wisdGoodsSpec.setSpecBulyPrice(wisdBulk.getGoodsBulkPrice());
                     }
                 }
@@ -532,41 +529,41 @@ public class UserApi {
             }
             wisdOeder.setGoodsList(wisdGoodsList);
         }
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG,wisdOederList);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG, wisdOederList);
     }
 
     @ApiOperation(value = "提现记录")
     @GetMapping("getWisdWithdrawal")
-    public Result getWisdWithdrawal(Long userId,Integer status,Integer page,Integer num) {
+    public Result getWisdWithdrawal(Long userId, Integer status, Integer page, Integer num) {
         QueryWrapper<WisdWithdrawal> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("user_id",userId);
+        queryWrapper.eq("user_id", userId);
         if (status != 0) {
-            queryWrapper.eq("status",status);
+            queryWrapper.eq("status", status);
         }
-        Page<WisdWithdrawal> p = new Page<>(page,num);
-        IPage<WisdWithdrawal> wisdWithdrawalIPage=withdrawalService.page(p,queryWrapper);
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG,wisdWithdrawalIPage);
+        Page<WisdWithdrawal> p = new Page<>(page, num);
+        IPage<WisdWithdrawal> wisdWithdrawalIPage = withdrawalService.page(p, queryWrapper);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG, wisdWithdrawalIPage);
     }
 
     @ApiOperation(value = "申请提现")
     @PostMapping("addWisdWithdrawal")
     public Result addWisdWithdrawal(@RequestBody WisdWithdrawal wisdWithdrawal) {
         QueryWrapper<WisdBack> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like("back_name",wisdWithdrawal.getWithdrawalCard());
-        WisdBack wisdBack=backService.getOne(queryWrapper);
-        if (wisdBack==null){
-            return new Result(ResultUtil.ERROR,"请输入开户行完整名称");
+        queryWrapper.like("back_name", wisdWithdrawal.getWithdrawalCard());
+        WisdBack wisdBack = backService.getOne(queryWrapper);
+        if (wisdBack == null) {
+            return new Result(ResultUtil.ERROR, "请输入开户行完整名称");
         }
         wisdWithdrawal.setWithdrawalCardNo(wisdBack.getBackNumber());
-        String wisdWithdrawalNumber="WN"+(new Date()).getTime();
-        WisdWxuser wisdWxuser=wxuserService.getById(wisdWithdrawal.getUserId());
+        String wisdWithdrawalNumber = "WN" + (new Date()).getTime();
+        WisdWxuser wisdWxuser = wxuserService.getById(wisdWithdrawal.getUserId());
         wisdWithdrawal.setWithdrawalNumber(wisdWithdrawalNumber);
-        Boolean flag=withdrawalService.save(wisdWithdrawal);
-        if (flag){
+        Boolean flag = withdrawalService.save(wisdWithdrawal);
+        if (flag) {
             wisdWxuser.setUserBalance(wisdWxuser.getUserBalance().subtract(wisdWithdrawal.getWithdrawalMoney()));
             wxuserService.saveOrUpdate(wisdWxuser);
             return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG);
-        }else {
+        } else {
             return new Result(ResultUtil.ERROR, ResultUtil.ERROR_MSG);
         }
     }
@@ -574,36 +571,36 @@ public class UserApi {
     @ApiOperation(value = "获取提现规则")
     @GetMapping("getWithdrawalRole")
     public Result getWithdrawalRole() {
-        WisdIntegrlRoles wisdIntegrlRoles=integralRolesService.getById(1);
-        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG,wisdIntegrlRoles);
+        WisdIntegrlRoles wisdIntegrlRoles = integralRolesService.getById(1);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG, wisdIntegrlRoles);
     }
 
     @ApiOperation(value = "分享获得积分")
     @PutMapping("putIntetralEarnings")
     public Result putIntetralEarnings(Long userId) {
-        if (userId==0){
-            return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG);
+        if (userId == 0) {
+            return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG);
         }
-        WisdWxuser wisdWxuser=wxuserService.getById(userId);
-       // WisdUser wisdUser=wisdUserService.getByUserId(wisdWxuser.getCompanyUserId());
+        WisdWxuser wisdWxuser = wxuserService.getById(userId);
+        // WisdUser wisdUser=wisdUserService.getByUserId(wisdWxuser.getCompanyUserId());
         QueryWrapper<WisdBill> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("bill_category",44);
-        queryWrapper.eq("bill_type",1);
-        queryWrapper.eq("user_id",userId);
+        queryWrapper.eq("bill_category", 44);
+        queryWrapper.eq("bill_type", 1);
+        queryWrapper.eq("user_id", userId);
         Date now = new Date();
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");//设置日期格式
         String createTime = dateFormat.format(now);//格式化然后放入字符串中
-        queryWrapper.like("create_time",createTime);
-        List<WisdBill> wisdBillList=billService.list(queryWrapper);
-        WisdIntegrlRoles wisdIntegrlRoles=integralRolesService.getById(1);
-        if (wisdIntegrlRoles.getIntegralDayNum()<wisdBillList.size()||wisdIntegrlRoles.getIntegralDayNum()==wisdBillList.size()){
-            return new Result(ResultUtil.ERROR,"今日分享收益次数已达上限");
-        }else {
-            wisdWxuser.setUserIntegral(wisdWxuser.getUserIntegral()+wisdIntegrlRoles.getIntegralDay());
-            wisdWxuser.setUserAllIntegral(wisdWxuser.getUserAllIntegral()+wisdIntegrlRoles.getIntegralDay());
+        queryWrapper.like("create_time", createTime);
+        List<WisdBill> wisdBillList = billService.list(queryWrapper);
+        WisdIntegrlRoles wisdIntegrlRoles = integralRolesService.getById(1);
+        if (wisdIntegrlRoles.getIntegralDayNum() < wisdBillList.size() || wisdIntegrlRoles.getIntegralDayNum() == wisdBillList.size()) {
+            return new Result(ResultUtil.ERROR, "今日分享收益次数已达上限");
+        } else {
+            wisdWxuser.setUserIntegral(wisdWxuser.getUserIntegral() + wisdIntegrlRoles.getIntegralDay());
+            wisdWxuser.setUserAllIntegral(wisdWxuser.getUserAllIntegral() + wisdIntegrlRoles.getIntegralDay());
             //wisdUser.setUserIntegral(wisdWxuser.getUserIntegral()+wisdIntegrlRoles.getIntegralDay());
-            Boolean flag1=wxuserService.saveOrUpdate(wisdWxuser);
-           // Boolean flag2=wisdUserService.saveOrUpdate(wisdUser);
+            Boolean flag1 = wxuserService.saveOrUpdate(wisdWxuser);
+            // Boolean flag2=wisdUserService.saveOrUpdate(wisdUser);
             if (flag1) {
                 WisdBill wisdBill = new WisdBill();
                 wisdBill.setBillIntegral(wisdIntegrlRoles.getIntegralDay());
@@ -613,9 +610,9 @@ public class UserApi {
                 wisdBill.setBillIntroduction("分享得积分");
                 billService.save(wisdBill);
                 vipService.addVip(wisdWxuser.getId());
-                return  new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG);
-            }else {
-                return  new Result(ResultUtil.ERROR,ResultUtil.ERROR_MSG);
+                return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG);
+            } else {
+                return new Result(ResultUtil.ERROR, ResultUtil.ERROR_MSG);
             }
         }
     }
diff --git a/src/main/java/com/wisdo/mmining/api/WechatApi.java b/src/main/java/com/wisdo/mmining/api/WechatApi.java
index 502a5cb..c9c5d70 100644
--- a/src/main/java/com/wisdo/mmining/api/WechatApi.java
+++ b/src/main/java/com/wisdo/mmining/api/WechatApi.java
@@ -2,7 +2,9 @@ package com.wisdo.mmining.api;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.vdurmont.emoji.EmojiParser;
-import com.wisdo.mmining.entity.*;
+import com.wisdo.mmining.entity.WisdGoods;
+import com.wisdo.mmining.entity.WisdVip;
+import com.wisdo.mmining.entity.WisdWxuser;
 import com.wisdo.mmining.redis.RedisService;
 import com.wisdo.mmining.result.Result;
 import com.wisdo.mmining.result.ResultUtil;
@@ -22,7 +24,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -51,17 +52,17 @@ public class WechatApi {
 
     @ApiOperation(value = "test")
     @GetMapping("test")
-    public void  test(String name) throws  Exception{
+    public void test(String name) throws Exception {
         //String q="city:"+name;
-        SolrQuery solrQuery=new SolrQuery("*:*");//查询所有
+        SolrQuery solrQuery = new SolrQuery("*:*");//查询所有
         QueryResponse query = solrClient.query(solrQuery);
 
         long numFound = query.getResults().getNumFound();
-        System.out.println("总记录数："+numFound);
+        System.out.println("总记录数：" + numFound);
 
         List<WisdGoods> beans = query.getBeans(WisdGoods.class);
-        for(WisdGoods goods:beans){
-            System.out.println(goods.getId()+"  "+goods.getGoodsName()+"  "+goods.getSprice());
+        for (WisdGoods goods : beans) {
+            System.out.println(goods.getId() + "  " + goods.getGoodsName() + "  " + goods.getSprice());
         }
     }
 
@@ -78,7 +79,7 @@ public class WechatApi {
         map.put("secret", WeiXinPayConfig.XCX_SECRET);
         map.put("grant_type", "authorization_code");
         System.out.println("获取openid的url参数map为：" + map);
-        String url=WeiXinPayConfig.LOGINURL+"?appid="+WeiXinPayConfig.XCX_APPID+"&js_code="+code+"&secret="+WeiXinPayConfig.XCX_SECRET+"&grant_type=authorization_code";
+        String url = WeiXinPayConfig.LOGINURL + "?appid=" + WeiXinPayConfig.XCX_APPID + "&js_code=" + code + "&secret=" + WeiXinPayConfig.XCX_SECRET + "&grant_type=authorization_code";
         String result = "";
         try {
             result = restTemplate.getForEntity(url, String.class).getBody();
@@ -103,32 +104,32 @@ public class WechatApi {
     @ApiOperation(value = "微信授权登陆后添加用户")
     @PostMapping("addUser")
     @ApiImplicitParams({
-            @ApiImplicitParam(name="wxOpenid",value="openid", paramType = "wxOpenid"),
-            @ApiImplicitParam(name="wxNickname",value="昵称", paramType = "wxNickname"),
-            @ApiImplicitParam(name="userPid",value="上级id", paramType = "userPid"),
-            @ApiImplicitParam(name="wxPhoto",value="头像", paramType = "wxPhoto")})
-    public Result registered(@RequestBody WisdWxuser wisdWxuser){
+            @ApiImplicitParam(name = "wxOpenid", value = "openid", paramType = "wxOpenid"),
+            @ApiImplicitParam(name = "wxNickname", value = "昵称", paramType = "wxNickname"),
+            @ApiImplicitParam(name = "userPid", value = "上级id", paramType = "userPid"),
+            @ApiImplicitParam(name = "wxPhoto", value = "头像", paramType = "wxPhoto")})
+    public Result registered(@RequestBody WisdWxuser wisdWxuser) {
 //        if (isSpecialChar(wisdWxuser.getWxNickname())){
 //            wisdWxuser.setWxNickname("会员"+(new Date()).getTime());
 //        }
         wisdWxuser.setWxNickname(EmojiParser.removeAllEmojis(wisdWxuser.getWxNickname()));
         QueryWrapper<WisdWxuser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("wx_openid",wisdWxuser.getWxOpenid());
-        WisdWxuser wisdWxuser1=wxuserService.getOne(queryWrapper);
-        if (wisdWxuser1==null) {
-            Integer vipIntegral=0;
-            String vipname="";
-            List<WisdVip> vipList=vipService.list();
-            for (WisdVip vip:vipList){
-                if (vipIntegral==vip.getVipIntegral()){
-                    vipname=vip.getVipName();
+        queryWrapper.eq("wx_openid", wisdWxuser.getWxOpenid());
+        WisdWxuser wisdWxuser1 = wxuserService.getOne(queryWrapper);
+        if (wisdWxuser1 == null) {
+            Integer vipIntegral = 0;
+            String vipname = "";
+            List<WisdVip> vipList = vipService.list();
+            for (WisdVip vip : vipList) {
+                if (vipIntegral == vip.getVipIntegral()) {
+                    vipname = vip.getVipName();
                 }
             }
             wisdWxuser.setUserSex(1);
             wisdWxuser.setUserVip(vipname);
             wxuserService.save(wisdWxuser);
             return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG, wisdWxuser);
-        }else {
+        } else {
             return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG, wisdWxuser1);
 
         }
diff --git a/src/main/java/com/wisdo/mmining/api/dto/AfterSalesDto.java b/src/main/java/com/wisdo/mmining/api/dto/AfterSalesDto.java
new file mode 100644
index 0000000..8968a4a
--- /dev/null
+++ b/src/main/java/com/wisdo/mmining/api/dto/AfterSalesDto.java
@@ -0,0 +1,12 @@
+package com.wisdo.mmining.api.dto;
+
+import lombok.Data;
+
+@Data
+public class AfterSalesDto {
+    private Long orderId;
+    private String orderRefund;
+    private String orderRefundImg;
+    private Integer status;
+    private Long packageId;
+}
diff --git a/src/main/java/com/wisdo/mmining/api/dto/AmountDto.java b/src/main/java/com/wisdo/mmining/api/dto/AmountDto.java
index 2e13b77..a37eac3 100644
--- a/src/main/java/com/wisdo/mmining/api/dto/AmountDto.java
+++ b/src/main/java/com/wisdo/mmining/api/dto/AmountDto.java
@@ -1,6 +1,5 @@
 package com.wisdo.mmining.api.dto;
 
-import com.wisdo.mmining.entity.WisdGoods;
 import lombok.Data;
 
 import java.util.List;
diff --git a/src/main/java/com/wisdo/mmining/api/dto/IntegralDto.java b/src/main/java/com/wisdo/mmining/api/dto/IntegralDto.java
index b8aeb2a..b5b50d4 100644
--- a/src/main/java/com/wisdo/mmining/api/dto/IntegralDto.java
+++ b/src/main/java/com/wisdo/mmining/api/dto/IntegralDto.java
@@ -1,7 +1,6 @@
 package com.wisdo.mmining.api.dto;
 
 import com.wisdo.mmining.entity.WisdIntegrlRoles;
-import io.swagger.models.auth.In;
 import lombok.Data;
 
 /**
diff --git a/src/main/java/com/wisdo/mmining/controller/BannerController.java b/src/main/java/com/wisdo/mmining/controller/BannerController.java
index 3c50dc7..bb59427 100644
--- a/src/main/java/com/wisdo/mmining/controller/BannerController.java
+++ b/src/main/java/com/wisdo/mmining/controller/BannerController.java
@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.wisdo.mmining.entity.WisdBanner;
-import com.wisdo.mmining.entity.WisdCompany;
 import com.wisdo.mmining.entity.WisdGoods;
 import com.wisdo.mmining.entity.WisdWelfare;
 import com.wisdo.mmining.result.Result;
@@ -42,48 +41,46 @@ public class BannerController {
     private WelfareService welfareService;
 
 
-
-
     @GetMapping(value = "")
-    public String page(){
+    public String page() {
         return "pages/banner/banner_list";
     }
 
     @GetMapping(value = "/list")
     @ResponseBody
-    public Result<IPage<WisdBanner>> list(int page, int num){
+    public Result<IPage<WisdBanner>> list(int page, int num) {
         IPage<WisdBanner> wisdCompanyIPage = bannerService.selectPage(page, num);
-        return new Result<IPage<WisdBanner>>(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wisdCompanyIPage);
+        return new Result<IPage<WisdBanner>>(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wisdCompanyIPage);
     }
 
     @GetMapping(value = "edit")
-    public String edit(Model model, Long id){
-        if (id!=null){
+    public String edit(Model model, Long id) {
+        if (id != null) {
             WisdBanner wisdBanner = bannerService.getById(id);
-            model.addAttribute("obj",wisdBanner);
+            model.addAttribute("obj", wisdBanner);
         }
         QueryWrapper<WisdGoods> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("goods_classify",0);
-        List<WisdGoods> wisdGoodsList=goodsService.list(queryWrapper);
-        model.addAttribute("wisdGoodsList",wisdGoodsList);
+        queryWrapper.eq("goods_classify", 0);
+        List<WisdGoods> wisdGoodsList = goodsService.list(queryWrapper);
+        model.addAttribute("wisdGoodsList", wisdGoodsList);
         QueryWrapper<WisdWelfare> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("welfare_type",5);
-        List<WisdWelfare> wisdWelfareList=welfareService.list(queryWrapper1);
-        model.addAttribute("wisdWelfareList",wisdWelfareList);
+        queryWrapper1.eq("welfare_type", 5);
+        List<WisdWelfare> wisdWelfareList = welfareService.list(queryWrapper1);
+        model.addAttribute("wisdWelfareList", wisdWelfareList);
         return "pages/banner/banner_edit";
     }
 
     @PostMapping(value = "save")
     @ResponseBody
-    public Result save(WisdBanner wisdBanner){
+    public Result save(WisdBanner wisdBanner) {
         boolean flag = false;
-        if(wisdBanner.getId()==null){
+        if (wisdBanner.getId() == null) {
             flag = bannerService.save(wisdBanner);
-        }else{
+        } else {
             flag = bannerService.updateById(wisdBanner);
         }
-        if(flag){
-            return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG);
+        if (flag) {
+            return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG);
         }
         return ResultUtil.error();
     }
diff --git a/src/main/java/com/wisdo/mmining/controller/BlukController.java b/src/main/java/com/wisdo/mmining/controller/BlukController.java
index e86738e..a650e71 100644
--- a/src/main/java/com/wisdo/mmining/controller/BlukController.java
+++ b/src/main/java/com/wisdo/mmining/controller/BlukController.java
@@ -1,7 +1,6 @@
 package com.wisdo.mmining.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.wisdo.mmining.controller.vo.BlukVo;
 import com.wisdo.mmining.entity.*;
 import com.wisdo.mmining.result.Result;
@@ -40,9 +39,9 @@ public class BlukController {
     private ContractService contractService;
 
     @GetMapping(value = "")
-    public String page(Model model){
+    public String page(Model model) {
         Subject subject = SecurityUtils.getSubject();
-        User user= (User) subject.getSession().getAttribute("sys_user");
+        User user = (User) subject.getSession().getAttribute("sys_user");
 //        QueryWrapper<WisdGoods> queryWrapper2 = new QueryWrapper<>();
 //        queryWrapper2.eq("goods_classify",0);
 //        List<WisdGoods> goodsList=goodsService.list(queryWrapper2);
@@ -68,61 +67,61 @@ public class BlukController {
 //            }
 //        }
         QueryWrapper<WisdContract> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("company_id",user.getCompanyId());
-        queryWrapper.eq("status",1);
-        List<WisdContract> contractList=contractService.list(queryWrapper);
-        model.addAttribute("contractList",contractList);
+        queryWrapper.eq("company_id", user.getCompanyId());
+        queryWrapper.eq("status", 1);
+        List<WisdContract> contractList = contractService.list(queryWrapper);
+        model.addAttribute("contractList", contractList);
         //model.addAttribute("obj",blukVoList);
         return "pages/bluk/bluk_list";
     }
 
     @GetMapping(value = "edit")
-    public String edit(Model model, Long id){
-        if (id!=null){
+    public String edit(Model model, Long id) {
+        if (id != null) {
             Subject subject = SecurityUtils.getSubject();
-            User user= (User) subject.getSession().getAttribute("sys_user");
+            User user = (User) subject.getSession().getAttribute("sys_user");
             WisdGoods wisdGoods = goodsService.getById(id);
-            model.addAttribute("obj",wisdGoods);
+            model.addAttribute("obj", wisdGoods);
             QueryWrapper<WisdGoodsSpec> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("goods_id",id);
-            List<WisdGoodsSpec> wisdGoodsSpecList=goodsSpecService.list(queryWrapper);
-            for (WisdGoodsSpec wisdGoodsSpec:wisdGoodsSpecList){
+            queryWrapper.eq("goods_id", id);
+            List<WisdGoodsSpec> wisdGoodsSpecList = goodsSpecService.list(queryWrapper);
+            for (WisdGoodsSpec wisdGoodsSpec : wisdGoodsSpecList) {
                 QueryWrapper<WisdBulk> queryWrapper1 = new QueryWrapper<>();
-                queryWrapper1.eq("company_id",user.getCompanyId());
-                queryWrapper1.eq("goods_id",id);
-                queryWrapper1.eq("spec_id",wisdGoodsSpec.getId());
+                queryWrapper1.eq("company_id", user.getCompanyId());
+                queryWrapper1.eq("goods_id", id);
+                queryWrapper1.eq("spec_id", wisdGoodsSpec.getId());
                 queryWrapper1.eq("is_enable", 1);
-                WisdBulk wisdBulk=blukService.getOne(queryWrapper1);
-                if (wisdBulk!=null) {
+                WisdBulk wisdBulk = blukService.getOne(queryWrapper1);
+                if (wisdBulk != null) {
                     wisdGoodsSpec.setSpecBulyPrice(wisdBulk.getGoodsBulkPrice());
                 }
             }
-            model.addAttribute("wisdGoodsSpecList",wisdGoodsSpecList);
+            model.addAttribute("wisdGoodsSpecList", wisdGoodsSpecList);
         }
-        List<WisdGoodsType> wisdGoodsTypeList=goodsTypeService.list();
-        model.addAttribute("wisdGoodsTypeList",wisdGoodsTypeList);
+        List<WisdGoodsType> wisdGoodsTypeList = goodsTypeService.list();
+        model.addAttribute("wisdGoodsTypeList", wisdGoodsTypeList);
         return "pages/bluk/bluk_edit";
     }
 
     @GetMapping(value = "/list")
     @ResponseBody
-    public Result list(){
-        List<WisdGoods> goodsList=goodsService.list();
-        List<BlukVo> blukVoList=new ArrayList<>();
+    public Result list() {
+        List<WisdGoods> goodsList = goodsService.list();
+        List<BlukVo> blukVoList = new ArrayList<>();
         Subject subject = SecurityUtils.getSubject();
-        User user= (User) subject.getSession().getAttribute("sys_user");
-        for (WisdGoods wisdGoods:goodsList){
+        User user = (User) subject.getSession().getAttribute("sys_user");
+        for (WisdGoods wisdGoods : goodsList) {
             QueryWrapper<WisdGoodsSpec> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("goods_id",wisdGoods.getId());
-            List<WisdGoodsSpec> goodsSpecList=goodsSpecService.list(queryWrapper);
-            for (WisdGoodsSpec wisdGoodsSpec:goodsSpecList){
+            queryWrapper.eq("goods_id", wisdGoods.getId());
+            List<WisdGoodsSpec> goodsSpecList = goodsSpecService.list(queryWrapper);
+            for (WisdGoodsSpec wisdGoodsSpec : goodsSpecList) {
                 QueryWrapper<WisdBulk> queryWrapper1 = new QueryWrapper<>();
-                queryWrapper1.eq("goods_id",wisdGoods.getId());
-                queryWrapper1.eq("company_id",user.getCompanyId());
-                queryWrapper1.eq("spec_id",wisdGoodsSpec.getId());
+                queryWrapper1.eq("goods_id", wisdGoods.getId());
+                queryWrapper1.eq("company_id", user.getCompanyId());
+                queryWrapper1.eq("spec_id", wisdGoodsSpec.getId());
                 queryWrapper1.eq("is_enable", 1);
-                WisdBulk wisdBulk=blukService.getOne(queryWrapper1);
-                BlukVo blukVo=new BlukVo();
+                WisdBulk wisdBulk = blukService.getOne(queryWrapper1);
+                BlukVo blukVo = new BlukVo();
                 blukVo.setGoodsBulyPrice(wisdBulk.getGoodsBulkPrice());
                 blukVo.setGoodsName(wisdGoods.getGoodsName());
                 blukVo.setGoodsPrice(wisdGoodsSpec.getSpecPrice());
@@ -130,6 +129,6 @@ public class BlukController {
                 blukVoList.add(blukVo);
             }
         }
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,blukVoList);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, blukVoList);
     }
 }
diff --git a/src/main/java/com/wisdo/mmining/controller/CompanyController.java b/src/main/java/com/wisdo/mmining/controller/CompanyController.java
index e7cec06..20c1b6b 100644
--- a/src/main/java/com/wisdo/mmining/controller/CompanyController.java
+++ b/src/main/java/com/wisdo/mmining/controller/CompanyController.java
@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.wisdo.mmining.entity.WisdCompany;
 import com.wisdo.mmining.entity.WisdDept;
-import com.wisdo.mmining.entity.WisdGoods;
 import com.wisdo.mmining.result.Result;
 import com.wisdo.mmining.result.ResultUtil;
 import com.wisdo.mmining.service.CompanyService;
@@ -38,45 +37,45 @@ public class CompanyController {
     private DeptService deptService;
 
     @GetMapping(value = "")
-    public String page(){
+    public String page() {
         return "pages/company/company_list";
     }
 
     @GetMapping(value = "/list")
     @ResponseBody
-    public Result<IPage<WisdCompany>> list(String name, int page, int num){
-        IPage<WisdCompany> wisdCompanyIPage = companyService.selectPage(name,page, num);
-        return new Result<IPage<WisdCompany>>(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wisdCompanyIPage);
+    public Result<IPage<WisdCompany>> list(String name, int page, int num) {
+        IPage<WisdCompany> wisdCompanyIPage = companyService.selectPage(name, page, num);
+        return new Result<IPage<WisdCompany>>(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wisdCompanyIPage);
     }
 
     @GetMapping(value = "edit")
-    public String edit(Model model, Long id){
-        if (id!=null){
+    public String edit(Model model, Long id) {
+        if (id != null) {
             WisdCompany wisdCompany = companyService.getById(id);
-            model.addAttribute("obj",wisdCompany);
+            model.addAttribute("obj", wisdCompany);
         }
         return "pages/company/company_edit";
     }
 
     @PostMapping(value = "save")
     @ResponseBody
-    public Result save(WisdCompany wisdCompany){
+    public Result save(WisdCompany wisdCompany) {
         boolean flag = false;
-        if(wisdCompany.getId()==null){
+        if (wisdCompany.getId() == null) {
             WisdCompany wisdCompany1 = companyService.getByName(wisdCompany.getCompanyName().trim());
-            if(wisdCompany1!=null){
+            if (wisdCompany1 != null) {
                 return ResultUtil.error("已存在");
             }
             flag = companyService.save(wisdCompany);
-        }else{
+        } else {
             WisdCompany wisdCompany1 = companyService.getByName(wisdCompany.getCompanyName().trim());
-            if(wisdCompany1!=null&&!wisdCompany1.getId().equals(wisdCompany.getId())){
+            if (wisdCompany1 != null && !wisdCompany1.getId().equals(wisdCompany.getId())) {
                 return ResultUtil.error("已存在");
             }
             flag = companyService.updateById(wisdCompany);
         }
-        if(flag){
-            return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG);
+        if (flag) {
+            return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG);
         }
         return ResultUtil.error();
     }
@@ -94,21 +93,21 @@ public class CompanyController {
                 }
             }
             if (idList.size() > 0) {
-                Boolean flags=false;
-                Long id1=0L;
-                for (Long id:idList) {
+                Boolean flags = false;
+                Long id1 = 0L;
+                for (Long id : idList) {
                     QueryWrapper<WisdDept> queryWrapper = new QueryWrapper<>();
                     queryWrapper.eq("company_id", id);
                     List<WisdDept> deptList = deptService.list(queryWrapper);
-                    if (deptList.size()!=0) {
+                    if (deptList.size() != 0) {
                         flags = true;
-                        id1=id;
+                        id1 = id;
                         break;
                     }
                 }
-                if (flags){
-                    WisdCompany wisdCompany=companyService.getById(id1);
-                    return new Result(ResultUtil.ERROR,wisdCompany.getCompanyName()+"公司下有未删除的部门，请先删除");
+                if (flags) {
+                    WisdCompany wisdCompany = companyService.getById(id1);
+                    return new Result(ResultUtil.ERROR, wisdCompany.getCompanyName() + "公司下有未删除的部门，请先删除");
                 }
                 //逻辑删除
                 boolean flag = companyService.removeByIds(idList);
@@ -127,11 +126,11 @@ public class CompanyController {
 
     @PostMapping(value = "buly")
     @ResponseBody
-    public Result buly(Long id,Integer state) {
-        WisdCompany wisdCompany=new WisdCompany();
+    public Result buly(Long id, Integer state) {
+        WisdCompany wisdCompany = new WisdCompany();
         wisdCompany.setId(id);
         wisdCompany.setCompanyBluk(state);
-        Boolean flag=companyService.saveOrUpdate(wisdCompany);
+        Boolean flag = companyService.saveOrUpdate(wisdCompany);
         if (flag) {
             return ResultUtil.success();
         } else {
@@ -142,7 +141,7 @@ public class CompanyController {
     @GetMapping(value = "getCompany")
     @ResponseBody
     public Result getCompany(Long id) {
-        WisdCompany wisdCompany=companyService.getById(id);
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG,wisdCompany);
+        WisdCompany wisdCompany = companyService.getById(id);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG, wisdCompany);
     }
 }
diff --git a/src/main/java/com/wisdo/mmining/controller/DeptController.java b/src/main/java/com/wisdo/mmining/controller/DeptController.java
index 68a5af3..98bfc1c 100644
--- a/src/main/java/com/wisdo/mmining/controller/DeptController.java
+++ b/src/main/java/com/wisdo/mmining/controller/DeptController.java
@@ -44,54 +44,54 @@ public class DeptController {
     private WisdUserService wisdUserService;
 
     @GetMapping(value = "")
-    public String page(Model model){
-        List<WisdCompany> companyList=companyService.list();
-        model.addAttribute("companyList",companyList);
+    public String page(Model model) {
+        List<WisdCompany> companyList = companyService.list();
+        model.addAttribute("companyList", companyList);
         return "pages/dept/dept_list";
     }
 
     @GetMapping(value = "/list")
     @ResponseBody
-    public Result<IPage<WisdDept>> list(Long companyId,String name, int page, int num){
-        IPage<WisdDept> wisdCompanyIPage = deptService.selectPage(companyId,name,page, num);
-        return new Result<IPage<WisdDept>>(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wisdCompanyIPage);
+    public Result<IPage<WisdDept>> list(Long companyId, String name, int page, int num) {
+        IPage<WisdDept> wisdCompanyIPage = deptService.selectPage(companyId, name, page, num);
+        return new Result<IPage<WisdDept>>(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wisdCompanyIPage);
     }
 
     @GetMapping(value = "edit")
-    public String edit(Model model, Long id){
-        if (id!=null){
+    public String edit(Model model, Long id) {
+        if (id != null) {
             WisdDept wisdDept = deptService.getById(id);
-            model.addAttribute("obj",wisdDept);
+            model.addAttribute("obj", wisdDept);
         }
-        List<WisdCompany> companyList=companyService.list();
-        model.addAttribute("companyList",companyList);
+        List<WisdCompany> companyList = companyService.list();
+        model.addAttribute("companyList", companyList);
         return "pages/dept/dept_edit";
     }
 
     @PostMapping(value = "save")
     @ResponseBody
-    public Result save(WisdDept wisdDept){
-        if (wisdDept.getCompanyId()==null){
+    public Result save(WisdDept wisdDept) {
+        if (wisdDept.getCompanyId() == null) {
             Subject subject = SecurityUtils.getSubject();
-            User user= (User) subject.getSession().getAttribute("sys_user");
+            User user = (User) subject.getSession().getAttribute("sys_user");
             wisdDept.setCompanyId(user.getCompanyId());
         }
         boolean flag = false;
-        if(wisdDept.getId()==null){
-            WisdDept wisdDept1 = deptService.getByName(wisdDept.getDeptName().trim(),wisdDept.getCompanyId());
-            if(wisdDept1!=null){
+        if (wisdDept.getId() == null) {
+            WisdDept wisdDept1 = deptService.getByName(wisdDept.getDeptName().trim(), wisdDept.getCompanyId());
+            if (wisdDept1 != null) {
                 return ResultUtil.error("已存在");
             }
             flag = deptService.save(wisdDept);
-        }else{
-            WisdDept wisdDept1 = deptService.getByName(wisdDept.getDeptName().trim(),wisdDept.getCompanyId());
-            if(wisdDept1!=null&&!wisdDept1.getId().equals(wisdDept.getId())){
+        } else {
+            WisdDept wisdDept1 = deptService.getByName(wisdDept.getDeptName().trim(), wisdDept.getCompanyId());
+            if (wisdDept1 != null && !wisdDept1.getId().equals(wisdDept.getId())) {
                 return ResultUtil.error("已存在");
             }
             flag = deptService.updateById(wisdDept);
         }
-        if(flag){
-            return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG);
+        if (flag) {
+            return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG);
         }
         return ResultUtil.error();
     }
@@ -109,22 +109,22 @@ public class DeptController {
                 }
             }
             if (idList.size() > 0) {
-                Boolean flags=false;
-                Long id1=0L;
-                for (Long id:idList) {
+                Boolean flags = false;
+                Long id1 = 0L;
+                for (Long id : idList) {
                     QueryWrapper<WisdUser> queryWrapper = new QueryWrapper<>();
                     queryWrapper.eq("dept_id", id);
-                    queryWrapper.eq("user_is_departure",0);
+                    queryWrapper.eq("user_is_departure", 0);
                     List<WisdUser> deptList = wisdUserService.list(queryWrapper);
-                    if (deptList.size()!=0) {
+                    if (deptList.size() != 0) {
                         flags = true;
-                        id1=id;
+                        id1 = id;
                         break;
                     }
                 }
-                if (flags){
-                    WisdDept wisdDept=deptService.getById(id1);
-                    return new Result(ResultUtil.ERROR,wisdDept.getDeptName()+"部门下有未删除的员工，请先删除");
+                if (flags) {
+                    WisdDept wisdDept = deptService.getById(id1);
+                    return new Result(ResultUtil.ERROR, wisdDept.getDeptName() + "部门下有未删除的员工，请先删除");
                 }
                 //逻辑删除
                 boolean flag = deptService.removeByIds(idList);
@@ -141,7 +141,7 @@ public class DeptController {
         }
     }
 
-//    @PostMapping(value = "buly")
+    //    @PostMapping(value = "buly")
 //    @ResponseBody
 //    public Result buly(Long id,Integer state) {
 //        WisdCompany wisdCompany=new WisdCompany();
@@ -159,8 +159,8 @@ public class DeptController {
     @ResponseBody
     public Result getlist(Long id) {
         QueryWrapper<WisdDept> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("company_id",id);
-        List<WisdDept> wisdDept=deptService.list(queryWrapper);
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG,wisdDept);
+        queryWrapper.eq("company_id", id);
+        List<WisdDept> wisdDept = deptService.list(queryWrapper);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG, wisdDept);
     }
 }
diff --git a/src/main/java/com/wisdo/mmining/controller/DiscountController.java b/src/main/java/com/wisdo/mmining/controller/DiscountController.java
index ca9900f..68e3105 100644
--- a/src/main/java/com/wisdo/mmining/controller/DiscountController.java
+++ b/src/main/java/com/wisdo/mmining/controller/DiscountController.java
@@ -36,37 +36,37 @@ public class DiscountController {
     private DeptService deptService;
 
     @GetMapping(value = "")
-    public String page(){
+    public String page() {
         return "pages/discount/discount_list";
     }
 
     @GetMapping(value = "/list")
     @ResponseBody
-    public Result<IPage<WisdCashVolume>> list(String name, int page, int num){
+    public Result<IPage<WisdCashVolume>> list(String name, int page, int num) {
         Subject subject = SecurityUtils.getSubject();
-        User user= (User) subject.getSession().getAttribute("sys_user");
-        IPage<WisdCashVolume> wisdPackageIPage = cashVolumeService.getIssueList2ByCompanyId(user.getCompanyId(),page, num);
-        return new Result<IPage<WisdCashVolume>>(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wisdPackageIPage);
+        User user = (User) subject.getSession().getAttribute("sys_user");
+        IPage<WisdCashVolume> wisdPackageIPage = cashVolumeService.getIssueList2ByCompanyId(user.getCompanyId(), page, num);
+        return new Result<IPage<WisdCashVolume>>(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wisdPackageIPage);
     }
 
     @GetMapping(value = "send")
-    public String edit(Model model, Long id){
-        if (id!=null){
+    public String edit(Model model, Long id) {
+        if (id != null) {
             WisdCashVolume wisdCashVolume = cashVolumeService.getById(id);
-            model.addAttribute("obj",wisdCashVolume);
+            model.addAttribute("obj", wisdCashVolume);
         }
         Subject subject = SecurityUtils.getSubject();
-        User user= (User) subject.getSession().getAttribute("sys_user");
+        User user = (User) subject.getSession().getAttribute("sys_user");
         QueryWrapper<WisdDept> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("company_id",user.getCompanyId());
-        List<WisdDept> deptList=deptService.list(queryWrapper);
-        model.addAttribute("deptList",deptList);
+        queryWrapper.eq("company_id", user.getCompanyId());
+        List<WisdDept> deptList = deptService.list(queryWrapper);
+        model.addAttribute("deptList", deptList);
         return "pages/discount/discount_edit";
     }
 
     @PostMapping(value = "save")
     @ResponseBody
-    public Result save(WisdCashVolume wisdCashVolume){
+    public Result save(WisdCashVolume wisdCashVolume) {
         return cashVolumeService.senddDscount(wisdCashVolume);
     }
 }
diff --git a/src/main/java/com/wisdo/mmining/controller/FeedbackController.java b/src/main/java/com/wisdo/mmining/controller/FeedbackController.java
index 82ca30d..f08ca55 100644
--- a/src/main/java/com/wisdo/mmining/controller/FeedbackController.java
+++ b/src/main/java/com/wisdo/mmining/controller/FeedbackController.java
@@ -2,9 +2,7 @@ package com.wisdo.mmining.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.wisdo.mmining.entity.WisdCompany;
 import com.wisdo.mmining.entity.WisdFeedback;
 import com.wisdo.mmining.result.Result;
 import com.wisdo.mmining.result.ResultUtil;
@@ -34,41 +32,41 @@ public class FeedbackController {
     private FeedBackService feedBackService;
 
     @GetMapping(value = "")
-    public String page(){
+    public String page() {
         return "pages/feedback/feedback_list";
     }
 
     @GetMapping(value = "/list")
     @ResponseBody
-    public Result<IPage<WisdFeedback>> list(String phone,int page, int num){
-        IPage<WisdFeedback> wisdCompanyIPage = feedBackService.selectPage(phone,page, num);
-        return new Result<IPage<WisdFeedback>>(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wisdCompanyIPage);
+    public Result<IPage<WisdFeedback>> list(String phone, int page, int num) {
+        IPage<WisdFeedback> wisdCompanyIPage = feedBackService.selectPage(phone, page, num);
+        return new Result<IPage<WisdFeedback>>(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wisdCompanyIPage);
     }
 
     @GetMapping(value = "edit")
-    public String edit(Model model, Long id){
-        if (id!=null){
+    public String edit(Model model, Long id) {
+        if (id != null) {
             WisdFeedback feedback = feedBackService.getById(id);
-            model.addAttribute("obj",feedback);
+            model.addAttribute("obj", feedback);
         }
         return "pages/feedback/feedback_edit";
     }
 
     @GetMapping(value = "reply")
-    public String reply(Model model, Long id){
-        if (id!=null){
+    public String reply(Model model, Long id) {
+        if (id != null) {
             WisdFeedback feedback = feedBackService.getById(id);
-            model.addAttribute("obj",feedback);
+            model.addAttribute("obj", feedback);
         }
         return "pages/feedback/feedback_reply";
     }
 
     @PostMapping(value = "save")
     @ResponseBody
-    public Result save(WisdFeedback feedback){
-        Boolean flag=feedBackService.updateById(feedback);
-        if(flag){
-            return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG);
+    public Result save(WisdFeedback feedback) {
+        Boolean flag = feedBackService.updateById(feedback);
+        if (flag) {
+            return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG);
         }
         return ResultUtil.error();
     }
diff --git a/src/main/java/com/wisdo/mmining/controller/FreightController.java b/src/main/java/com/wisdo/mmining/controller/FreightController.java
index 10e2467..0b00aad 100644
--- a/src/main/java/com/wisdo/mmining/controller/FreightController.java
+++ b/src/main/java/com/wisdo/mmining/controller/FreightController.java
@@ -1,12 +1,10 @@
 package com.wisdo.mmining.controller;
 
 
-import com.wisdo.mmining.entity.WisdCompany;
 import com.wisdo.mmining.entity.WisdFreight;
 import com.wisdo.mmining.result.Result;
 import com.wisdo.mmining.result.ResultUtil;
 import com.wisdo.mmining.service.FreightService;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -32,23 +30,23 @@ public class FreightController {
     private FreightService freightService;
 
     @GetMapping(value = "")
-    public String page(Model model){
-        List<WisdFreight> freightList=freightService.list();
-        model.addAttribute("obj",freightList);
+    public String page(Model model) {
+        List<WisdFreight> freightList = freightService.list();
+        model.addAttribute("obj", freightList);
         return "pages/freight/freight_list";
     }
 
     @PostMapping(value = "save")
     @ResponseBody
-    public Result save(Long id, BigDecimal price){
-        WisdFreight wisdFreight=new WisdFreight();
+    public Result save(Long id, BigDecimal price) {
+        WisdFreight wisdFreight = new WisdFreight();
         wisdFreight.setId(id);
         wisdFreight.setFreightPrice(price);
-        Boolean flag=freightService.saveOrUpdate(wisdFreight);
-        if (flag){
-            return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG);
-        }else {
-            return new Result(ResultUtil.ERROR,ResultUtil.ERROR_MSG);
+        Boolean flag = freightService.saveOrUpdate(wisdFreight);
+        if (flag) {
+            return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG);
+        } else {
+            return new Result(ResultUtil.ERROR, ResultUtil.ERROR_MSG);
         }
     }
 }
diff --git a/src/main/java/com/wisdo/mmining/controller/GoodsController.java b/src/main/java/com/wisdo/mmining/controller/GoodsController.java
index 3d547c4..9816240 100644
--- a/src/main/java/com/wisdo/mmining/controller/GoodsController.java
+++ b/src/main/java/com/wisdo/mmining/controller/GoodsController.java
@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.wisdo.mmining.controller.vo.SelectVo;
-import com.wisdo.mmining.entity.*;
+import com.wisdo.mmining.entity.WisdGoods;
+import com.wisdo.mmining.entity.WisdGoodsSpec;
+import com.wisdo.mmining.entity.WisdGoodsType;
 import com.wisdo.mmining.result.Result;
 import com.wisdo.mmining.result.ResultUtil;
 import com.wisdo.mmining.service.GoodsService;
@@ -54,80 +56,80 @@ GoodsController {
     SolrClient solrClient;
 
     @GetMapping(value = "")
-    public String page(){
+    public String page() {
         return "pages/goods/goods_list";
     }
 
     @GetMapping(value = "/integral")
-    public String pageintegral(){
+    public String pageintegral() {
         return "pages/goods/goodsintegral_list";
     }
 
     @GetMapping(value = "/seasonal")
-    public String seasonal(){
+    public String seasonal() {
         return "pages/goods/goodsseasonal_list";
     }
 
     @GetMapping(value = "/promotion")
-    public String promotion(){
+    public String promotion() {
         return "pages/goods/goodspromotion_list";
     }
 
     @GetMapping(value = "/classify")
-    public String pageclassify(){
+    public String pageclassify() {
         return "pages/goods/goodsclassify_list";
     }
 
     @GetMapping(value = "/list")
     @ResponseBody
-    public Result<IPage<WisdGoods>> list(String name,Integer isProfits,Integer isDiscount,int page, int num){
-        IPage<WisdGoods> wisdGoodsTypePage = goodsService.selectPage(name,isProfits,isDiscount,page, num);
-        return new Result<IPage<WisdGoods>>(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wisdGoodsTypePage);
+    public Result<IPage<WisdGoods>> list(String name, Integer isProfits, Integer isDiscount, int page, int num) {
+        IPage<WisdGoods> wisdGoodsTypePage = goodsService.selectPage(name, isProfits, isDiscount, page, num);
+        return new Result<IPage<WisdGoods>>(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wisdGoodsTypePage);
     }
 
     @GetMapping(value = "/contractlist")
     @ResponseBody
-    public Result<IPage<WisdGoods>> contractlist(String name,Long contractId,Long companyId,int page, int num){
-        IPage<WisdGoods> wisdGoodsTypePage = goodsService.contractlist(name,contractId,companyId,page, num);
-        return new Result<IPage<WisdGoods>>(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wisdGoodsTypePage);
+    public Result<IPage<WisdGoods>> contractlist(String name, Long contractId, Long companyId, int page, int num) {
+        IPage<WisdGoods> wisdGoodsTypePage = goodsService.contractlist(name, contractId, companyId, page, num);
+        return new Result<IPage<WisdGoods>>(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wisdGoodsTypePage);
     }
 
     @GetMapping(value = "/contractseelist")
     @ResponseBody
-    public Result<IPage<WisdGoods>> contractseelist(String name,Long contractId,int page, int num){
-        IPage<WisdGoods> wisdGoodsTypePage = goodsService.contractseelist(name,contractId,page, num);
-        return new Result<IPage<WisdGoods>>(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wisdGoodsTypePage);
+    public Result<IPage<WisdGoods>> contractseelist(String name, Long contractId, int page, int num) {
+        IPage<WisdGoods> wisdGoodsTypePage = goodsService.contractseelist(name, contractId, page, num);
+        return new Result<IPage<WisdGoods>>(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wisdGoodsTypePage);
     }
 
     @GetMapping(value = "/integrallist")
     @ResponseBody
-    public Result<IPage<WisdGoods>> integrallist(String name,int page, int num){
-        IPage<WisdGoods> wisdGoodsTypePage = goodsService.selectintegrallistPage(name,page, num);
-        return new Result<IPage<WisdGoods>>(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wisdGoodsTypePage);
+    public Result<IPage<WisdGoods>> integrallist(String name, int page, int num) {
+        IPage<WisdGoods> wisdGoodsTypePage = goodsService.selectintegrallistPage(name, page, num);
+        return new Result<IPage<WisdGoods>>(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wisdGoodsTypePage);
     }
 
     @GetMapping(value = "seasonalladdGoods")
-    public String addGoods(){
+    public String addGoods() {
         return "pages/goods/seasonall_addGoods";
     }
 
     @GetMapping(value = "/seasonallist")
     @ResponseBody
-    public Result<IPage<WisdGoods>> seasonallist(String name,int page, int num){
-        IPage<WisdGoods> wisdGoodsTypePage = goodsService.selectseasonallistPage(name,page, num);
-        return new Result<IPage<WisdGoods>>(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wisdGoodsTypePage);
+    public Result<IPage<WisdGoods>> seasonallist(String name, int page, int num) {
+        IPage<WisdGoods> wisdGoodsTypePage = goodsService.selectseasonallistPage(name, page, num);
+        return new Result<IPage<WisdGoods>>(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wisdGoodsTypePage);
     }
 
     @GetMapping(value = "/seasonallists")
     @ResponseBody
-    public Result<IPage<WisdGoods>> seasonallists(String name,int page, int num){
-        IPage<WisdGoods> wisdGoodsTypePage = goodsService.selectseasonallistPages(name,page, num);
-        return new Result<IPage<WisdGoods>>(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wisdGoodsTypePage);
+    public Result<IPage<WisdGoods>> seasonallists(String name, int page, int num) {
+        IPage<WisdGoods> wisdGoodsTypePage = goodsService.selectseasonallistPages(name, page, num);
+        return new Result<IPage<WisdGoods>>(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wisdGoodsTypePage);
     }
 
     @PostMapping(value = "seasonalSaveGoods")
     @ResponseBody
-    public Result seasonalSaveGoods(String ids,Integer type) {
+    public Result seasonalSaveGoods(String ids, Integer type) {
         if (!StringUtils.isEmpty(ids)) {
             JSONArray idArray = JSON.parseArray(ids);
             List<Long> idList = new ArrayList<>();
@@ -138,20 +140,20 @@ GoodsController {
                 }
             }
             System.out.println(idList);
-            Boolean flag=false;
-            for (int i=0;i<idList.size();i++){
+            Boolean flag = false;
+            for (int i = 0; i < idList.size(); i++) {
                 UpdateWrapper<WisdGoods> queryWrapper = new UpdateWrapper<>();
-                queryWrapper.eq("id",idList.get(i));
-                queryWrapper.set("is_seasonal",type);
-                flag=goodsService.update(queryWrapper);
-                if (!flag){
+                queryWrapper.eq("id", idList.get(i));
+                queryWrapper.set("is_seasonal", type);
+                flag = goodsService.update(queryWrapper);
+                if (!flag) {
                     break;
                 }
             }
-            if(flag){
-                return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG);
-            }else {
-                return new Result(ResultUtil.ERROR,ResultUtil.ERROR_MSG);
+            if (flag) {
+                return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG);
+            } else {
+                return new Result(ResultUtil.ERROR, ResultUtil.ERROR_MSG);
             }
         } else {
             return ResultUtil.error();
@@ -160,28 +162,28 @@ GoodsController {
 
 
     @GetMapping(value = "promotionaddGoods")
-    public String promotionaddGoods(){
+    public String promotionaddGoods() {
         return "pages/goods/promotion_addGoods";
     }
 
     @GetMapping(value = "/promotionlist")
     @ResponseBody
-    public Result<IPage<WisdGoods>> promotionlist(String name,int page, int num){
-        IPage<WisdGoods> wisdGoodsTypePage = goodsService.selectpromotionlistPage(name,page, num);
-        return new Result<IPage<WisdGoods>>(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wisdGoodsTypePage);
+    public Result<IPage<WisdGoods>> promotionlist(String name, int page, int num) {
+        IPage<WisdGoods> wisdGoodsTypePage = goodsService.selectpromotionlistPage(name, page, num);
+        return new Result<IPage<WisdGoods>>(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wisdGoodsTypePage);
     }
 
 
     @GetMapping(value = "/promotionlists")
     @ResponseBody
-    public Result<IPage<WisdGoods>> promotionlists(String name,int page, int num){
-        IPage<WisdGoods> wisdGoodsTypePage = goodsService.selectpromotionlistPages(name,page, num);
-        return new Result<IPage<WisdGoods>>(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wisdGoodsTypePage);
+    public Result<IPage<WisdGoods>> promotionlists(String name, int page, int num) {
+        IPage<WisdGoods> wisdGoodsTypePage = goodsService.selectpromotionlistPages(name, page, num);
+        return new Result<IPage<WisdGoods>>(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wisdGoodsTypePage);
     }
 
     @PostMapping(value = "promotionSaveGoods")
     @ResponseBody
-    public Result promotionSaveGoods(String ids,Integer type) {
+    public Result promotionSaveGoods(String ids, Integer type) {
         if (!StringUtils.isEmpty(ids)) {
             JSONArray idArray = JSON.parseArray(ids);
             List<Long> idList = new ArrayList<>();
@@ -192,21 +194,21 @@ GoodsController {
                 }
             }
             System.out.println(idList);
-            Boolean flag=false;
-            for (int i=0;i<idList.size();i++){
+            Boolean flag = false;
+            for (int i = 0; i < idList.size(); i++) {
                 UpdateWrapper<WisdGoods> queryWrapper = new UpdateWrapper<>();
-                queryWrapper.eq("id",idList.get(i));
-                queryWrapper.set("is_promotion",type);
-                queryWrapper.set("is_home_promotion",0);
-                flag=goodsService.update(queryWrapper);
-                if (!flag){
+                queryWrapper.eq("id", idList.get(i));
+                queryWrapper.set("is_promotion", type);
+                queryWrapper.set("is_home_promotion", 0);
+                flag = goodsService.update(queryWrapper);
+                if (!flag) {
                     break;
                 }
             }
-            if(flag){
-                return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG);
-            }else {
-                return new Result(ResultUtil.ERROR,ResultUtil.ERROR_MSG);
+            if (flag) {
+                return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG);
+            } else {
+                return new Result(ResultUtil.ERROR, ResultUtil.ERROR_MSG);
             }
         } else {
             return ResultUtil.error();
@@ -214,65 +216,65 @@ GoodsController {
     }
 
     @GetMapping(value = "promotionedit")
-    public String promotionedit(Model model, Long id){
-        if (id!=null){
+    public String promotionedit(Model model, Long id) {
+        if (id != null) {
             WisdGoods wisdGoods = goodsService.getById(id);
-            model.addAttribute("obj",wisdGoods);
+            model.addAttribute("obj", wisdGoods);
             QueryWrapper<WisdGoodsSpec> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("goods_id",id);
-            List<WisdGoodsSpec> wisdGoodsSpecList=goodsSpecService.list(queryWrapper);
-            model.addAttribute("wisdGoodsSpecList",wisdGoodsSpecList);
+            queryWrapper.eq("goods_id", id);
+            List<WisdGoodsSpec> wisdGoodsSpecList = goodsSpecService.list(queryWrapper);
+            model.addAttribute("wisdGoodsSpecList", wisdGoodsSpecList);
         }
         return "pages/goods/goodspromotion_edit";
     }
 
     @PostMapping(value = "promotionsave")
     @ResponseBody
-    public Result promotionsave(WisdGoods wisdGoods){
+    public Result promotionsave(WisdGoods wisdGoods) {
         try {
             return goodsService.promotionsave(wisdGoods);
-        }catch (RuntimeException e){
-            return new Result(ResultUtil.ERROR,"请添加完整的商品规格");
+        } catch (RuntimeException e) {
+            return new Result(ResultUtil.ERROR, "请添加完整的商品规格");
         }
 
     }
 
     @GetMapping(value = "profitslistGoods")
-    public String profitslistGoods(){
+    public String profitslistGoods() {
         return "pages/goods/goodsprofits_list";
     }
 
     @GetMapping(value = "/profitslist")
     @ResponseBody
-    public Result<IPage<WisdGoods>> profitslist(String name,int page, int num){
-        IPage<WisdGoods> wisdGoodsTypePage = goodsService.selectprofitslistPage(name,page, num);
-        return new Result<IPage<WisdGoods>>(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wisdGoodsTypePage);
+    public Result<IPage<WisdGoods>> profitslist(String name, int page, int num) {
+        IPage<WisdGoods> wisdGoodsTypePage = goodsService.selectprofitslistPage(name, page, num);
+        return new Result<IPage<WisdGoods>>(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wisdGoodsTypePage);
     }
 
     @GetMapping(value = "/classifylist")
     @ResponseBody
-    public Result<IPage<WisdGoods>> classifylist(String name,int page, int num){
-        IPage<WisdGoods> wisdGoodsTypePage = goodsService.selectclassifylistlistPage(name,page, num);
-        return new Result<IPage<WisdGoods>>(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wisdGoodsTypePage);
+    public Result<IPage<WisdGoods>> classifylist(String name, int page, int num) {
+        IPage<WisdGoods> wisdGoodsTypePage = goodsService.selectclassifylistlistPage(name, page, num);
+        return new Result<IPage<WisdGoods>>(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wisdGoodsTypePage);
     }
 
     @GetMapping(value = "/getclassify")
     @ResponseBody
-    public Result getclassify(Long id){
+    public Result getclassify(Long id) {
         List<SelectVo> wisdGoodsType = goodsService.selectclassifylist(id);
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wisdGoodsType);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wisdGoodsType);
     }
 
 
     @GetMapping(value = "integraledit")
-    public String integral(Model model, Long id){
-        if (id!=null){
+    public String integral(Model model, Long id) {
+        if (id != null) {
             WisdGoods wisdGoods = goodsService.getById(id);
-            model.addAttribute("obj",wisdGoods);
+            model.addAttribute("obj", wisdGoods);
             QueryWrapper<WisdGoodsSpec> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("goods_id",id);
-            List<WisdGoodsSpec> wisdGoodsSpecList=goodsSpecService.list(queryWrapper);
-            model.addAttribute("wisdGoodsSpecList",wisdGoodsSpecList);
+            queryWrapper.eq("goods_id", id);
+            List<WisdGoodsSpec> wisdGoodsSpecList = goodsSpecService.list(queryWrapper);
+            model.addAttribute("wisdGoodsSpecList", wisdGoodsSpecList);
 
             WisdGoodsType wisdGoodsThreeType = goodsTypeService.getById(wisdGoods.getGoodsTypeId());
             model.addAttribute("wisdGoodsThreeType", wisdGoodsThreeType);
@@ -302,20 +304,20 @@ GoodsController {
             List<WisdGoodsType> wisdGoodsThreeTypeList = goodsTypeService.list(queryWrapper5);
             model.addAttribute("wisdGoodsThreeTypeList", wisdGoodsThreeTypeList);
         }
-        List<WisdGoodsType> wisdGoodsTypeList=goodsTypeService.list();
-        model.addAttribute("wisdGoodsTypeList",wisdGoodsTypeList);
+        List<WisdGoodsType> wisdGoodsTypeList = goodsTypeService.list();
+        model.addAttribute("wisdGoodsTypeList", wisdGoodsTypeList);
         return "pages/goods/goodsintegral_edit";
     }
 
     @GetMapping(value = "seasonaledit")
-    public String seasonaledit(Model model, Long id){
-        if (id!=null){
+    public String seasonaledit(Model model, Long id) {
+        if (id != null) {
             WisdGoods wisdGoods = goodsService.getById(id);
-            model.addAttribute("obj",wisdGoods);
+            model.addAttribute("obj", wisdGoods);
             QueryWrapper<WisdGoodsSpec> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("goods_id",id);
-            List<WisdGoodsSpec> wisdGoodsSpecList=goodsSpecService.list(queryWrapper);
-            model.addAttribute("wisdGoodsSpecList",wisdGoodsSpecList);
+            queryWrapper.eq("goods_id", id);
+            List<WisdGoodsSpec> wisdGoodsSpecList = goodsSpecService.list(queryWrapper);
+            model.addAttribute("wisdGoodsSpecList", wisdGoodsSpecList);
 
             WisdGoodsType wisdGoodsThreeType = goodsTypeService.getById(wisdGoods.getGoodsTypeId());
             model.addAttribute("wisdGoodsThreeType", wisdGoodsThreeType);
@@ -345,35 +347,35 @@ GoodsController {
             List<WisdGoodsType> wisdGoodsThreeTypeList = goodsTypeService.list(queryWrapper5);
             model.addAttribute("wisdGoodsThreeTypeList", wisdGoodsThreeTypeList);
         }
-        List<WisdGoodsType> wisdGoodsTypeList=goodsTypeService.list();
-        model.addAttribute("wisdGoodsTypeList",wisdGoodsTypeList);
+        List<WisdGoodsType> wisdGoodsTypeList = goodsTypeService.list();
+        model.addAttribute("wisdGoodsTypeList", wisdGoodsTypeList);
         return "pages/goods/goodsseasonal_edit";
     }
 
     @GetMapping(value = "classifyedit")
-    public String classifyedit(Model model, Long id){
-        if (id!=null){
+    public String classifyedit(Model model, Long id) {
+        if (id != null) {
             WisdGoods wisdGoods = goodsService.getById(id);
-            model.addAttribute("obj",wisdGoods);
+            model.addAttribute("obj", wisdGoods);
             QueryWrapper<WisdGoodsSpec> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("goods_id",id);
-            List<WisdGoodsSpec> wisdGoodsSpecList=goodsSpecService.list(queryWrapper);
-            model.addAttribute("wisdGoodsSpecList",wisdGoodsSpecList);
+            queryWrapper.eq("goods_id", id);
+            List<WisdGoodsSpec> wisdGoodsSpecList = goodsSpecService.list(queryWrapper);
+            model.addAttribute("wisdGoodsSpecList", wisdGoodsSpecList);
         }
-        List<WisdGoodsType> wisdGoodsTypeList=goodsTypeService.list();
-        model.addAttribute("wisdGoodsTypeList",wisdGoodsTypeList);
+        List<WisdGoodsType> wisdGoodsTypeList = goodsTypeService.list();
+        model.addAttribute("wisdGoodsTypeList", wisdGoodsTypeList);
         return "pages/goods/goodsclassify_edit";
     }
 
     @GetMapping(value = "edit")
-    public String edit(Model model, Long id){
-        if (id!=null){
+    public String edit(Model model, Long id) {
+        if (id != null) {
             WisdGoods wisdGoods = goodsService.getById(id);
-            model.addAttribute("obj",wisdGoods);
+            model.addAttribute("obj", wisdGoods);
             QueryWrapper<WisdGoodsSpec> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("goods_id",id);
-            List<WisdGoodsSpec> wisdGoodsSpecList=goodsSpecService.list(queryWrapper);
-            model.addAttribute("wisdGoodsSpecList",wisdGoodsSpecList);
+            queryWrapper.eq("goods_id", id);
+            List<WisdGoodsSpec> wisdGoodsSpecList = goodsSpecService.list(queryWrapper);
+            model.addAttribute("wisdGoodsSpecList", wisdGoodsSpecList);
 
             WisdGoodsType wisdGoodsThreeType = goodsTypeService.getById(wisdGoods.getGoodsTypeId());
             model.addAttribute("wisdGoodsThreeType", wisdGoodsThreeType);
@@ -403,16 +405,16 @@ GoodsController {
             List<WisdGoodsType> wisdGoodsThreeTypeList = goodsTypeService.list(queryWrapper5);
             model.addAttribute("wisdGoodsThreeTypeList", wisdGoodsThreeTypeList);
         }
-        List<WisdGoodsType> wisdGoodsTypeList=goodsTypeService.list();
-        model.addAttribute("wisdGoodsTypeList",wisdGoodsTypeList);
+        List<WisdGoodsType> wisdGoodsTypeList = goodsTypeService.list();
+        model.addAttribute("wisdGoodsTypeList", wisdGoodsTypeList);
         return "pages/goods/goods_edit";
     }
 
     @PostMapping(value = "save")
     @ResponseBody
-    public Result save(WisdGoods wisdGoods){
+    public Result save(WisdGoods wisdGoods) {
         try {
-            if (wisdGoods.getGoodsTypeId()==null && wisdGoods.getGoodsClassify()!=1 && wisdGoods.getGoodsClassify()!=2){
+            if (wisdGoods.getGoodsTypeId() == null && wisdGoods.getGoodsClassify() != 1 && wisdGoods.getGoodsClassify() != 2) {
                 return ResultUtil.error("请选择商品类别");
             }
 //            if(wisdGoods.getId()==null){
@@ -422,15 +424,15 @@ GoodsController {
 //                }
 //            }
             return goodsService.add(wisdGoods);
-        }catch (RuntimeException e){
-            return new Result(ResultUtil.ERROR,"请添加完整的商品规格");
+        } catch (RuntimeException e) {
+            return new Result(ResultUtil.ERROR, "请添加完整的商品规格");
         }
 
     }
 
     @PostMapping(value = "delete")
     @ResponseBody
-    public Result deleteByIds(String ids,Integer type) {
+    public Result deleteByIds(String ids, Integer type) {
         if (!StringUtils.isEmpty(ids)) {
             JSONArray idArray = JSON.parseArray(ids);
             List<Long> idList = new ArrayList<>();
@@ -441,7 +443,7 @@ GoodsController {
                 }
             }
             if (idList.size() > 0) {
-                return goodsService.deleteByIds(idList,type);
+                return goodsService.deleteByIds(idList, type);
             } else {
                 return ResultUtil.error();
             }
@@ -464,14 +466,14 @@ GoodsController {
                 }
             }
             if (idList.size() > 0) {
-                for (Long id:idList) {
+                for (Long id : idList) {
                     UpdateWrapper updateWrapper = new UpdateWrapper();
                     updateWrapper.eq("id", id);
-                    updateWrapper.set("status",1);
+                    updateWrapper.set("status", 1);
                     goodsService.update(updateWrapper);
                 }
                 try {
-                    for (Long id:idList) {
+                    for (Long id : idList) {
                         SolrQuery solrQuery = new SolrQuery();
                         String str = "goodsId:" + id;
                         solrQuery.setQuery(str);
@@ -481,7 +483,7 @@ GoodsController {
                             solrClient.deleteByQuery(str);
                         }
                         SolrInputDocument document = new SolrInputDocument();
-                        WisdGoods wisdGoods=goodsService.getById(id);
+                        WisdGoods wisdGoods = goodsService.getById(id);
                         document.setField("goodsId", wisdGoods.getId());
                         document.setField("goodsName", wisdGoods.getGoodsName());
                         solrClient.add(document);
@@ -514,10 +516,10 @@ GoodsController {
                 }
             }
             if (idList.size() > 0) {
-                for (Long id:idList) {
+                for (Long id : idList) {
                     UpdateWrapper updateWrapper = new UpdateWrapper();
                     updateWrapper.eq("id", id);
-                    updateWrapper.set("is_profits",1);
+                    updateWrapper.set("is_profits", 1);
                     goodsService.update(updateWrapper);
                 }
                 return ResultUtil.success();
@@ -542,14 +544,14 @@ GoodsController {
                 }
             }
             if (idList.size() > 0) {
-                for (Long id:idList) {
+                for (Long id : idList) {
                     UpdateWrapper updateWrapper = new UpdateWrapper();
                     updateWrapper.eq("id", id);
-                    updateWrapper.set("status",0);
+                    updateWrapper.set("status", 0);
                     goodsService.update(updateWrapper);
                 }
                 try {
-                    for (Long id:idList) {
+                    for (Long id : idList) {
                         SolrQuery solrQuery = new SolrQuery();
                         String str = "goodsId:" + id;
                         solrQuery.setQuery(str);
@@ -575,30 +577,30 @@ GoodsController {
     }
 
     @GetMapping(value = "stock")
-    public String stock(Model model,String ids){
-        model.addAttribute("ids",ids);
+    public String stock(Model model, String ids) {
+        model.addAttribute("ids", ids);
         return "pages/goods/goods_stock";
     }
 
     @GetMapping(value = "promotionNum")
-    public String promotionNum(Model model,String ids){
-        model.addAttribute("ids",ids);
+    public String promotionNum(Model model, String ids) {
+        model.addAttribute("ids", ids);
         return "pages/goods/goods_promotionNum";
     }
 
     @GetMapping(value = "profits")
-    public String profits(Model model,String ids){
-        model.addAttribute("ids",ids);
+    public String profits(Model model, String ids) {
+        model.addAttribute("ids", ids);
         return "pages/goods/goods_profits";
     }
 
     @PostMapping(value = "updateProfits")
     @ResponseBody
-    public Result updateProfits(String ids,Double oneProfits,Double twoProfits) {
+    public Result updateProfits(String ids, Double oneProfits, Double twoProfits) {
         if (!StringUtils.isEmpty(ids)) {
-            String[] idList=ids.split(",");
-            for (int i=0;i<idList.length;i++) {
-                WisdGoods wisdGoods=goodsService.getById(idList[i]);
+            String[] idList = ids.split(",");
+            for (int i = 0; i < idList.length; i++) {
+                WisdGoods wisdGoods = goodsService.getById(idList[i]);
                 wisdGoods.setOneProfits(oneProfits);
                 wisdGoods.setTwoProfits(twoProfits);
                 goodsService.updateById(wisdGoods);
@@ -611,17 +613,17 @@ GoodsController {
 
     @PostMapping(value = "updateStock")
     @ResponseBody
-    public Result updateStock(String ids,Integer stockNum) {
+    public Result updateStock(String ids, Integer stockNum) {
         if (!StringUtils.isEmpty(ids)) {
-            String[] idList=ids.split(",");
-            for (int i=0;i<idList.length;i++) {
+            String[] idList = ids.split(",");
+            for (int i = 0; i < idList.length; i++) {
                 QueryWrapper<WisdGoodsSpec> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("goods_id",idList[i]);
-                List<WisdGoodsSpec> wisdGoodsSpecList=goodsSpecService.list(queryWrapper);
-                for (WisdGoodsSpec wisdGoodsSpec:wisdGoodsSpecList){
-                    if (wisdGoodsSpec.getSpecStock()+stockNum<0){
+                queryWrapper.eq("goods_id", idList[i]);
+                List<WisdGoodsSpec> wisdGoodsSpecList = goodsSpecService.list(queryWrapper);
+                for (WisdGoodsSpec wisdGoodsSpec : wisdGoodsSpecList) {
+                    if (wisdGoodsSpec.getSpecStock() + stockNum < 0) {
                         wisdGoodsSpec.setSpecStock(0);
-                    }else {
+                    } else {
                         wisdGoodsSpec.setSpecStock(wisdGoodsSpec.getSpecStock() + stockNum);
                     }
                 }
@@ -635,14 +637,14 @@ GoodsController {
 
     @PostMapping(value = "updatePromotionNum")
     @ResponseBody
-    public Result updatePromotionNum(String ids,Integer promotionNum) {
+    public Result updatePromotionNum(String ids, Integer promotionNum) {
         if (!StringUtils.isEmpty(ids)) {
-            String[] idList=ids.split(",");
-            for (int i=0;i<idList.length;i++) {
-                UpdateWrapper wrapper=new UpdateWrapper();
-                wrapper.eq("id",idList[i]);
-                wrapper.set("promotion_num",promotionNum);
-                Boolean flag=goodsService.update(wrapper);
+            String[] idList = ids.split(",");
+            for (int i = 0; i < idList.length; i++) {
+                UpdateWrapper wrapper = new UpdateWrapper();
+                wrapper.eq("id", idList[i]);
+                wrapper.set("promotion_num", promotionNum);
+                Boolean flag = goodsService.update(wrapper);
             }
             return ResultUtil.success();
         } else {
@@ -652,12 +654,12 @@ GoodsController {
 
     @PostMapping(value = "updateSort")
     @ResponseBody
-    public Result updateSort(String id,Integer goodsSort) {
-        if (!StringUtils.isEmpty(id) ) {
-            UpdateWrapper wrapper=new UpdateWrapper();
-            wrapper.eq("id",id);
-            wrapper.set("goods_sort",goodsSort);
-            Boolean flag=goodsService.update(wrapper);
+    public Result updateSort(String id, Integer goodsSort) {
+        if (!StringUtils.isEmpty(id)) {
+            UpdateWrapper wrapper = new UpdateWrapper();
+            wrapper.eq("id", id);
+            wrapper.set("goods_sort", goodsSort);
+            Boolean flag = goodsService.update(wrapper);
             if (flag) {
                 return ResultUtil.success();
             } else {
@@ -670,9 +672,9 @@ GoodsController {
 
     @PostMapping(value = "addHome")
     @ResponseBody
-    public Result addHome(String id,Integer state) {
-        if (!StringUtils.isEmpty(id) ) {
-            if (state==1) {
+    public Result addHome(String id, Integer state) {
+        if (!StringUtils.isEmpty(id)) {
+            if (state == 1) {
                 QueryWrapper<WisdGoods> queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("is_home_promotion", 1);
                 queryWrapper.eq("is_promotion", 1);
@@ -681,10 +683,10 @@ GoodsController {
                     return new Result(ResultUtil.ERROR, "只能添加三个");
                 }
             }
-            UpdateWrapper wrapper=new UpdateWrapper();
-            wrapper.eq("id",id);
-            wrapper.set("is_home_promotion",state);
-            Boolean flag=goodsService.update(wrapper);
+            UpdateWrapper wrapper = new UpdateWrapper();
+            wrapper.eq("id", id);
+            wrapper.set("is_home_promotion", state);
+            Boolean flag = goodsService.update(wrapper);
             if (flag) {
                 return ResultUtil.success();
             } else {
@@ -697,12 +699,12 @@ GoodsController {
 
     @PostMapping(value = "addHomeProfits")
     @ResponseBody
-    public Result addHomeProfits(String id,Integer state) {
-        if (!StringUtils.isEmpty(id) ) {
-            UpdateWrapper wrapper=new UpdateWrapper();
-            wrapper.eq("id",id);
-            wrapper.set("is_home_profits",state);
-            Boolean flag=goodsService.update(wrapper);
+    public Result addHomeProfits(String id, Integer state) {
+        if (!StringUtils.isEmpty(id)) {
+            UpdateWrapper wrapper = new UpdateWrapper();
+            wrapper.eq("id", id);
+            wrapper.set("is_home_profits", state);
+            Boolean flag = goodsService.update(wrapper);
             if (flag) {
                 return ResultUtil.success();
             } else {
diff --git a/src/main/java/com/wisdo/mmining/controller/GoodsTypeController.java b/src/main/java/com/wisdo/mmining/controller/GoodsTypeController.java
index 13e4d15..aa533e2 100644
--- a/src/main/java/com/wisdo/mmining/controller/GoodsTypeController.java
+++ b/src/main/java/com/wisdo/mmining/controller/GoodsTypeController.java
@@ -1,23 +1,18 @@
 package com.wisdo.mmining.controller;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.wisdo.mmining.entity.WisdGoodsType;
-import com.wisdo.mmining.log.OperLog;
 import com.wisdo.mmining.result.Result;
 import com.wisdo.mmining.result.ResultUtil;
 import com.wisdo.mmining.service.GoodsTypeService;
-import com.wisdo.mmining.util.Md5Util;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-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.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -33,52 +28,52 @@ public class GoodsTypeController {
     private GoodsTypeService goodsTypeService;
 
     @GetMapping(value = "")
-    public String page(){
+    public String page() {
         return "pages/goods/goodstype_list";
     }
 
     @GetMapping(value = "list")
     @ResponseBody
-    public Result list(){
-        QueryWrapper<WisdGoodsType> queryWrapper=new QueryWrapper<>();
+    public Result list() {
+        QueryWrapper<WisdGoodsType> queryWrapper = new QueryWrapper<>();
         queryWrapper.orderByAsc("type_sort");
         List<WisdGoodsType> wisdGoodsTypePage = goodsTypeService.list(queryWrapper);
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wisdGoodsTypePage);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wisdGoodsTypePage);
     }
 
     @GetMapping(value = "onelist")
     @ResponseBody
-    public Result onelist(){
+    public Result onelist() {
         QueryWrapper<WisdGoodsType> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("type_level",1);
-        List<WisdGoodsType> wisdGoodsOneTypeList=goodsTypeService.list(queryWrapper);
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wisdGoodsOneTypeList);
+        queryWrapper.eq("type_level", 1);
+        List<WisdGoodsType> wisdGoodsOneTypeList = goodsTypeService.list(queryWrapper);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wisdGoodsOneTypeList);
     }
 
     @GetMapping(value = "twolist")
     @ResponseBody
-    public Result twolist(Long oneId){
+    public Result twolist(Long oneId) {
         QueryWrapper<WisdGoodsType> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("pid",oneId);
-        List<WisdGoodsType> wisdGoodsTwoTypeList=goodsTypeService.list(queryWrapper);
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wisdGoodsTwoTypeList);
+        queryWrapper.eq("pid", oneId);
+        List<WisdGoodsType> wisdGoodsTwoTypeList = goodsTypeService.list(queryWrapper);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wisdGoodsTwoTypeList);
     }
 
     @GetMapping(value = "threelist")
     @ResponseBody
-    public Result threelist(Long twoId){
+    public Result threelist(Long twoId) {
         QueryWrapper<WisdGoodsType> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("pid",twoId);
-        List<WisdGoodsType> wisdGoodsThreeTypeList=goodsTypeService.list(queryWrapper);
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wisdGoodsThreeTypeList);
+        queryWrapper.eq("pid", twoId);
+        List<WisdGoodsType> wisdGoodsThreeTypeList = goodsTypeService.list(queryWrapper);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wisdGoodsThreeTypeList);
     }
 
     @GetMapping(value = "edit")
-    public String edit(Model model, Long id){
-        if (id!=null){
+    public String edit(Model model, Long id) {
+        if (id != null) {
             WisdGoodsType wisdGoodsType = goodsTypeService.getById(id);
-            model.addAttribute("obj",wisdGoodsType);
-            if (wisdGoodsType.getTypeLevel()==3) {
+            model.addAttribute("obj", wisdGoodsType);
+            if (wisdGoodsType.getTypeLevel() == 3) {
                 QueryWrapper<WisdGoodsType> queryWrapper1 = new QueryWrapper<>();
                 queryWrapper1.eq("id", wisdGoodsType.getPid());
                 WisdGoodsType wisdGoodsTwoType = goodsTypeService.getOne(queryWrapper1);
@@ -95,7 +90,7 @@ public class GoodsTypeController {
                 queryWrapper.eq("type_level", 1);
                 List<WisdGoodsType> wisdGoodsOneTypeList = goodsTypeService.list(queryWrapper);
                 model.addAttribute("wisdGoodsOneTypeList", wisdGoodsOneTypeList);
-            }else if (wisdGoodsType.getTypeLevel()==2){
+            } else if (wisdGoodsType.getTypeLevel() == 2) {
                 QueryWrapper<WisdGoodsType> queryWrapper2 = new QueryWrapper<>();
                 queryWrapper2.eq("id", wisdGoodsType.getPid());
                 WisdGoodsType wisdGoodsOneType = goodsTypeService.getOne(queryWrapper2);
@@ -120,55 +115,55 @@ public class GoodsTypeController {
 
     @PostMapping(value = "save")
     @ResponseBody
-    public Result save(WisdGoodsType wisdGoodsType){
+    public Result save(WisdGoodsType wisdGoodsType) {
         boolean flag = false;
-        if(wisdGoodsType.getId()==null){
+        if (wisdGoodsType.getId() == null) {
 //            WisdGoodsType wisdGoodsType1 = goodsTypeService.getByName(wisdGoodsType.getTypeName());
 //            if(wisdGoodsType1!=null){
 //                return ResultUtil.error("已存在");
 //            }
-            if (wisdGoodsType.getTypeLevel()==3){
+            if (wisdGoodsType.getTypeLevel() == 3) {
                 wisdGoodsType.setPid(wisdGoodsType.getTwoTypeId());
-            }else if (wisdGoodsType.getTypeLevel()==2){
-                if (wisdGoodsType.getIsRecommended()==1) {
+            } else if (wisdGoodsType.getTypeLevel() == 2) {
+                if (wisdGoodsType.getIsRecommended() == 1) {
                     QueryWrapper<WisdGoodsType> queryWrapper = new QueryWrapper<>();
                     queryWrapper.eq("type_level", 2);
                     queryWrapper.eq("is_recommended", 1);
                     Integer count = goodsTypeService.count(queryWrapper);
-                    if (count>=7){
+                    if (count >= 7) {
                         return ResultUtil.error("只能推荐7个");
                     }
                 }
                 wisdGoodsType.setPid(wisdGoodsType.getOneTypeId());
-            }else {
+            } else {
                 wisdGoodsType.setPid(0L);
             }
             flag = goodsTypeService.save(wisdGoodsType);
-        }else{
-           // WisdGoodsType wisdGoodsType1 = goodsTypeService.getByName(wisdGoodsType.getTypeName());
+        } else {
+            // WisdGoodsType wisdGoodsType1 = goodsTypeService.getByName(wisdGoodsType.getTypeName());
 //            if(wisdGoodsType1!=null && !wisdGoodsType.getId().equals(wisdGoodsType1.getId())){
 //                return ResultUtil.error("已存在");
 //            }
-            if (wisdGoodsType.getTypeLevel()==3){
+            if (wisdGoodsType.getTypeLevel() == 3) {
                 wisdGoodsType.setPid(wisdGoodsType.getTwoTypeId());
-            }else if (wisdGoodsType.getTypeLevel()==2){
-                if (wisdGoodsType.getIsRecommended()==1) {
+            } else if (wisdGoodsType.getTypeLevel() == 2) {
+                if (wisdGoodsType.getIsRecommended() == 1) {
                     QueryWrapper<WisdGoodsType> queryWrapper = new QueryWrapper<>();
                     queryWrapper.eq("type_level", 2);
                     queryWrapper.eq("is_recommended", 1);
                     Integer count = goodsTypeService.count(queryWrapper);
-                    if (count>=7){
+                    if (count >= 7) {
                         return ResultUtil.error("只能推荐7个");
                     }
                 }
                 wisdGoodsType.setPid(wisdGoodsType.getOneTypeId());
-            }else {
+            } else {
                 wisdGoodsType.setPid(0L);
             }
             flag = goodsTypeService.updateById(wisdGoodsType);
         }
-        if(flag){
-            return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG);
+        if (flag) {
+            return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG);
         }
         return ResultUtil.error();
     }
diff --git a/src/main/java/com/wisdo/mmining/controller/IntegralRolesController.java b/src/main/java/com/wisdo/mmining/controller/IntegralRolesController.java
index 6198021..dc21a99 100644
--- a/src/main/java/com/wisdo/mmining/controller/IntegralRolesController.java
+++ b/src/main/java/com/wisdo/mmining/controller/IntegralRolesController.java
@@ -1,6 +1,5 @@
 package com.wisdo.mmining.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.wisdo.mmining.entity.WisdIntegrlRoles;
 import com.wisdo.mmining.result.Result;
 import com.wisdo.mmining.result.ResultUtil;
@@ -13,8 +12,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.util.List;
-
 /**
  * @Auther: cg
  * @Date: 2020/10/14 10:52
@@ -28,21 +25,21 @@ public class IntegralRolesController {
     private IntegralRolesService integralRolesService;
 
     @GetMapping(value = "")
-    public String edit(Model model){
+    public String edit(Model model) {
         WisdIntegrlRoles wisdIntegrlRoles = integralRolesService.getById(1);
-        model.addAttribute("obj",wisdIntegrlRoles);
+        model.addAttribute("obj", wisdIntegrlRoles);
         return "pages/integralroles/integralroles_edit";
     }
 
     @PostMapping(value = "save")
     @ResponseBody
-    public Result save( WisdIntegrlRoles wisdIntegrlRoles){
+    public Result save(WisdIntegrlRoles wisdIntegrlRoles) {
 //        WisdIntegrlRoles wisdIntegrlRoles=new WisdIntegrlRoles();
 //        wisdIntegrlRoles.setRolesContent(rolesContent);
 //        wisdIntegrlRoles.setId(1L);
         boolean flag = integralRolesService.updateById(wisdIntegrlRoles);
-        if(flag){
-            return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG);
+        if (flag) {
+            return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG);
         }
         return ResultUtil.error();
     }
diff --git a/src/main/java/com/wisdo/mmining/controller/JoinController.java b/src/main/java/com/wisdo/mmining/controller/JoinController.java
index 0dd0518..58f82fd 100644
--- a/src/main/java/com/wisdo/mmining/controller/JoinController.java
+++ b/src/main/java/com/wisdo/mmining/controller/JoinController.java
@@ -2,7 +2,6 @@ package com.wisdo.mmining.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.wisdo.mmining.entity.WisdJoin;
 import com.wisdo.mmining.result.Result;
@@ -33,23 +32,23 @@ public class JoinController {
     private JoinService joinService;
 
     @GetMapping(value = "")
-    public String page(){
+    public String page() {
         return "pages/join/join_list";
     }
 
     @GetMapping(value = "/list")
     @ResponseBody
-    public Result<IPage<WisdJoin>> list(String userName,String userPhone,int page, int num){
-        IPage<WisdJoin> wisdCompanyIPage = joinService.selectPage(userName,userPhone,page, num);
-        return new Result<IPage<WisdJoin>>(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wisdCompanyIPage);
+    public Result<IPage<WisdJoin>> list(String userName, String userPhone, int page, int num) {
+        IPage<WisdJoin> wisdCompanyIPage = joinService.selectPage(userName, userPhone, page, num);
+        return new Result<IPage<WisdJoin>>(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wisdCompanyIPage);
     }
 
 
     @GetMapping(value = "edit")
-    public String edit(Model model, Long id){
-        if (id!=null){
+    public String edit(Model model, Long id) {
+        if (id != null) {
             WisdJoin wisdJoin = joinService.getById(id);
-            model.addAttribute("obj",wisdJoin);
+            model.addAttribute("obj", wisdJoin);
         }
         return "pages/join/join_edit";
     }
@@ -84,5 +83,4 @@ public class JoinController {
     }
 
 
-
 }
diff --git a/src/main/java/com/wisdo/mmining/controller/OperationLogController.java b/src/main/java/com/wisdo/mmining/controller/OperationLogController.java
index d30d542..d0125d3 100644
--- a/src/main/java/com/wisdo/mmining/controller/OperationLogController.java
+++ b/src/main/java/com/wisdo/mmining/controller/OperationLogController.java
@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author hjw
@@ -29,16 +29,16 @@ public class OperationLogController {
     private OperationLogService tOperationLogService;
 
     @GetMapping(value = "")
-    public String page(){
+    public String page() {
         return "pages/sys/operlog_list";
     }
 
     @GetMapping(value = "table")
     @ResponseBody
-    @OperLog(operModul = "操作记录",operType = "列表查询",operDesc = "列表查询")
-    public Result<Page<OperationLog>> table(int page, int num){
-        Page<OperationLog> p = tOperationLogService.table(page,num);
-        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA,p);
+    @OperLog(operModul = "操作记录", operType = "列表查询", operDesc = "列表查询")
+    public Result<Page<OperationLog>> table(int page, int num) {
+        Page<OperationLog> p = tOperationLogService.table(page, num);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, p);
     }
 
 }
diff --git a/src/main/java/com/wisdo/mmining/controller/OrderController.java b/src/main/java/com/wisdo/mmining/controller/OrderController.java
index 1c3e7e4..355c8c2 100644
--- a/src/main/java/com/wisdo/mmining/controller/OrderController.java
+++ b/src/main/java/com/wisdo/mmining/controller/OrderController.java
@@ -10,7 +10,9 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.wisdo.mmining.api.dto.EditOrderAddressDto;
 import com.wisdo.mmining.controller.dto.ApprovalUpdateAddressDto;
+import com.wisdo.mmining.controller.dto.DeliveryRefundMoneyDto;
 import com.wisdo.mmining.controller.dto.LogisticsDto;
+import com.wisdo.mmining.controller.dto.RefundRemarkesDto;
 import com.wisdo.mmining.entity.*;
 import com.wisdo.mmining.redis.RedisService;
 import com.wisdo.mmining.result.Result;
@@ -189,10 +191,13 @@ public class OrderController {
         if (orderId == null || type == null) {
             return new ModelAndView("sys/error");
         }
+        WisdOeder order = orderService.getById(orderId);
+        String logistics = order.getLogistics();
         //type 1 一级弹出层   2二级弹出层
         ModelAndView modelAndView = new ModelAndView("pages/order/order_refund_logistics");
         modelAndView.addObject("orderId", orderId);
         modelAndView.addObject("type", type);
+        modelAndView.addObject("packages", logistics);
         return modelAndView;
     }
 
@@ -233,23 +238,25 @@ public class OrderController {
         return modelAndView;
     }
 
-    @RequestMapping(value = "deliveryRefundMoney")
+    @PostMapping(value = "deliveryRefundMoney")
     @ResponseBody
-    public Result deliveryRefundMoney(Long orderId, String logisticsName, String logisticsNum) {
-        if (orderId == null || com.alibaba.druid.util.StringUtils.isEmpty(logisticsName) || StringUtils.isEmpty(logisticsNum)) {
+    public Result deliveryRefundMoney(@RequestBody DeliveryRefundMoneyDto deliveryRefundMoneyDto) throws JsonProcessingException {
+        if (deliveryRefundMoneyDto.getOrderId() == null || com.alibaba.druid.util.StringUtils.isEmpty(deliveryRefundMoneyDto.getLogisticsName()) || deliveryRefundMoneyDto.getLogistics() == null) {
             return new Result(ResultUtil.ERROR, "参数为空");
         }
-        WisdOeder order = orderService.getById(orderId);
+        WisdOeder order = orderService.getById(deliveryRefundMoneyDto.getOrderId());
         if (order == null) {
             return new Result(ResultUtil.ERROR, ResultUtil.ERROR_MSG);
         }
         if (!order.getAfterSalesStatus().equals(64)) {
             return new Result(ResultUtil.ERROR, "该状态无法发货");
         }
-        order.setOrderRefundMerchantsName(logisticsName);
-        order.setOrderRefundMerchantsNum(logisticsNum);
-//        TODO:
-        // order.setStatus(65);
+        order.setOrderRefundMerchantsName(deliveryRefundMoneyDto.getLogisticsName());
+        ObjectMapper objectMapper = new ObjectMapper();
+        String logisticsJson = objectMapper.writeValueAsString(deliveryRefundMoneyDto.getLogistics());
+        order.setLogistics(logisticsJson);
+        // TODO: ewqe
+        order.setStatus(3);
         order.setAfterSalesStatus(65);
         order.setOrderRefundMerchantsTime(new Date());
         Boolean flag = orderService.saveOrUpdate(order);
@@ -305,23 +312,23 @@ public class OrderController {
         return modelAndView;
     }
 
-    @RequestMapping(value = "refundRemarkes")
+    @PostMapping(value = "refundRemarkes")
     @ResponseBody
-    public Result refundRemarkes(Long orderId, String orderRefundRemarke, Integer agree) {
-        if (orderId == null || com.alibaba.druid.util.StringUtils.isEmpty(orderRefundRemarke)) {
+    public Result refundRemarkes(@RequestBody RefundRemarkesDto refundRemarkesDto) {
+        if (refundRemarkesDto.getOrderId() == null || com.alibaba.druid.util.StringUtils.isEmpty(refundRemarkesDto.getOrderRefundRemarke())) {
             return new Result(ResultUtil.ERROR, "参数为空");
         }
-        WisdOeder order = orderService.getById(orderId);
+        WisdOeder order = orderService.getById(refundRemarkesDto.getOrderId());
         if (order == null) {
             return new Result(ResultUtil.ERROR, ResultUtil.ERROR_MSG);
         }
         if (!order.getAfterSalesStatus().equals(61) && !order.getAfterSalesStatus().equals(62) && !order.getAfterSalesStatus().equals(64)) {
             return new Result(ResultUtil.ERROR, "该状态无法完成");
         }
-        order.setOrderRefundRemarke(orderRefundRemarke);
+        order.setOrderRefundRemarke(refundRemarkesDto.getOrderRefundRemarke());
         order.setOrderRefundRemarkeTime(new Date());
         WisdIntegrlRoles wisdIntegrlRoles = integralRolesService.getById(1);
-        if (agree == 1) {
+        if (refundRemarkesDto.getAgree() == 1) {
 //            TODO：
             //order.setStatus(63);
             order.setAfterSalesStatus(63);
@@ -330,7 +337,7 @@ public class OrderController {
             calendar2.add(Calendar.DATE, wisdIntegrlRoles.getOrderRefundTime());
             String three_days_after = sdf2.format(calendar2.getTime());
             order.setOrderRefundTimes(three_days_after);
-        } else if (agree == 2) {
+        } else if (refundRemarkesDto.getAgree() == 2) {
             // TODO: 拒绝退换货后订单回到**状态
             order.setStatus(3);
             order.setAfterSalesStatus(66);
@@ -417,7 +424,7 @@ public class OrderController {
             if (map.get("code").equals(1)) {
                 wisdOeder.setOrderRefundType(3);
 //                TODO：
-                //wisdOeder.setStatus(65);
+                wisdOeder.setStatus(3);
                 wisdOeder.setAfterSalesStatus(65);
                 wisdOeder.setOrderRefundMerchantsTime(new Date());
                 Boolean flag = orderService.saveOrUpdate(wisdOeder);
@@ -433,7 +440,7 @@ public class OrderController {
             }
         }
 //        TODO：
-        //wisdOeder.setStatus(65);
+        wisdOeder.setStatus(3);
         wisdOeder.setAfterSalesStatus(65);
         wisdOeder.setOrderRefundMerchantsTime(new Date());
         Boolean flag = orderService.saveOrUpdate(wisdOeder);
@@ -465,7 +472,7 @@ public class OrderController {
     public Result deliveryMoney(Long orderId) {
         WisdOeder order = orderService.getById(orderId);
 //        TODO：
-        //order.setStatus(65);
+        order.setStatus(3);
         order.setAfterSalesStatus(65);
         order.setOrderRefundMerchantsTime(new Date());
         if (order.getOrderRefundType() == 2) {
@@ -711,7 +718,7 @@ public class OrderController {
     @RequestMapping(value = "exportOrder")
     @ResponseBody
     public Result exportOrder(String createTimeStart, String createTimeEnd, Long companyId, Long addressId, Integer orderPick, String orderNumber, String userName, String userPhone, Integer status, Integer orderPayWay, HttpServletResponse response, HttpServletRequest request, Integer type) throws IOException {
-        String[] title = {"下单时间", "订单状态", "订单号", "微信支付", "其他支付", "运费", "收货人", "电话", "地址", "下单留言", "提货方式", "物流名称", "物流单号", "商品名称", "商品编码", "商品类型", "商品规格", "商品价格", "数量", "是否是商家直发", "套餐券"};
+        String[] title = {"下单时间", "订单状态", "订单号", "微信支付", "其他支付", "运费", "收货人", "电话", "地址", "下单留言", "提货方式", "物流名称", "物流信息", "商品名称", "商品编码", "商品类型", "商品规格", "商品价格", "数量", "是否是商家直发", "套餐券"};
         QueryWrapper<WisdOeder> queryWrapper = new QueryWrapper<>();
         if (orderNumber != null && !"".equals(orderNumber)) {
             queryWrapper.eq("order_number", orderNumber);
@@ -932,7 +939,7 @@ public class OrderController {
                         // 订单备注
                         XSSFCell cell13 = headRow1.createCell(12);
                         cell13.setCellStyle(leftStyle1(wb));
-                        cell13.setCellValue(dataList.get(i).getLogisticsNum());
+                        cell13.setCellValue(dataList.get(i).getLogistics());
 
 
                     }
diff --git a/src/main/java/com/wisdo/mmining/controller/PackageController.java b/src/main/java/com/wisdo/mmining/controller/PackageController.java
index cf689db..8ef064f 100644
--- a/src/main/java/com/wisdo/mmining/controller/PackageController.java
+++ b/src/main/java/com/wisdo/mmining/controller/PackageController.java
@@ -1,7 +1,5 @@
 package com.wisdo.mmining.controller;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.wisdo.mmining.entity.User;
@@ -11,7 +9,6 @@ import com.wisdo.mmining.result.Result;
 import com.wisdo.mmining.result.ResultUtil;
 import com.wisdo.mmining.service.DeptService;
 import com.wisdo.mmining.service.PackageService;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +19,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -40,37 +36,37 @@ public class PackageController {
     private DeptService deptService;
 
     @GetMapping(value = "")
-    public String page(){
+    public String page() {
         return "pages/package/package_list";
     }
 
     @GetMapping(value = "/list")
     @ResponseBody
-    public Result<IPage<WisdPackage>> list(String name, int page, int num){
+    public Result<IPage<WisdPackage>> list(String name, int page, int num) {
         Subject subject = SecurityUtils.getSubject();
-        User user= (User) subject.getSession().getAttribute("sys_user");
-        IPage<WisdPackage> wisdPackageIPage = packageService.getIssueListByCompanyId(name,user.getCompanyId(),page, num);
-        return new Result<IPage<WisdPackage>>(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wisdPackageIPage);
+        User user = (User) subject.getSession().getAttribute("sys_user");
+        IPage<WisdPackage> wisdPackageIPage = packageService.getIssueListByCompanyId(name, user.getCompanyId(), page, num);
+        return new Result<IPage<WisdPackage>>(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wisdPackageIPage);
     }
 
     @GetMapping(value = "send")
-    public String edit(Model model, Long id){
-        if (id!=null){
+    public String edit(Model model, Long id) {
+        if (id != null) {
             WisdPackage wisdPackage = packageService.getById(id);
-            model.addAttribute("obj",wisdPackage);
+            model.addAttribute("obj", wisdPackage);
         }
         Subject subject = SecurityUtils.getSubject();
-        User user= (User) subject.getSession().getAttribute("sys_user");
+        User user = (User) subject.getSession().getAttribute("sys_user");
         QueryWrapper<WisdDept> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("company_id",user.getCompanyId());
-        List<WisdDept> deptList=deptService.list(queryWrapper);
-        model.addAttribute("deptList",deptList);
+        queryWrapper.eq("company_id", user.getCompanyId());
+        List<WisdDept> deptList = deptService.list(queryWrapper);
+        model.addAttribute("deptList", deptList);
         return "pages/package/package_edit";
     }
 
     @PostMapping(value = "save")
     @ResponseBody
-    public Result save(WisdPackage wisdPackage){
+    public Result save(WisdPackage wisdPackage) {
         return packageService.send(wisdPackage);
     }
 
diff --git a/src/main/java/com/wisdo/mmining/controller/PermissionController.java b/src/main/java/com/wisdo/mmining/controller/PermissionController.java
index a86ee3f..1558a64 100644
--- a/src/main/java/com/wisdo/mmining/controller/PermissionController.java
+++ b/src/main/java/com/wisdo/mmining/controller/PermissionController.java
@@ -6,16 +6,15 @@ import com.wisdo.mmining.result.Result;
 import com.wisdo.mmining.result.ResultUtil;
 import com.wisdo.mmining.service.PermissionService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
-import org.springframework.stereotype.Controller;
-
 import java.util.List;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author hjw
@@ -29,33 +28,33 @@ public class PermissionController {
     private PermissionService tPermissionService;
 
     @GetMapping(value = "")
-    public String page(){
+    public String page() {
         return "pages/sys/tpermission_list";
     }
 
     @GetMapping(value = "table")
     @ResponseBody
-    public Result<List<Permission>> table(){
+    public Result<List<Permission>> table() {
         List<Permission> tPermissions = tPermissionService.getAll();
-        return new Result<List<Permission>>(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,tPermissions);
+        return new Result<List<Permission>>(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, tPermissions);
     }
 
     @GetMapping(value = "edit")
-    public String edit(Model model, @RequestParam(value = "id",required = false) Long id){
-        if (id!=null){
+    public String edit(Model model, @RequestParam(value = "id", required = false) Long id) {
+        if (id != null) {
             Permission tPermission = tPermissionService.getById(id);
-            model.addAttribute("obj",tPermission);
+            model.addAttribute("obj", tPermission);
         }
         return "pages/sys/tpermission_edit";
     }
 
     @PostMapping(value = "save")
     @ResponseBody
-    public Result save(Permission tPermission){
+    public Result save(Permission tPermission) {
         boolean flag = tPermissionService.saveOrUpdate(tPermission);
-        if(flag){
+        if (flag) {
             return ResultUtil.success();
-        }else{
+        } else {
             return ResultUtil.error();
         }
 
@@ -63,11 +62,11 @@ public class PermissionController {
 
     @DeleteMapping(value = "delete")
     @ResponseBody
-    public Result delete(Long id){
+    public Result delete(Long id) {
         boolean flag = tPermissionService.removeById(id);
-        if(flag){
+        if (flag) {
             return ResultUtil.success();
-        }else{
+        } else {
             return ResultUtil.error();
         }
 
diff --git a/src/main/java/com/wisdo/mmining/controller/ProfitsController.java b/src/main/java/com/wisdo/mmining/controller/ProfitsController.java
index ffb04fb..4e8b713 100644
--- a/src/main/java/com/wisdo/mmining/controller/ProfitsController.java
+++ b/src/main/java/com/wisdo/mmining/controller/ProfitsController.java
@@ -1,6 +1,5 @@
 package com.wisdo.mmining.controller;
 
-import com.wisdo.mmining.entity.WisdIntegrlRoles;
 import com.wisdo.mmining.entity.WisdProfits;
 import com.wisdo.mmining.result.Result;
 import com.wisdo.mmining.result.ResultUtil;
@@ -26,21 +25,21 @@ public class ProfitsController {
     private ProfitsService profitsService;
 
     @GetMapping(value = "")
-    public String edit(Model model){
+    public String edit(Model model) {
         WisdProfits wisdProfits = profitsService.getById(1);
-        model.addAttribute("obj",wisdProfits);
+        model.addAttribute("obj", wisdProfits);
         return "pages/profits/profits_edit";
     }
 
     @PostMapping(value = "save")
     @ResponseBody
-    public Result save(WisdProfits wisdProfits){
+    public Result save(WisdProfits wisdProfits) {
 //        WisdIntegrlRoles wisdIntegrlRoles=new WisdIntegrlRoles();
 //        wisdIntegrlRoles.setRolesContent(rolesContent);
 //        wisdIntegrlRoles.setId(1L);
         boolean flag = profitsService.updateById(wisdProfits);
-        if(flag){
-            return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG);
+        if (flag) {
+            return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG);
         }
         return ResultUtil.error();
     }
diff --git a/src/main/java/com/wisdo/mmining/controller/RoleController.java b/src/main/java/com/wisdo/mmining/controller/RoleController.java
index 276351d..eb8166b 100644
--- a/src/main/java/com/wisdo/mmining/controller/RoleController.java
+++ b/src/main/java/com/wisdo/mmining/controller/RoleController.java
@@ -10,16 +10,15 @@ import com.wisdo.mmining.result.ResultUtil;
 import com.wisdo.mmining.service.PermissionService;
 import com.wisdo.mmining.service.RoleService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
-import org.springframework.stereotype.Controller;
-
 import java.util.List;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author hjw
@@ -36,57 +35,57 @@ public class RoleController {
     private PermissionService tPermissionService;
 
     @GetMapping(value = "")
-    public String page(){
+    public String page() {
         return "pages/sys/trole_list";
     }
 
     @GetMapping(value = "table")
     @ResponseBody
-    @OperLog(operModul = "角色管理",operType = "列表查询",operDesc = "列表查询")
-    public Result<IPage<Role>> table(String name, int num, int page){
-        IPage<Role> tRolePage = tRoleService.getPage(name,num,page);
-        return new Result<IPage<Role>>(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,tRolePage);
+    @OperLog(operModul = "角色管理", operType = "列表查询", operDesc = "列表查询")
+    public Result<IPage<Role>> table(String name, int num, int page) {
+        IPage<Role> tRolePage = tRoleService.getPage(name, num, page);
+        return new Result<IPage<Role>>(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, tRolePage);
     }
 
     @GetMapping(value = "edit")
-    public String edit(Long id, Model model){
-        if(id!=null){
+    public String edit(Long id, Model model) {
+        if (id != null) {
             Role tRole = tRoleService.getById(id);
-            model.addAttribute("obj",tRole);
+            model.addAttribute("obj", tRole);
         }
         return "pages/sys/trole_edit";
     }
 
     @GetMapping(value = "getSelected")
     @ResponseBody
-    public Result getSelected(Long id){
+    public Result getSelected(Long id) {
         List<Long> tPermissionList = tPermissionService.getPermissionByRoleId(id);
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,tPermissionList);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, tPermissionList);
     }
 
     @PostMapping(value = "save")
     @ResponseBody
-    @OperLog(operModul = "角色管理",operType = "新增/修改",operDesc = "新增/修改")
-    public Result save(RoleVo tRoleVo){
+    @OperLog(operModul = "角色管理", operType = "新增/修改", operDesc = "新增/修改")
+    public Result save(RoleVo tRoleVo) {
         boolean flag = tRoleService.saveOrUpdateT(tRoleVo);
-        if(flag){
+        if (flag) {
             return ResultUtil.success();
-        }else{
+        } else {
             return ResultUtil.error();
         }
     }
 
     @DeleteMapping(value = "delete")
     @ResponseBody
-    @OperLog(operModul = "角色管理",operType = "删除",operDesc = "删除")
-    public Result delete(Long id){
-        if(id==1){
-            return new Result(ResultUtil.SUCCESS,"超管角色无法删除");
+    @OperLog(operModul = "角色管理", operType = "删除", operDesc = "删除")
+    public Result delete(Long id) {
+        if (id == 1) {
+            return new Result(ResultUtil.SUCCESS, "超管角色无法删除");
         }
         boolean flag = tRoleService.removeById(id);
-        if(flag){
+        if (flag) {
             return ResultUtil.success();
-        }else{
+        } else {
             return ResultUtil.error();
         }
     }
diff --git a/src/main/java/com/wisdo/mmining/controller/RolePermissionController.java b/src/main/java/com/wisdo/mmining/controller/RolePermissionController.java
index 28f065e..c4d033e 100644
--- a/src/main/java/com/wisdo/mmining/controller/RolePermissionController.java
+++ b/src/main/java/com/wisdo/mmining/controller/RolePermissionController.java
@@ -1,13 +1,12 @@
 package com.wisdo.mmining.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author hjw
diff --git a/src/main/java/com/wisdo/mmining/controller/StoresController.java b/src/main/java/com/wisdo/mmining/controller/StoresController.java
index 445fffc..f4a1b54 100644
--- a/src/main/java/com/wisdo/mmining/controller/StoresController.java
+++ b/src/main/java/com/wisdo/mmining/controller/StoresController.java
@@ -3,8 +3,6 @@ package com.wisdo.mmining.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.wisdo.mmining.entity.WisdBanner;
-import com.wisdo.mmining.entity.WisdCompany;
 import com.wisdo.mmining.entity.WisdStores;
 import com.wisdo.mmining.result.Result;
 import com.wisdo.mmining.result.ResultUtil;
@@ -20,7 +18,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -37,45 +34,45 @@ public class StoresController {
     private StoresService storesService;
 
     @GetMapping(value = "")
-    public String page(){
+    public String page() {
         return "pages/stores/stores_list";
     }
 
     @GetMapping(value = "/list")
     @ResponseBody
-    public Result<IPage<WisdStores>> list(int page, int num){
+    public Result<IPage<WisdStores>> list(int page, int num) {
         IPage<WisdStores> wisdStoresIPage = storesService.selectPage(page, num);
-        return new Result<IPage<WisdStores>>(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wisdStoresIPage);
+        return new Result<IPage<WisdStores>>(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wisdStoresIPage);
     }
 
 
     @GetMapping(value = "edit")
-    public String edit(Model model, Long id){
-        if (id!=null){
+    public String edit(Model model, Long id) {
+        if (id != null) {
             WisdStores wisdStores = storesService.getById(id);
-            model.addAttribute("obj",wisdStores);
+            model.addAttribute("obj", wisdStores);
         }
         return "pages/stores/stores_edit";
     }
 
     @PostMapping(value = "save")
     @ResponseBody
-    public Result save(WisdStores wisdStores){
-        if (!PhoneUtils.isPhoneLegal(wisdStores.getStoresPhone())){
-            return new Result(ResultUtil.ERROR,"请输入正确手机号");
+    public Result save(WisdStores wisdStores) {
+        if (!PhoneUtils.isPhoneLegal(wisdStores.getStoresPhone())) {
+            return new Result(ResultUtil.ERROR, "请输入正确手机号");
         }
         String location = AddressLngLatExchange.httpURLConectionGET(wisdStores.getStoresProvince() + wisdStores.getStoresCity() + wisdStores.getStoresArea() + wisdStores.getStoresDetailed());
         String[] locationsz = location.split(",");
         wisdStores.setStoresLatitude(Double.parseDouble(locationsz[1]));
         wisdStores.setStoresLongitude(Double.parseDouble(locationsz[0]));
         boolean flag = false;
-        if(wisdStores.getId()==null){
+        if (wisdStores.getId() == null) {
             flag = storesService.save(wisdStores);
-        }else{
+        } else {
             flag = storesService.updateById(wisdStores);
         }
-        if(flag){
-            return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG);
+        if (flag) {
+            return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG);
         }
         return ResultUtil.error();
     }
diff --git a/src/main/java/com/wisdo/mmining/controller/SysController.java b/src/main/java/com/wisdo/mmining/controller/SysController.java
index f51c6a9..2f2848e 100644
--- a/src/main/java/com/wisdo/mmining/controller/SysController.java
+++ b/src/main/java/com/wisdo/mmining/controller/SysController.java
@@ -31,6 +31,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -40,7 +41,7 @@ import java.util.*;
  * @author 胡俊文<br>
  * @version 1.0<br>
  * @createDate 2020/07/15 16:48 <br>
- * @see  <br>
+ * @see <br>
  */
 @Controller
 public class SysController {
@@ -64,14 +65,15 @@ public class SysController {
 
 
     private final String ADMINIMG = "adminimg";
+
     @GetMapping(value = "/login")
-    public String loginPage(){
+    public String loginPage() {
         return "sys/login";
     }
 
     @GetMapping(value = "doLogin")
     @ResponseBody
-    public Result doLogin(String username,String password,String code,HttpServletRequest request){
+    public Result doLogin(String username, String password, String code, HttpServletRequest request) {
 
         if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password) || StringUtils.isEmpty(code)) {
             request.getSession().removeAttribute("adminimg");
@@ -109,18 +111,18 @@ public class SysController {
 
         subject.getSession().setAttribute("sys_user", tUser);
         request.getSession().removeAttribute("adminimg");
-        return new Result("1","登录成功");
+        return new Result("1", "登录成功");
     }
 
     @GetMapping(value = "/loginOut")
-    public String loginOut(){
+    public String loginOut() {
         Subject subject = SecurityUtils.getSubject();
         subject.logout();
         return "sys/login";
     }
 
     @GetMapping(value = "/changePassPage")
-    public String changePassPage(){
+    public String changePassPage() {
         return "sys/change_pass";
     }
 
@@ -146,9 +148,9 @@ public class SysController {
         }
         sUser.setPassword(Md5Util.encryptMd5(newPassword));
         boolean flag = tUserService.updateById(sUser);
-        if(flag){
+        if (flag) {
             return ResultUtil.success();
-        }else{
+        } else {
             return ResultUtil.error();
         }
 
@@ -159,25 +161,25 @@ public class SysController {
     public String home(Model model) {
         Subject subject = SecurityUtils.getSubject();
         User tUser = (User) subject.getSession().getAttribute("sys_user");
-        if(tUser==null){
+        if (tUser == null) {
             throw new AppException("请登录");
         }
-        model.addAttribute("tUser",tUser);
-        List<Permission> tPermissions = tPermissionService.getMenuByType(0,0L,tUser.getRoleId());
+        model.addAttribute("tUser", tUser);
+        List<Permission> tPermissions = tPermissionService.getMenuByType(0, 0L, tUser.getRoleId());
         List<PermissionVo> tPermissionVos = new ArrayList<>();
         PermissionVo tPermissionVo = null;
-        for (int i=0,len=tPermissions.size();i<len;i++){
+        for (int i = 0, len = tPermissions.size(); i < len; i++) {
             tPermissionVo = new PermissionVo();
-            BeanUtils.copyProperties(tPermissions.get(i),tPermissionVo);
-            tPermissionVo.settPermissions(tPermissionService.getMenuByType(1,tPermissions.get(i).getId(),tUser.getRoleId()));
+            BeanUtils.copyProperties(tPermissions.get(i), tPermissionVo);
+            tPermissionVo.settPermissions(tPermissionService.getMenuByType(1, tPermissions.get(i).getId(), tUser.getRoleId()));
             tPermissionVos.add(tPermissionVo);
         }
-        model.addAttribute("tPermissionVos",tPermissionVos);
+        model.addAttribute("tPermissionVos", tPermissionVos);
         return "sys/home";
     }
 
     @GetMapping(value = "/welcome")
-    public ModelAndView welcome(){
+    public ModelAndView welcome() {
         Subject subject = SecurityUtils.getSubject();
         User tUser = (User) subject.getSession().getAttribute("sys_user");
         ModelAndView modelAndView = new ModelAndView("sys/welcome");
@@ -192,25 +194,25 @@ public class SysController {
         now = calendar.getTime();
         String accDate = dateFormat2.format(now);
         QueryWrapper<WisdWxuser> wxuserQueryWrapper1 = new QueryWrapper<>();
-        wxuserQueryWrapper1.like("create_time",createTime1);
-        Integer userNowDayNum=wxuserService.count(wxuserQueryWrapper1);
+        wxuserQueryWrapper1.like("create_time", createTime1);
+        Integer userNowDayNum = wxuserService.count(wxuserQueryWrapper1);
         QueryWrapper<WisdWxuser> wxuserQueryWrapper2 = new QueryWrapper<>();
-        wxuserQueryWrapper2.like("create_time",createTime2);
-        Integer userMonthNum=wxuserService.count(wxuserQueryWrapper2);
+        wxuserQueryWrapper2.like("create_time", createTime2);
+        Integer userMonthNum = wxuserService.count(wxuserQueryWrapper2);
         QueryWrapper<WisdWxuser> wxuserQueryWrapper3 = new QueryWrapper<>();
-        wxuserQueryWrapper3.like("create_time",accDate);
-        Integer userAccMonthNum=wxuserService.count(wxuserQueryWrapper3);
-        Integer userAllNum=wxuserService.count();
+        wxuserQueryWrapper3.like("create_time", accDate);
+        Integer userAccMonthNum = wxuserService.count(wxuserQueryWrapper3);
+        Integer userAllNum = wxuserService.count();
         QueryWrapper<WisdOeder> oederQueryWrapper1 = new QueryWrapper<>();
-        oederQueryWrapper1.like("create_time",createTime2);
-        Integer orderNowNum=orderService.count(oederQueryWrapper1);
-        List<WisdOeder> oederNowList=orderService.list(oederQueryWrapper1);
-        BigDecimal oederNowPay = oederNowList.stream().map(WisdOeder::getOrderActualPay).reduce(BigDecimal.ZERO,BigDecimal::add);//和
+        oederQueryWrapper1.like("create_time", createTime2);
+        Integer orderNowNum = orderService.count(oederQueryWrapper1);
+        List<WisdOeder> oederNowList = orderService.list(oederQueryWrapper1);
+        BigDecimal oederNowPay = oederNowList.stream().map(WisdOeder::getOrderActualPay).reduce(BigDecimal.ZERO, BigDecimal::add);//和
         QueryWrapper<WisdOeder> oederQueryWrapper2 = new QueryWrapper<>();
-        oederQueryWrapper2.like("create_time",accDate);
-        List<WisdOeder> oederAccList=orderService.list(oederQueryWrapper2);
-        BigDecimal oederAccPay = oederAccList.stream().map(WisdOeder::getOrderActualPay).reduce(BigDecimal.ZERO,BigDecimal::add);//和
-        Integer orderAccNum=orderService.count(oederQueryWrapper2);
+        oederQueryWrapper2.like("create_time", accDate);
+        List<WisdOeder> oederAccList = orderService.list(oederQueryWrapper2);
+        BigDecimal oederAccPay = oederAccList.stream().map(WisdOeder::getOrderActualPay).reduce(BigDecimal.ZERO, BigDecimal::add);//和
+        Integer orderAccNum = orderService.count(oederQueryWrapper2);
         // 订单成交量比
         if (orderNowNum != 0 && orderAccNum != 0) {
             Double aDouble = DoubleUtil.sub(Double.parseDouble(orderNowNum + ""), Double.parseDouble(orderAccNum + ""));
@@ -225,7 +227,7 @@ public class SysController {
         }
         // 业绩比
         if (oederNowPay.intValue() != 0 && oederAccPay.intValue() != 0) {
-            BigDecimal salePercent = oederNowPay.subtract(oederAccPay).divide(oederAccPay,2,BigDecimal.ROUND_HALF_UP);
+            BigDecimal salePercent = oederNowPay.subtract(oederAccPay).divide(oederAccPay, 2, RoundingMode.HALF_UP);
             modelAndView.addObject("salePercent", salePercent.multiply(new BigDecimal("100")));
         } else if (oederNowPay.intValue() == 0 && oederAccPay.intValue() == 0) {
             modelAndView.addObject("salePercent", 0);
@@ -248,16 +250,15 @@ public class SysController {
         }
         // 获取一年的业绩情况
         List<Echarts> saleErcode = orderService.getMonthSumByEcharts();
-        modelAndView.addObject("saleErcode",saleErcode);
-        modelAndView.addObject("dayNewAddCustomer",userNowDayNum);
-        modelAndView.addObject("monthNewAddCustomer",userMonthNum);
-        modelAndView.addObject("allCustomer",userAllNum);
-        modelAndView.addObject("tUser",tUser);
+        modelAndView.addObject("saleErcode", saleErcode);
+        modelAndView.addObject("dayNewAddCustomer", userNowDayNum);
+        modelAndView.addObject("monthNewAddCustomer", userMonthNum);
+        modelAndView.addObject("allCustomer", userAllNum);
+        modelAndView.addObject("tUser", tUser);
         return modelAndView;
     }
 
 
-
     /**
      * 验证码
      *
diff --git a/src/main/java/com/wisdo/mmining/controller/UploadController.java b/src/main/java/com/wisdo/mmining/controller/UploadController.java
index f8d2307..ebe003b 100644
--- a/src/main/java/com/wisdo/mmining/controller/UploadController.java
+++ b/src/main/java/com/wisdo/mmining/controller/UploadController.java
@@ -116,7 +116,7 @@ public class UploadController {
         map.put("code", 0);
         map.put("msg", "上传成功");
         Map<String, Object> mm = new HashMap<>(16);
-        mm.put("src",pp.get("src"));
+        mm.put("src", pp.get("src"));
         map.put("data", mm);
         return map;
     }
diff --git a/src/main/java/com/wisdo/mmining/controller/UserController.java b/src/main/java/com/wisdo/mmining/controller/UserController.java
index 6086140..b7a6a76 100644
--- a/src/main/java/com/wisdo/mmining/controller/UserController.java
+++ b/src/main/java/com/wisdo/mmining/controller/UserController.java
@@ -2,12 +2,10 @@ package com.wisdo.mmining.controller;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.wisdo.mmining.entity.Role;
 import com.wisdo.mmining.entity.User;
 import com.wisdo.mmining.entity.WisdCompany;
 import com.wisdo.mmining.log.OperLog;
-import com.wisdo.mmining.mapper.vo.UserVo;
 import com.wisdo.mmining.result.Result;
 import com.wisdo.mmining.result.ResultUtil;
 import com.wisdo.mmining.service.CompanyService;
@@ -15,16 +13,15 @@ import com.wisdo.mmining.service.RoleService;
 import com.wisdo.mmining.service.UserService;
 import com.wisdo.mmining.util.Md5Util;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
-import org.springframework.stereotype.Controller;
-
 import java.util.List;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author hjw
@@ -44,66 +41,66 @@ public class UserController {
     private CompanyService companyService;
 
     @GetMapping(value = "")
-    public String page(Model model){
-        List<WisdCompany> companyList=companyService.list();
-        model.addAttribute("companyList",companyList);
+    public String page(Model model) {
+        List<WisdCompany> companyList = companyService.list();
+        model.addAttribute("companyList", companyList);
         return "pages/sys/tuser_list";
     }
 
     @GetMapping(value = "table")
     @ResponseBody
-    @OperLog(operModul = "管理员列表",operType = "列表查询",operDesc = "查询")
-    public Result<IPage<User>> table(Long companyId, String username, int page, int num){
-        IPage<User> tUserPage = tUserService.getUserRole(companyId,username,page, num);
-        return new Result<IPage<User>>(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,tUserPage);
+    @OperLog(operModul = "管理员列表", operType = "列表查询", operDesc = "查询")
+    public Result<IPage<User>> table(Long companyId, String username, int page, int num) {
+        IPage<User> tUserPage = tUserService.getUserRole(companyId, username, page, num);
+        return new Result<IPage<User>>(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, tUserPage);
     }
 
     @GetMapping(value = "edit")
-    public String edit(Model model,Long id){
+    public String edit(Model model, Long id) {
         List<Role> tRoleList = tRoleService.getAll();
-        model.addAttribute("tRoleList",tRoleList);
-        if (id!=null){
+        model.addAttribute("tRoleList", tRoleList);
+        if (id != null) {
             User tUser = tUserService.getById(id);
-            model.addAttribute("obj",tUser);
+            model.addAttribute("obj", tUser);
 
         }
-        List<WisdCompany> companyList=companyService.list();
-        model.addAttribute("companyList",companyList);
+        List<WisdCompany> companyList = companyService.list();
+        model.addAttribute("companyList", companyList);
         return "pages/sys/tuser_edit";
     }
 
     @PostMapping(value = "save")
     @ResponseBody
-    @OperLog(operModul = "管理员列表",operType = "新增/修改",operDesc = "新增/修改")
-    public Result save(User tUser){
+    @OperLog(operModul = "管理员列表", operType = "新增/修改", operDesc = "新增/修改")
+    public Result save(User tUser) {
         boolean flag = false;
-        if(tUser.getId()==null){
+        if (tUser.getId() == null) {
             User user = tUserService.getUserByUsername(tUser.getUsername());
-            if(user!=null){
+            if (user != null) {
                 return ResultUtil.error("该账户已存在");
             }
             tUser.setPassword(Md5Util.encryptMd5(tUser.getPassword()));
             flag = tUserService.save(tUser);
-        }else{
+        } else {
             flag = tUserService.updateById(tUser);
         }
-        if(flag){
-            return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG);
+        if (flag) {
+            return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG);
         }
         return ResultUtil.error();
     }
 
     @DeleteMapping(value = "delete")
     @ResponseBody
-    @OperLog(operModul = "管理员列表",operType = "删除",operDesc = "删除")
-    public Result delete(Long id){
-        if(id==1){
+    @OperLog(operModul = "管理员列表", operType = "删除", operDesc = "删除")
+    public Result delete(Long id) {
+        if (id == 1) {
             return ResultUtil.error("超管无法删除");
         }
         boolean flag = tUserService.removeById(id);
-        if(flag){
+        if (flag) {
             return ResultUtil.success();
-        }else{
+        } else {
             return ResultUtil.error();
         }
     }
@@ -111,17 +108,16 @@ public class UserController {
 
     @PutMapping(value = "resetPassword")
     @ResponseBody
-    @OperLog(operModul = "管理员列表",operType = "重置密码",operDesc = "重置密码，密码重置成账户")
-    public Result resetPassword(Long id){
+    @OperLog(operModul = "管理员列表", operType = "重置密码", operDesc = "重置密码，密码重置成账户")
+    public Result resetPassword(Long id) {
         User tUser = tUserService.getById(id);
         tUser.setPassword(Md5Util.encryptMd5(tUser.getUsername()));
         boolean flag = tUserService.updateById(tUser);
-        if(flag){
+        if (flag) {
             return ResultUtil.success("密码已重置成账户");
         }
         return ResultUtil.error();
     }
 
 
-
 }
diff --git a/src/main/java/com/wisdo/mmining/controller/VipController.java b/src/main/java/com/wisdo/mmining/controller/VipController.java
index a900d34..a40ba28 100644
--- a/src/main/java/com/wisdo/mmining/controller/VipController.java
+++ b/src/main/java/com/wisdo/mmining/controller/VipController.java
@@ -2,10 +2,7 @@ package com.wisdo.mmining.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.wisdo.mmining.entity.WisdBanner;
-import com.wisdo.mmining.entity.WisdGoods;
 import com.wisdo.mmining.entity.WisdVip;
 import com.wisdo.mmining.entity.WisdWxuser;
 import com.wisdo.mmining.result.Result;
@@ -39,48 +36,48 @@ public class VipController {
     private WxuserService wxuserService;
 
     @GetMapping(value = "")
-    public String page(){
+    public String page() {
         return "pages/vip/vip_list";
     }
 
     @GetMapping(value = "/list")
     @ResponseBody
-    public Result<IPage<WisdVip>> list(int page, int num){
+    public Result<IPage<WisdVip>> list(int page, int num) {
         IPage<WisdVip> wisdCompanyIPage = vipService.selectPage(page, num);
-        return new Result<IPage<WisdVip>>(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wisdCompanyIPage);
+        return new Result<IPage<WisdVip>>(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wisdCompanyIPage);
     }
 
     @GetMapping(value = "edit")
-    public String edit(Model model, Long id){
-        if (id!=null){
+    public String edit(Model model, Long id) {
+        if (id != null) {
             WisdVip wisdVip = vipService.getById(id);
-            model.addAttribute("obj",wisdVip);
+            model.addAttribute("obj", wisdVip);
         }
         return "pages/vip/vip_edit";
     }
 
     @PostMapping(value = "save")
     @ResponseBody
-    public Result save(WisdVip wisdVip){
+    public Result save(WisdVip wisdVip) {
         boolean flag = false;
-        List<WisdWxuser> wisdWxuserList=new ArrayList<>();
-        if(wisdVip.getId()==null){
+        List<WisdWxuser> wisdWxuserList = new ArrayList<>();
+        if (wisdVip.getId() == null) {
             WisdVip wisdVip1 = vipService.getByName(wisdVip.getVipName());
-            if(wisdVip1!=null){
+            if (wisdVip1 != null) {
                 return ResultUtil.error("已存在");
             }
             flag = vipService.save(wisdVip);
-        }else{
-            WisdVip wisdVip1=vipService.getById(wisdVip.getId());
-            wisdWxuserList=wxuserService.getListByVip(wisdVip1.getVipName());
+        } else {
+            WisdVip wisdVip1 = vipService.getById(wisdVip.getId());
+            wisdWxuserList = wxuserService.getListByVip(wisdVip1.getVipName());
             flag = vipService.updateById(wisdVip);
         }
-        if(flag){
-            for (WisdWxuser wisdWxuser:wisdWxuserList){
+        if (flag) {
+            for (WisdWxuser wisdWxuser : wisdWxuserList) {
                 wisdWxuser.setUserVip(wisdVip.getVipName());
             }
             wxuserService.updateBatchById(wisdWxuserList);
-            return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG);
+            return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG);
         }
         return ResultUtil.error();
     }
diff --git a/src/main/java/com/wisdo/mmining/controller/VolumeController.java b/src/main/java/com/wisdo/mmining/controller/VolumeController.java
index be5b81a..90d1723 100644
--- a/src/main/java/com/wisdo/mmining/controller/VolumeController.java
+++ b/src/main/java/com/wisdo/mmining/controller/VolumeController.java
@@ -36,37 +36,37 @@ public class VolumeController {
     private DeptService deptService;
 
     @GetMapping(value = "")
-    public String page(){
+    public String page() {
         return "pages/volume/volume_list";
     }
 
     @GetMapping(value = "/list")
     @ResponseBody
-    public Result<IPage<WisdCashVolume>> list(String name, int page, int num){
+    public Result<IPage<WisdCashVolume>> list(String name, int page, int num) {
         Subject subject = SecurityUtils.getSubject();
-        User user= (User) subject.getSession().getAttribute("sys_user");
-        IPage<WisdCashVolume> wisdPackageIPage = cashVolumeService.getIssueListByCompanyId(user.getCompanyId(),page, num);
-        return new Result<IPage<WisdCashVolume>>(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wisdPackageIPage);
+        User user = (User) subject.getSession().getAttribute("sys_user");
+        IPage<WisdCashVolume> wisdPackageIPage = cashVolumeService.getIssueListByCompanyId(user.getCompanyId(), page, num);
+        return new Result<IPage<WisdCashVolume>>(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wisdPackageIPage);
     }
 
     @GetMapping(value = "send")
-    public String edit(Model model, Long id){
-        if (id!=null){
+    public String edit(Model model, Long id) {
+        if (id != null) {
             WisdCashVolume wisdCashVolume = cashVolumeService.getById(id);
-            model.addAttribute("obj",wisdCashVolume);
+            model.addAttribute("obj", wisdCashVolume);
         }
         Subject subject = SecurityUtils.getSubject();
-        User user= (User) subject.getSession().getAttribute("sys_user");
+        User user = (User) subject.getSession().getAttribute("sys_user");
         QueryWrapper<WisdDept> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("company_id",user.getCompanyId());
-        List<WisdDept> deptList=deptService.list(queryWrapper);
-        model.addAttribute("deptList",deptList);
+        queryWrapper.eq("company_id", user.getCompanyId());
+        List<WisdDept> deptList = deptService.list(queryWrapper);
+        model.addAttribute("deptList", deptList);
         return "pages/volume/volume_edit";
     }
 
     @PostMapping(value = "save")
     @ResponseBody
-    public Result save(WisdCashVolume wisdCashVolume){
+    public Result save(WisdCashVolume wisdCashVolume) {
         return cashVolumeService.send(wisdCashVolume);
     }
 }
diff --git a/src/main/java/com/wisdo/mmining/controller/WelFareController.java b/src/main/java/com/wisdo/mmining/controller/WelFareController.java
index 3182924..8ac379a 100644
--- a/src/main/java/com/wisdo/mmining/controller/WelFareController.java
+++ b/src/main/java/com/wisdo/mmining/controller/WelFareController.java
@@ -12,7 +12,6 @@ import com.wisdo.mmining.result.Result;
 import com.wisdo.mmining.result.ResultUtil;
 import com.wisdo.mmining.service.*;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -29,7 +28,9 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 /**
  * @Auther: cg
@@ -147,8 +148,6 @@ public class WelFareController {
     }
 
 
-
-
     @PostMapping(value = "packageissue")
     @ResponseBody
     public Result packageissue(Long id) {
@@ -156,12 +155,12 @@ public class WelFareController {
         wisdPackage.setStatus(1);
         Boolean flag = packageService.saveOrUpdate(wisdPackage);
         Long date = System.currentTimeMillis();
-        Long dateEnd = wisdPackage.getPackageEndTime().getTime()+24 * 60 * 60 * 1000;
+        Long dateEnd = wisdPackage.getPackageEndTime().getTime() + 24 * 60 * 60 * 1000;
         if (flag) {
             redisService.set("{'packageId':" + wisdPackage.getId() + ",'status':'3'}", "{'orderNumber':" + wisdPackage.getId() + "}", dateEnd - date);
-            if ((dateEnd - date - 2 * 60 * 60 * 1000)<=0){
+            if ((dateEnd - date - 2 * 60 * 60 * 1000) <= 0) {
                 redisService.set("{'packageId':" + wisdPackage.getId() + ",'status':'33'}", "{'orderNumber':" + wisdPackage.getId() + "}", 60 * 1000);
-            }else {
+            } else {
                 redisService.set("{'packageId':" + wisdPackage.getId() + ",'status':'33'}", "{'orderNumber':" + wisdPackage.getId() + "}", dateEnd - date - 2 * 60 * 60 * 1000);
             }
 
@@ -253,13 +252,13 @@ public class WelFareController {
     @ResponseBody
     public Result volumeissue(Long id) {
         WisdCashVolume wisdCashVolume = cashVolumeService.getById(id);
-        if (wisdCashVolume.getVolumeIsdiscount()==1){
+        if (wisdCashVolume.getVolumeIsdiscount() == 1) {
             QueryWrapper<WisdCashVolume> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("company_id",wisdCashVolume.getCompanyId());
-            queryWrapper.eq("volume_isdiscount",1);
-            queryWrapper.eq("status",1);
-            WisdCashVolume wisdCashVolumes=cashVolumeService.getOne(queryWrapper);
-            if (wisdCashVolumes!=null){
+            queryWrapper.eq("company_id", wisdCashVolume.getCompanyId());
+            queryWrapper.eq("volume_isdiscount", 1);
+            queryWrapper.eq("status", 1);
+            WisdCashVolume wisdCashVolumes = cashVolumeService.getOne(queryWrapper);
+            if (wisdCashVolumes != null) {
                 return new Result(ResultUtil.ERROR, "请先将正在使用中的折扣券结算后再发放新的折扣券");
             }
         }
@@ -276,14 +275,14 @@ public class WelFareController {
     public Result settlement(Long id) {
         WisdCashVolume wisdCashVolume = cashVolumeService.getById(id);
         QueryWrapper<WisdUserVolume> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("volume_id",id);
-        List<WisdUserVolume> userVolumeList=userVolumeService.list(queryWrapper);
-        List<WisdWxuser> wxUserList=new ArrayList<>();
-        List<WisdUser> wisdUserList=new ArrayList<>();
-        List<WisdSettlement> wisdSettlements=new ArrayList<>();
-        for (WisdUserVolume userVolume:userVolumeList){
-            WisdUser wisdUser=wisdUserService.getByUserId(userVolume.getUserId());
-            WisdSettlement wisdSettlement=new WisdSettlement();
+        queryWrapper.eq("volume_id", id);
+        List<WisdUserVolume> userVolumeList = userVolumeService.list(queryWrapper);
+        List<WisdWxuser> wxUserList = new ArrayList<>();
+        List<WisdUser> wisdUserList = new ArrayList<>();
+        List<WisdSettlement> wisdSettlements = new ArrayList<>();
+        for (WisdUserVolume userVolume : userVolumeList) {
+            WisdUser wisdUser = wisdUserService.getByUserId(userVolume.getUserId());
+            WisdSettlement wisdSettlement = new WisdSettlement();
             wisdSettlement.setDiscountId(id);
             wisdSettlement.setSettlementUsername(wisdUser.getUserName());
             wisdSettlement.setSettlementPhone(wisdUser.getUserPhone());
@@ -295,9 +294,9 @@ public class WelFareController {
             wisdUser.setUserDiscount(null);
             wisdUser.setUserDiscountBalance(new BigDecimal(0));
             QueryWrapper<WisdWxuser> wxuserQueryWrapper = new QueryWrapper<>();
-            wxuserQueryWrapper.eq("company_user_id",wisdUser.getId());
-            WisdWxuser wisdWxuser=wxuserService.getOne(wxuserQueryWrapper);
-            if (wisdWxuser!=null){
+            wxuserQueryWrapper.eq("company_user_id", wisdUser.getId());
+            WisdWxuser wisdWxuser = wxuserService.getOne(wxuserQueryWrapper);
+            if (wisdWxuser != null) {
                 wisdWxuser.setUserDiscount(null);
                 wisdWxuser.setUserDiscountBalance(new BigDecimal(0));
                 wxUserList.add(wisdWxuser);
@@ -368,7 +367,7 @@ public class WelFareController {
     }
 
     @GetMapping(value = "bulyedit")
-    public String edit(Model model, Long id, Long companyId,Long contractId) {
+    public String edit(Model model, Long id, Long companyId, Long contractId) {
         if (id != null) {
             WisdGoods wisdGoods = goodsService.getById(id);
             model.addAttribute("obj", wisdGoods);
@@ -395,8 +394,8 @@ public class WelFareController {
 
     @PostMapping(value = "bulysave")
     @ResponseBody
-    public Result save(Long contractId,WisdGoods wisdGoods) {
-        return goodsSpecService.addBuly(contractId,wisdGoods);
+    public Result save(Long contractId, WisdGoods wisdGoods) {
+        return goodsSpecService.addBuly(contractId, wisdGoods);
     }
 
 
@@ -406,8 +405,8 @@ public class WelFareController {
     public Result exportPackage(Long id, HttpServletResponse response, HttpServletRequest request) throws IOException {
         WisdPackage wisdPackage = packageService.getById(id);
 
-        String[] title = {"员工姓名", "电话", "套餐券名称", "是否使用","套餐商品名称","是否核销","下单时间","订单号","发货时间","确认收货时间"};
-        String exName="套餐券领取详情";
+        String[] title = {"员工姓名", "电话", "套餐券名称", "是否使用", "套餐商品名称", "是否核销", "下单时间", "订单号", "发货时间", "确认收货时间"};
+        String exName = "套餐券领取详情";
         QueryWrapper<WisdUserPackage> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("package_id", id);
         List<WisdUserPackage> userPackageList = userPackageService.list(queryWrapper);
@@ -415,7 +414,7 @@ public class WelFareController {
         userPackageList.stream().forEach(userpackage -> {
             PackageVo packageVo = new PackageVo();
             WisdUser wisdUser = wisdUserService.getByUserId(userpackage.getUserId());
-            if (wisdUser!=null) {
+            if (wisdUser != null) {
                 packageVo.setPhone(wisdUser.getUserPhone());
                 packageVo.setUsername(wisdUser.getUserName());
                 packageVo.setPackageName(wisdPackage.getPackageName());
@@ -424,7 +423,7 @@ public class WelFareController {
 //                    QueryWrapper<WisdWxuser> queryWrapper2 = new QueryWrapper<>();
 //                    queryWrapper2.eq("company_user_id", wisdUser.getId());
                     WisdWxuser wisdWxuser = wxuserService.getWxUserByuserId(wisdUser.getId());
-                    if(wisdWxuser!=null) {
+                    if (wisdWxuser != null) {
                         QueryWrapper<WisdOeder> queryWrapper1 = new QueryWrapper<>();
                         queryWrapper1.eq("package_id", id);
                         queryWrapper1.eq("user_id", wisdWxuser.getId());
@@ -567,13 +566,13 @@ public class WelFareController {
     @ResponseBody
     public Result exportOrders(Long id, HttpServletResponse response, HttpServletRequest request) throws IOException {
         String[] title = null;
-        String exName="";
+        String exName = "";
         QueryWrapper<WisdSettlement> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("discount_id",id);
+        queryWrapper.eq("discount_id", id);
         List<WisdSettlement> wisdSettlement = settlementService.list(queryWrapper);
-        String[] title2 = {"员工姓名", "电话",  "折扣券券面额", "折扣券券折扣","员工折扣券已使用","员工折扣券未使用"};
+        String[] title2 = {"员工姓名", "电话", "折扣券券面额", "折扣券券折扣", "员工折扣券已使用", "员工折扣券未使用"};
         title = title2;
-        exName="折扣券结算详情";
+        exName = "折扣券结算详情";
         SimpleDateFormat sdff = new SimpleDateFormat("yyyyMMddHHmmss");
         String newDate = sdff.format(new Date());
         newDate = exName + newDate;
@@ -662,16 +661,16 @@ public class WelFareController {
     @ResponseBody
     public Result exportOrder(Long id, HttpServletResponse response, HttpServletRequest request) throws IOException {
         String[] title = null;
-        String exName="";
+        String exName = "";
         WisdCashVolume wisdCashVolume = cashVolumeService.getById(id);
         if (wisdCashVolume.getVolumeIsdiscount() == 0) {
             String[] title1 = {"员工姓名", "电话", "员工现金券账户余额", "现金券面额"};
             title = title1;
-            exName="现金券领取详情";
+            exName = "现金券领取详情";
         } else {
             String[] title2 = {"员工姓名", "电话", "员工折扣券账户余额", "折扣券券面额", "折扣券券折扣"};
             title = title2;
-            exName="折扣券领取详情";
+            exName = "折扣券领取详情";
         }
         QueryWrapper<WisdUserVolume> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("volume_id", id);
diff --git a/src/main/java/com/wisdo/mmining/controller/WelfareCustomController.java b/src/main/java/com/wisdo/mmining/controller/WelfareCustomController.java
index ec11397..a575b3d 100644
--- a/src/main/java/com/wisdo/mmining/controller/WelfareCustomController.java
+++ b/src/main/java/com/wisdo/mmining/controller/WelfareCustomController.java
@@ -4,9 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.wisdo.mmining.entity.WisdCashVolume;
-import com.wisdo.mmining.entity.WisdCompany;
-import com.wisdo.mmining.entity.WisdDept;
 import com.wisdo.mmining.entity.WisdWelfare;
 import com.wisdo.mmining.result.Result;
 import com.wisdo.mmining.result.ResultUtil;
@@ -37,22 +34,22 @@ public class WelfareCustomController {
 
 
     @GetMapping(value = "")
-    public String page(Model model){
+    public String page(Model model) {
         return "pages/welfarecustom/welfarecustom_list";
     }
 
     @GetMapping(value = "/list")
     @ResponseBody
-    public Result welfareByCid(int page, int num){
-        IPage<WisdWelfare> wisdWelfareIPage=welfareService.getListByCompanyId(page,num);
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wisdWelfareIPage);
+    public Result welfareByCid(int page, int num) {
+        IPage<WisdWelfare> wisdWelfareIPage = welfareService.getListByCompanyId(page, num);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wisdWelfareIPage);
     }
 
     @GetMapping(value = "edit")
-    public String edit(Model model,Long id){
-        if (id!=null){
+    public String edit(Model model, Long id) {
+        if (id != null) {
             WisdWelfare wisdWelfareList = welfareService.getById(id);
-            model.addAttribute("obj",wisdWelfareList);
+            model.addAttribute("obj", wisdWelfareList);
 
         }
         return "pages/welfarecustom/welfarecustom_edit";
@@ -60,20 +57,20 @@ public class WelfareCustomController {
 
     @PostMapping(value = "save")
     @ResponseBody
-    public Result save(WisdWelfare wisdWelfare){
-        if (wisdWelfare.getWelfareType()!=5) {
+    public Result save(WisdWelfare wisdWelfare) {
+        if (wisdWelfare.getWelfareType() != 5) {
             QueryWrapper<WisdWelfare> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("welfare_type",wisdWelfare.getWelfareType());
-            WisdWelfare wisdWelfares=welfareService.getOne(queryWrapper);
-            if (wisdWelfares!=null&&!wisdWelfares.getId().equals(wisdWelfare.getId())){
-                return new Result(ResultUtil.ERROR,"此类型的富文本只能添加一个");
+            queryWrapper.eq("welfare_type", wisdWelfare.getWelfareType());
+            WisdWelfare wisdWelfares = welfareService.getOne(queryWrapper);
+            if (wisdWelfares != null && !wisdWelfares.getId().equals(wisdWelfare.getId())) {
+                return new Result(ResultUtil.ERROR, "此类型的富文本只能添加一个");
             }
         }
-        Boolean flag=welfareService.saveOrUpdate(wisdWelfare);
-        if (flag){
-            return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG);
-        }else {
-            return new Result(ResultUtil.ERROR,ResultUtil.ERROR_MSG);
+        Boolean flag = welfareService.saveOrUpdate(wisdWelfare);
+        if (flag) {
+            return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG);
+        } else {
+            return new Result(ResultUtil.ERROR, ResultUtil.ERROR_MSG);
         }
     }
 
diff --git a/src/main/java/com/wisdo/mmining/controller/WisdUserController.java b/src/main/java/com/wisdo/mmining/controller/WisdUserController.java
index 13edc4e..ab33076 100644
--- a/src/main/java/com/wisdo/mmining/controller/WisdUserController.java
+++ b/src/main/java/com/wisdo/mmining/controller/WisdUserController.java
@@ -5,26 +5,26 @@ import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.wisdo.mmining.controller.vo.UserVo;
 import com.wisdo.mmining.entity.*;
 import com.wisdo.mmining.result.Result;
 import com.wisdo.mmining.result.ResultUtil;
 import com.wisdo.mmining.service.*;
 import com.wisdo.mmining.util.PhoneUtils;
-import com.wisdo.mmining.util.excel.ExcelUntils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-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.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.InputStream;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -52,112 +52,111 @@ public class WisdUserController {
 
 
     @GetMapping(value = "")
-    public String page(Model model){
+    public String page(Model model) {
         Subject subject = SecurityUtils.getSubject();
-        User user= (User) subject.getSession().getAttribute("sys_user");
-        model.addAttribute("obj",user);
-        List<WisdCompany> companyList=companyService.list();
-        model.addAttribute("companyList",companyList);
+        User user = (User) subject.getSession().getAttribute("sys_user");
+        model.addAttribute("obj", user);
+        List<WisdCompany> companyList = companyService.list();
+        model.addAttribute("companyList", companyList);
         return "pages/wisduser/wisduser_list";
     }
 
     @GetMapping(value = "/list")
     @ResponseBody
-    public Result<IPage<WisdUser>> list(Long companyId,String userName,String userPhone, int page, int num){
-        IPage<WisdUser> wisdCompanyIPage = wisdUserService.selectPage(companyId,userName,userPhone,page, num);
-        return new Result<IPage<WisdUser>>(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wisdCompanyIPage);
+    public Result<IPage<WisdUser>> list(Long companyId, String userName, String userPhone, int page, int num) {
+        IPage<WisdUser> wisdCompanyIPage = wisdUserService.selectPage(companyId, userName, userPhone, page, num);
+        return new Result<IPage<WisdUser>>(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wisdCompanyIPage);
     }
 
     @GetMapping(value = "/getPackageList")
     @ResponseBody
-    public Result getList(Long id,Long deptId){
+    public Result getList(Long id, Long deptId) {
         QueryWrapper<WisdUser> queryWrapper1 = new QueryWrapper<>();
         Subject subject = SecurityUtils.getSubject();
-        User user= (User) subject.getSession().getAttribute("sys_user");
-        queryWrapper1.eq("company_id",user.getCompanyId());
-        if (deptId!=null && deptId!=0){
-            queryWrapper1.eq("dept_id",deptId);
+        User user = (User) subject.getSession().getAttribute("sys_user");
+        queryWrapper1.eq("company_id", user.getCompanyId());
+        if (deptId != null && deptId != 0) {
+            queryWrapper1.eq("dept_id", deptId);
         }
         queryWrapper1.eq("user_is_departure", 0);
-        List<WisdUser> wisdUserList=wisdUserService.list(queryWrapper1);
-        List<WisdUser> wisdUserList1=new ArrayList<>();
-        for (WisdUser wisdUser:wisdUserList){
+        List<WisdUser> wisdUserList = wisdUserService.list(queryWrapper1);
+        List<WisdUser> wisdUserList1 = new ArrayList<>();
+        for (WisdUser wisdUser : wisdUserList) {
             QueryWrapper<WisdUserPackage> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("user_id",wisdUser.getId());
-            queryWrapper.eq("package_id",id);
-            List<WisdUserPackage> wisdUserPackageList=userPackageService.list(queryWrapper);
-            if (wisdUserPackageList.size()==0){
-                wisdUser.setUserName(wisdUser.getUserName()+wisdUser.getUserPhone());
+            queryWrapper.eq("user_id", wisdUser.getId());
+            queryWrapper.eq("package_id", id);
+            List<WisdUserPackage> wisdUserPackageList = userPackageService.list(queryWrapper);
+            if (wisdUserPackageList.size() == 0) {
+                wisdUser.setUserName(wisdUser.getUserName() + wisdUser.getUserPhone());
                 wisdUserList1.add(wisdUser);
             }
         }
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wisdUserList1);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wisdUserList1);
     }
 
     @GetMapping(value = "/getVolumeList")
     @ResponseBody
-    public Result getVolumeList(Long id,Long deptId){
+    public Result getVolumeList(Long id, Long deptId) {
         QueryWrapper<WisdUser> queryWrapper1 = new QueryWrapper<>();
         Subject subject = SecurityUtils.getSubject();
-        User user= (User) subject.getSession().getAttribute("sys_user");
-        queryWrapper1.eq("company_id",user.getCompanyId());
-        if (deptId!=null && deptId!=0){
-            queryWrapper1.eq("dept_id",deptId);
+        User user = (User) subject.getSession().getAttribute("sys_user");
+        queryWrapper1.eq("company_id", user.getCompanyId());
+        if (deptId != null && deptId != 0) {
+            queryWrapper1.eq("dept_id", deptId);
         }
         queryWrapper1.eq("user_is_departure", 0);
-        List<WisdUser> wisdUserList=wisdUserService.list(queryWrapper1);
-        List<WisdUser> wisdUserList1=new ArrayList<>();
-        for (WisdUser wisdUser:wisdUserList){
+        List<WisdUser> wisdUserList = wisdUserService.list(queryWrapper1);
+        List<WisdUser> wisdUserList1 = new ArrayList<>();
+        for (WisdUser wisdUser : wisdUserList) {
             QueryWrapper<WisdUserVolume> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("user_id",wisdUser.getId());
-            queryWrapper.eq("volume_id",id);
-            List<WisdUserVolume> wisdUserPackageList=userVolumeService.list(queryWrapper);
-            if (wisdUserPackageList.size()==0){
-                wisdUser.setUserName(wisdUser.getUserName()+wisdUser.getUserPhone());
+            queryWrapper.eq("user_id", wisdUser.getId());
+            queryWrapper.eq("volume_id", id);
+            List<WisdUserVolume> wisdUserPackageList = userVolumeService.list(queryWrapper);
+            if (wisdUserPackageList.size() == 0) {
+                wisdUser.setUserName(wisdUser.getUserName() + wisdUser.getUserPhone());
                 wisdUserList1.add(wisdUser);
             }
         }
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wisdUserList1);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wisdUserList1);
     }
 
 
     @GetMapping(value = "edit")
-    public String edit(Model model, Long id){
-        List<WisdCompany> companyList=companyService.list();
-        model.addAttribute("companyList",companyList);
-        if (id!=null){
+    public String edit(Model model, Long id) {
+        List<WisdCompany> companyList = companyService.list();
+        model.addAttribute("companyList", companyList);
+        if (id != null) {
             WisdUser wisdUser = wisdUserService.getByUserId(id);
-            model.addAttribute("obj",wisdUser);
+            model.addAttribute("obj", wisdUser);
             QueryWrapper<WisdDept> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("company_id",wisdUser.getCompanyId());
-            List<WisdDept> deptList=deptService.list(queryWrapper);
-            model.addAttribute("deptList",deptList);
+            queryWrapper.eq("company_id", wisdUser.getCompanyId());
+            List<WisdDept> deptList = deptService.list(queryWrapper);
+            model.addAttribute("deptList", deptList);
         }
         return "pages/wisduser/wisduser_edit";
     }
 
     /**
+     * 文件导入跳转页面
      *
-     *  文件导入跳转页面
-     * @author hjw
-     * @date 2020/8/25
      * @param
      * @return org.springframework.web.servlet.ModelAndView
-     *
+     * @author hjw
+     * @date 2020/8/25
      */
     @GetMapping("submit")
     public ModelAndView submit() {
         ModelAndView modelAndView = new ModelAndView("pages/wisduser/wisduser_import");
         Subject subject = SecurityUtils.getSubject();
-        User user= (User) subject.getSession().getAttribute("sys_user");
-        if (user.getCompanyId()==0){
-            List<WisdCompany> companyList=companyService.list();
-            modelAndView.addObject("companyList",companyList);
-        }else {
+        User user = (User) subject.getSession().getAttribute("sys_user");
+        if (user.getCompanyId() == 0) {
+            List<WisdCompany> companyList = companyService.list();
+            modelAndView.addObject("companyList", companyList);
+        } else {
             QueryWrapper<WisdDept> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("company_id",user.getCompanyId());
-            List<WisdDept> deptList=deptService.list(queryWrapper);
-            modelAndView.addObject("deptList",deptList);
+            queryWrapper.eq("company_id", user.getCompanyId());
+            List<WisdDept> deptList = deptService.list(queryWrapper);
+            modelAndView.addObject("deptList", deptList);
         }
 
 //        List<SubjectLevel> subjectLevelPage = subjectLevelService.selectonesubject();
@@ -167,69 +166,69 @@ public class WisdUserController {
 
     @ResponseBody
     @RequestMapping("inwprd")
-    public Result importExcel(MultipartFile file, String companyId,String deptId,
+    public Result importExcel(MultipartFile file, String companyId, String deptId,
                               HttpServletRequest request) throws Exception {
 
         InputStream inputStream = file.getInputStream();
-        if (inputStream!=null){
-            return  wisdUserService.importUser(file,inputStream,companyId,deptId);
-        }else{
-            return new Result(ResultUtil.ERROR,"未选择文件");
+        if (inputStream != null) {
+            return wisdUserService.importUser(file, inputStream, companyId, deptId);
+        } else {
+            return new Result(ResultUtil.ERROR, "未选择文件");
         }
     }
 
     @GetMapping(value = "add")
-    public String add(Model model){
-        List<WisdCompany> companyList=companyService.list();
-        model.addAttribute("companyList",companyList);
+    public String add(Model model) {
+        List<WisdCompany> companyList = companyService.list();
+        model.addAttribute("companyList", companyList);
         Subject subject = SecurityUtils.getSubject();
-        User user= (User) subject.getSession().getAttribute("sys_user");
-        if (user.getCompanyId()!=0){
+        User user = (User) subject.getSession().getAttribute("sys_user");
+        if (user.getCompanyId() != 0) {
             QueryWrapper<WisdDept> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("company_id",user.getCompanyId());
-            List<WisdDept> deptList=deptService.list(queryWrapper);
-            model.addAttribute("deptList",deptList);
+            queryWrapper.eq("company_id", user.getCompanyId());
+            List<WisdDept> deptList = deptService.list(queryWrapper);
+            model.addAttribute("deptList", deptList);
         }
         return "pages/wisduser/wisduser_add";
     }
 
     @PostMapping(value = "save")
     @ResponseBody
-    public Result save(WisdUser wisdUser){
-        if (!PhoneUtils.isPhoneLegal(wisdUser.getUserPhone())){
-            return new Result(ResultUtil.ERROR,"请输入正确手机号");
+    public Result save(WisdUser wisdUser) {
+        if (!PhoneUtils.isPhoneLegal(wisdUser.getUserPhone())) {
+            return new Result(ResultUtil.ERROR, "请输入正确手机号");
         }
         boolean flag = false;
-        if(wisdUser.getId()==null){
+        if (wisdUser.getId() == null) {
 //            WisdCompany wisdCompany1 = companyService.getByName(wisdCompany.getCompanyName());
 //            if(wisdCompany1!=null){
 //                return ResultUtil.error("已存在");
 //            }
             QueryWrapper<WisdUser> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("user_phone",wisdUser.getUserPhone());
-            queryWrapper.eq("user_is_departure",0);
-            WisdUser wisdUser1=wisdUserService.getOne(queryWrapper);
-            if (wisdUser1!=null){
-                return new Result(ResultUtil.ERROR,"手机号已存在");
+            queryWrapper.eq("user_phone", wisdUser.getUserPhone());
+            queryWrapper.eq("user_is_departure", 0);
+            WisdUser wisdUser1 = wisdUserService.getOne(queryWrapper);
+            if (wisdUser1 != null) {
+                return new Result(ResultUtil.ERROR, "手机号已存在");
             }
-            if (wisdUser.getCompanyId()==null){
+            if (wisdUser.getCompanyId() == null) {
                 Subject subject = SecurityUtils.getSubject();
-                User user= (User) subject.getSession().getAttribute("sys_user");
+                User user = (User) subject.getSession().getAttribute("sys_user");
                 wisdUser.setCompanyId(user.getCompanyId());
             }
             flag = wisdUserService.save(wisdUser);
-        }else{
+        } else {
             QueryWrapper<WisdUser> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("user_phone",wisdUser.getUserPhone());
-            queryWrapper.eq("user_is_departure",0);
-            WisdUser wisdUser1=wisdUserService.getOne(queryWrapper);
-            if (wisdUser1!=null && !wisdUser1.getId().equals(wisdUser.getId())){
-                return new Result(ResultUtil.ERROR,"手机号已存在");
+            queryWrapper.eq("user_phone", wisdUser.getUserPhone());
+            queryWrapper.eq("user_is_departure", 0);
+            WisdUser wisdUser1 = wisdUserService.getOne(queryWrapper);
+            if (wisdUser1 != null && !wisdUser1.getId().equals(wisdUser.getId())) {
+                return new Result(ResultUtil.ERROR, "手机号已存在");
             }
             flag = wisdUserService.updateById(wisdUser);
         }
-        if(flag){
-            return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG);
+        if (flag) {
+            return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG);
         }
         return ResultUtil.error();
     }
@@ -275,20 +274,20 @@ public class WisdUserController {
     }
 
     @GetMapping(value = "upateDeptjsp")
-    public String upateDeptjsp(Model model,String ids){
+    public String upateDeptjsp(Model model, String ids) {
         Subject subject = SecurityUtils.getSubject();
-        User user= (User) subject.getSession().getAttribute("sys_user");
+        User user = (User) subject.getSession().getAttribute("sys_user");
         QueryWrapper<WisdDept> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("company_id",user.getCompanyId());
-        List<WisdDept> deptList=deptService.list(queryWrapper);
-        model.addAttribute("deptList",deptList);
-        model.addAttribute("ids",ids);
+        queryWrapper.eq("company_id", user.getCompanyId());
+        List<WisdDept> deptList = deptService.list(queryWrapper);
+        model.addAttribute("deptList", deptList);
+        model.addAttribute("ids", ids);
         return "pages/wisduser/wisduser_dept";
     }
 
     @PostMapping(value = "upateDept")
     @ResponseBody
-    public Result upateDept(String ids,Long deptId) {
+    public Result upateDept(String ids, Long deptId) {
         if (!StringUtils.isEmpty(ids)) {
             String[] idArray = ids.split(",");
             List<Long> idList = new ArrayList<>();
@@ -299,10 +298,10 @@ public class WisdUserController {
                 }
             }
             if (idList.size() > 0) {
-                for (int i=0;i<idList.size();i++){
+                for (int i = 0; i < idList.size(); i++) {
                     UpdateWrapper<WisdUser> queryWrapper = new UpdateWrapper<>();
-                    queryWrapper.eq("id",idList.get(i));
-                    queryWrapper.set("dept_id",deptId);
+                    queryWrapper.eq("id", idList.get(i));
+                    queryWrapper.set("dept_id", deptId);
                     wisdUserService.update(queryWrapper);
                 }
                 return ResultUtil.success();
diff --git a/src/main/java/com/wisdo/mmining/controller/WithdrawalController.java b/src/main/java/com/wisdo/mmining/controller/WithdrawalController.java
index f7a2aa4..12b9afb 100644
--- a/src/main/java/com/wisdo/mmining/controller/WithdrawalController.java
+++ b/src/main/java/com/wisdo/mmining/controller/WithdrawalController.java
@@ -1,34 +1,15 @@
 package com.wisdo.mmining.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.baomidou.mybatisplus.core.metadata.IPage;
-import com.wisdo.mmining.entity.*;
+import com.wisdo.mmining.entity.WisdIntegrlRoles;
+import com.wisdo.mmining.entity.WisdWithdrawal;
+import com.wisdo.mmining.entity.WisdWxuser;
 import com.wisdo.mmining.result.Result;
 import com.wisdo.mmining.result.ResultUtil;
 import com.wisdo.mmining.service.IntegralRolesService;
 import com.wisdo.mmining.service.WithdrawalService;
 import com.wisdo.mmining.service.WxuserService;
-import com.wisdo.mmining.util.CommonUtil;
-import com.wisdo.mmining.utils.CreateStrUtil;
-import com.wisdo.mmining.utils.PayUtil;
-import com.wisdo.mmining.utils.WxUtil;
 import com.wisdo.mmining.weixin.WeiXinPayConfig;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.http.HttpEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.conn.ssl.SSLContexts;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
-import org.mybatis.logging.Logger;
-import org.mybatis.logging.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -37,13 +18,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import javax.net.ssl.SSLContext;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.UnsupportedEncodingException;
-import java.math.BigDecimal;
-import java.security.KeyStore;
-import java.util.*;
+import java.util.Map;
 
 /**
  * @Auther: cg
@@ -62,22 +37,22 @@ public class WithdrawalController {
     private WxuserService wxuserService;
 
     @GetMapping(value = "")
-    public String page(){
+    public String page() {
         return "pages/withdrawal/withdrawal_list";
     }
 
     @GetMapping(value = "/list")
     @ResponseBody
-    public Result<IPage<WisdWithdrawal>> list(int page, int num){
+    public Result<IPage<WisdWithdrawal>> list(int page, int num) {
         IPage<WisdWithdrawal> wisdWithdrawalIPage = withdrawalService.selectPage(page, num);
-        return new Result<IPage<WisdWithdrawal>>(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wisdWithdrawalIPage);
+        return new Result<IPage<WisdWithdrawal>>(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wisdWithdrawalIPage);
     }
 
     @GetMapping(value = "edit")
-    public String edit(Model model, Long id){
-        if (id!=null){
+    public String edit(Model model, Long id) {
+        if (id != null) {
             WisdWithdrawal wisdWithdrawal = withdrawalService.getById(id);
-            model.addAttribute("obj",wisdWithdrawal);
+            model.addAttribute("obj", wisdWithdrawal);
         }
         return "pages/withdrawal/withdrawal_edit";
     }
@@ -85,23 +60,23 @@ public class WithdrawalController {
 
     @PostMapping(value = "audit")
     @ResponseBody
-    public Result deleteByIds(Long id,Integer type) {
+    public Result deleteByIds(Long id, Integer type) {
         WisdWithdrawal wisdWithdrawal = withdrawalService.getById(id);
-        WisdIntegrlRoles wisdIntegrlRoles=integralRolesService.getById(1);
-        if (type==2){
+        WisdIntegrlRoles wisdIntegrlRoles = integralRolesService.getById(1);
+        if (type == 2) {
             wisdWithdrawal.setStatus(3);
-            Boolean flag1= withdrawalService.saveOrUpdate(wisdWithdrawal);
+            Boolean flag1 = withdrawalService.saveOrUpdate(wisdWithdrawal);
             if (flag1) {
                 WisdWxuser wisdWxuser = wxuserService.getById(wisdWithdrawal.getUserId());
                 wisdWxuser.setUserBalance(wisdWxuser.getUserBalance().add(wisdWithdrawal.getWithdrawalMoney()));
                 Boolean flag2 = wxuserService.saveOrUpdate(wisdWxuser);
             }
-            if (flag1){
+            if (flag1) {
                 return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG);
-            }else {
+            } else {
                 return new Result(ResultUtil.ERROR, ResultUtil.ERROR_MSG);
             }
-        }else {
+        } else {
             if (wisdIntegrlRoles.getIsWithdrawal() == 1) {
                 try {
                     Map<String, String> map = withdrawalService.wxCashBank(wisdWithdrawal.getWithdrawalNumber(), wisdWithdrawal.getWithdrawalCardNumber(), wisdWithdrawal.getWithdrawalUserName(), wisdWithdrawal.getWithdrawalCardNo().toString(), wisdWithdrawal.getWithdrawalMoney(), WeiXinPayConfig.mch_id, null);
@@ -127,11 +102,4 @@ public class WithdrawalController {
     }
 
 
-
-
-
-
-
-
-
 }
diff --git a/src/main/java/com/wisdo/mmining/controller/WxUserController.java b/src/main/java/com/wisdo/mmining/controller/WxUserController.java
index 55b0d8a..2ec1160 100644
--- a/src/main/java/com/wisdo/mmining/controller/WxUserController.java
+++ b/src/main/java/com/wisdo/mmining/controller/WxUserController.java
@@ -1,16 +1,13 @@
 package com.wisdo.mmining.controller;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.wisdo.mmining.entity.*;
+import com.wisdo.mmining.entity.WisdCompany;
+import com.wisdo.mmining.entity.WisdStores;
+import com.wisdo.mmining.entity.WisdWxuser;
 import com.wisdo.mmining.result.Result;
 import com.wisdo.mmining.result.ResultUtil;
 import com.wisdo.mmining.service.*;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -19,7 +16,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -44,68 +40,68 @@ public class WxUserController {
 
 
     @GetMapping(value = "")
-    public String page(){
+    public String page() {
         return "pages/wxuser/wxuser_list";
     }
 
     @GetMapping(value = "/pagestores")
-    public String pagestores(){
+    public String pagestores() {
         return "pages/wxuser/wxuser_stores_list";
     }
 
     @GetMapping(value = "/list")
     @ResponseBody
-    public Result<IPage<WisdWxuser>> list(String wxNickname, String userPhone,int page, int num){
-        IPage<WisdWxuser> wxuserIPage = wxuserService.selectPage(wxNickname,userPhone,page, num);
-        return new Result<IPage<WisdWxuser>>(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wxuserIPage);
+    public Result<IPage<WisdWxuser>> list(String wxNickname, String userPhone, int page, int num) {
+        IPage<WisdWxuser> wxuserIPage = wxuserService.selectPage(wxNickname, userPhone, page, num);
+        return new Result<IPage<WisdWxuser>>(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wxuserIPage);
     }
 
     @GetMapping(value = "/storeslist")
     @ResponseBody
-    public Result<IPage<WisdWxuser>> storeslist(String wxNickname, String userPhone,int page, int num){
-        IPage<WisdWxuser> wxuserIPage = wxuserService.storeslist(wxNickname,userPhone,page, num);
-        return new Result<IPage<WisdWxuser>>(ResultUtil.SUCCESS,ResultUtil.SUCCESS_DATA,wxuserIPage);
+    public Result<IPage<WisdWxuser>> storeslist(String wxNickname, String userPhone, int page, int num) {
+        IPage<WisdWxuser> wxuserIPage = wxuserService.storeslist(wxNickname, userPhone, page, num);
+        return new Result<IPage<WisdWxuser>>(ResultUtil.SUCCESS, ResultUtil.SUCCESS_DATA, wxuserIPage);
     }
 
     @GetMapping(value = "edit")
-    public String edit(Model model, Long id){
-        if (id!=null){
+    public String edit(Model model, Long id) {
+        if (id != null) {
             WisdWxuser wisdWxuser = wxuserService.getById(id);
-            model.addAttribute("obj",wisdWxuser);
+            model.addAttribute("obj", wisdWxuser);
         }
-        List<WisdCompany> companyList=companyService.list();
-        model.addAttribute("companyList",companyList);
+        List<WisdCompany> companyList = companyService.list();
+        model.addAttribute("companyList", companyList);
         return "pages/wxuser/wxuser_edit";
     }
 
     @GetMapping(value = "stores")
-    public String stores(Model model, Long id){
-        if (id!=null){
+    public String stores(Model model, Long id) {
+        if (id != null) {
             WisdWxuser wisdWxuser = wxuserService.getById(id);
-            model.addAttribute("obj",wisdWxuser);
+            model.addAttribute("obj", wisdWxuser);
         }
-        List<WisdStores> storesList=storesService.list();
-        model.addAttribute("storesList",storesList);
+        List<WisdStores> storesList = storesService.list();
+        model.addAttribute("storesList", storesList);
         return "pages/wxuser/wxuser_stores";
     }
 
     @PostMapping(value = "save")
     @ResponseBody
-    public Result save(WisdWxuser wxuser){
+    public Result save(WisdWxuser wxuser) {
         boolean flag = false;
-        if(wxuser.getId()==null){
+        if (wxuser.getId() == null) {
             QueryWrapper<WisdWxuser> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("user_phone",wxuser.getUserPhone());
-            WisdWxuser wxuser1=wxuserService.getOne(queryWrapper);
-            if (wxuser1!=null&&wxuser1.getId()!=wxuser.getId()){
-                return new Result(ResultUtil.ERROR,"电话号码已存在");
+            queryWrapper.eq("user_phone", wxuser.getUserPhone());
+            WisdWxuser wxuser1 = wxuserService.getOne(queryWrapper);
+            if (wxuser1 != null && wxuser1.getId() != wxuser.getId()) {
+                return new Result(ResultUtil.ERROR, "电话号码已存在");
             }
             flag = wxuserService.save(wxuser);
-        }else{
+        } else {
             flag = wxuserService.updateById(wxuser);
         }
-        if(flag){
-            return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG);
+        if (flag) {
+            return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG);
         }
         return ResultUtil.error();
     }
diff --git a/src/main/java/com/wisdo/mmining/controller/dto/DeliveryRefundMoneyDto.java b/src/main/java/com/wisdo/mmining/controller/dto/DeliveryRefundMoneyDto.java
new file mode 100644
index 0000000..032b899
--- /dev/null
+++ b/src/main/java/com/wisdo/mmining/controller/dto/DeliveryRefundMoneyDto.java
@@ -0,0 +1,12 @@
+package com.wisdo.mmining.controller.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DeliveryRefundMoneyDto {
+    private Long orderId;
+    private String logisticsName;
+    private List<PackageDto> logistics;
+}
diff --git a/src/main/java/com/wisdo/mmining/controller/dto/RefundRemarkesDto.java b/src/main/java/com/wisdo/mmining/controller/dto/RefundRemarkesDto.java
new file mode 100644
index 0000000..e7827f6
--- /dev/null
+++ b/src/main/java/com/wisdo/mmining/controller/dto/RefundRemarkesDto.java
@@ -0,0 +1,11 @@
+package com.wisdo.mmining.controller.dto;
+
+import lombok.Data;
+
+@Data
+public class RefundRemarkesDto {
+    private Long orderId;
+    private Integer agree;
+    private Integer type;
+    private String orderRefundRemarke;
+}
diff --git a/src/main/java/com/wisdo/mmining/controller/vo/BlukVo.java b/src/main/java/com/wisdo/mmining/controller/vo/BlukVo.java
index 63ad2a4..4ff6194 100644
--- a/src/main/java/com/wisdo/mmining/controller/vo/BlukVo.java
+++ b/src/main/java/com/wisdo/mmining/controller/vo/BlukVo.java
@@ -1,6 +1,5 @@
 package com.wisdo.mmining.controller.vo;
 
-import com.wisdo.mmining.entity.WisdGoods;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -11,7 +10,7 @@ import java.math.BigDecimal;
  * @Description:
  */
 @Data
-public class BlukVo{
+public class BlukVo {
 
     private String goodsName;
 
diff --git a/src/main/java/com/wisdo/mmining/entity/City.java b/src/main/java/com/wisdo/mmining/entity/City.java
index 0aaa665..5ab6140 100644
--- a/src/main/java/com/wisdo/mmining/entity/City.java
+++ b/src/main/java/com/wisdo/mmining/entity/City.java
@@ -12,7 +12,7 @@ import org.apache.solr.client.solrj.beans.Field;
 public class City {
 
     @Field("cid")
-    private  Integer cid;
+    private Integer cid;
 
     @Field("city")
     private String city;
diff --git a/src/main/java/com/wisdo/mmining/entity/ExceptionLog.java b/src/main/java/com/wisdo/mmining/entity/ExceptionLog.java
index 01abc16..911b259 100644
--- a/src/main/java/com/wisdo/mmining/entity/ExceptionLog.java
+++ b/src/main/java/com/wisdo/mmining/entity/ExceptionLog.java
@@ -19,36 +19,36 @@ import java.util.Date;
  * @see com.wisdo.mmining.entity <br>
  */
 @Data
-@ApiModel(value="TExceptionLog", description="")
+@ApiModel(value = "TExceptionLog", description = "")
 @TableName(value = "t_exception_log")
 public class ExceptionLog implements Serializable {
 
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
-private Integer isDeleted;
+    private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
 
     private String excRequParam;
diff --git a/src/main/java/com/wisdo/mmining/entity/OperationLog.java b/src/main/java/com/wisdo/mmining/entity/OperationLog.java
index 4f3c1c6..3415ccf 100644
--- a/src/main/java/com/wisdo/mmining/entity/OperationLog.java
+++ b/src/main/java/com/wisdo/mmining/entity/OperationLog.java
@@ -19,36 +19,36 @@ import java.util.Date;
  * @see com.wisdo.mmining.entity <br>
  */
 @Data
-@ApiModel(value="TOperationLog对象", description="")
+@ApiModel(value = "TOperationLog对象", description = "")
 @TableName(value = "t_operation_log")
 public class OperationLog implements Serializable {
 
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
-private Integer isDeleted;
+    private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
 
     private String operModul;
diff --git a/src/main/java/com/wisdo/mmining/entity/Permission.java b/src/main/java/com/wisdo/mmining/entity/Permission.java
index 6607fcc..f276e3a 100644
--- a/src/main/java/com/wisdo/mmining/entity/Permission.java
+++ b/src/main/java/com/wisdo/mmining/entity/Permission.java
@@ -1,22 +1,21 @@
 package com.wisdo.mmining.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
-
-import java.util.Date;
-
-import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author hjw
  * @since 2020-07-15
  */
-@ApiModel(value="TPermission对象", description="")
+@ApiModel(value = "TPermission对象", description = "")
 @TableName(value = "t_permission")
 public class Permission implements Serializable {
 
@@ -25,25 +24,25 @@ public class Permission implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
-private Integer isDeleted;
+    private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
 
     @ApiModelProperty(value = "类型0一级菜单1二级菜单2按钮")
@@ -69,6 +68,7 @@ private Integer isDeleted;
     public void setId(Long id) {
         this.id = id;
     }
+
     public String getCreateUser() {
         return createUser;
     }
@@ -76,6 +76,7 @@ private Integer isDeleted;
     public void setCreateUser(String createUser) {
         this.createUser = createUser;
     }
+
     public Date getCreateTime() {
         return createTime;
     }
@@ -83,6 +84,7 @@ private Integer isDeleted;
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
+
     public Integer getIsDeleted() {
         return isDeleted;
     }
@@ -90,6 +92,7 @@ private Integer isDeleted;
     public void setIsDeleted(Integer isDeleted) {
         this.isDeleted = isDeleted;
     }
+
     public String getUpdateUser() {
         return updateUser;
     }
@@ -97,6 +100,7 @@ private Integer isDeleted;
     public void setUpdateUser(String updateUser) {
         this.updateUser = updateUser;
     }
+
     public Date getUpdateTime() {
         return updateTime;
     }
@@ -104,6 +108,7 @@ private Integer isDeleted;
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
     public Integer getVersion() {
         return version;
     }
@@ -111,6 +116,7 @@ private Integer isDeleted;
     public void setVersion(Integer version) {
         this.version = version;
     }
+
     public Integer getType() {
         return type;
     }
@@ -118,6 +124,7 @@ private Integer isDeleted;
     public void setType(Integer type) {
         this.type = type;
     }
+
     public Long getPid() {
         return pid;
     }
@@ -125,6 +132,7 @@ private Integer isDeleted;
     public void setPid(Long pid) {
         this.pid = pid;
     }
+
     public String getName() {
         return name;
     }
@@ -132,6 +140,7 @@ private Integer isDeleted;
     public void setName(String name) {
         this.name = name;
     }
+
     public String getCode() {
         return code;
     }
@@ -139,6 +148,7 @@ private Integer isDeleted;
     public void setCode(String code) {
         this.code = code;
     }
+
     public String getIcon() {
         return icon;
     }
@@ -146,6 +156,7 @@ private Integer isDeleted;
     public void setIcon(String icon) {
         this.icon = icon;
     }
+
     public Integer getSort() {
         return sort;
     }
@@ -153,6 +164,7 @@ private Integer isDeleted;
     public void setSort(Integer sort) {
         this.sort = sort;
     }
+
     public String getPath() {
         return path;
     }
@@ -164,20 +176,20 @@ private Integer isDeleted;
     @Override
     public String toString() {
         return "TPermission{" +
-            "id=" + id +
-            ", createUser=" + createUser +
-            ", createTime=" + createTime +
-            ", isDeleted=" + isDeleted +
-            ", updateUser=" + updateUser +
-            ", updateTime=" + updateTime +
-            ", version=" + version +
-            ", type=" + type +
-            ", pid=" + pid +
-            ", name=" + name +
-            ", code=" + code +
-            ", icon=" + icon +
-            ", sort=" + sort +
-            ", path=" + path +
-        "}";
+                "id=" + id +
+                ", createUser=" + createUser +
+                ", createTime=" + createTime +
+                ", isDeleted=" + isDeleted +
+                ", updateUser=" + updateUser +
+                ", updateTime=" + updateTime +
+                ", version=" + version +
+                ", type=" + type +
+                ", pid=" + pid +
+                ", name=" + name +
+                ", code=" + code +
+                ", icon=" + icon +
+                ", sort=" + sort +
+                ", path=" + path +
+                "}";
     }
 }
diff --git a/src/main/java/com/wisdo/mmining/entity/Role.java b/src/main/java/com/wisdo/mmining/entity/Role.java
index cc98a30..27f5a52 100644
--- a/src/main/java/com/wisdo/mmining/entity/Role.java
+++ b/src/main/java/com/wisdo/mmining/entity/Role.java
@@ -1,25 +1,23 @@
 package com.wisdo.mmining.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
-
-import java.util.Date;
-
-import java.io.Serializable;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author hjw
  * @since 2020-07-15
  */
-@ApiModel(value="TRole对象", description="")
+@ApiModel(value = "TRole对象", description = "")
 @TableName(value = "t_role")
 public class Role implements Serializable {
 
@@ -28,29 +26,29 @@ public class Role implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
-private Integer isDeleted;
+    private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
 
     private String name;
@@ -64,6 +62,7 @@ private Integer isDeleted;
     public void setId(Long id) {
         this.id = id;
     }
+
     public String getCreateUser() {
         return createUser;
     }
@@ -71,6 +70,7 @@ private Integer isDeleted;
     public void setCreateUser(String createUser) {
         this.createUser = createUser;
     }
+
     public Date getCreateTime() {
         return createTime;
     }
@@ -78,6 +78,7 @@ private Integer isDeleted;
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
+
     public Integer getIsDeleted() {
         return isDeleted;
     }
@@ -85,6 +86,7 @@ private Integer isDeleted;
     public void setIsDeleted(Integer isDeleted) {
         this.isDeleted = isDeleted;
     }
+
     public String getUpdateUser() {
         return updateUser;
     }
@@ -92,6 +94,7 @@ private Integer isDeleted;
     public void setUpdateUser(String updateUser) {
         this.updateUser = updateUser;
     }
+
     public Date getUpdateTime() {
         return updateTime;
     }
@@ -99,6 +102,7 @@ private Integer isDeleted;
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
     public Integer getVersion() {
         return version;
     }
@@ -106,6 +110,7 @@ private Integer isDeleted;
     public void setVersion(Integer version) {
         this.version = version;
     }
+
     public String getName() {
         return name;
     }
@@ -113,6 +118,7 @@ private Integer isDeleted;
     public void setName(String name) {
         this.name = name;
     }
+
     public String getRemarks() {
         return remarks;
     }
@@ -124,15 +130,15 @@ private Integer isDeleted;
     @Override
     public String toString() {
         return "TRole{" +
-            "id=" + id +
-            ", createUser=" + createUser +
-            ", createTime=" + createTime +
-            ", isDeleted=" + isDeleted +
-            ", updateUser=" + updateUser +
-            ", updateTime=" + updateTime +
-            ", version=" + version +
-            ", name=" + name +
-            ", remarks=" + remarks +
-        "}";
+                "id=" + id +
+                ", createUser=" + createUser +
+                ", createTime=" + createTime +
+                ", isDeleted=" + isDeleted +
+                ", updateUser=" + updateUser +
+                ", updateTime=" + updateTime +
+                ", version=" + version +
+                ", name=" + name +
+                ", remarks=" + remarks +
+                "}";
     }
 }
diff --git a/src/main/java/com/wisdo/mmining/entity/RolePermission.java b/src/main/java/com/wisdo/mmining/entity/RolePermission.java
index b7d1091..ab7aca8 100644
--- a/src/main/java/com/wisdo/mmining/entity/RolePermission.java
+++ b/src/main/java/com/wisdo/mmining/entity/RolePermission.java
@@ -1,20 +1,19 @@
 package com.wisdo.mmining.entity;
 
-import java.io.Serializable;
-
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author hjw
  * @since 2020-07-15
  */
-@ApiModel(value="TRolePermission对象", description="")
+@ApiModel(value = "TRolePermission对象", description = "")
 @TableName(value = "t_role_permission")
 public class RolePermission implements Serializable {
 
@@ -31,6 +30,7 @@ public class RolePermission implements Serializable {
     public void setRoleId(Long roleId) {
         this.roleId = roleId;
     }
+
     public Long getPermissionId() {
         return permissionId;
     }
@@ -42,8 +42,8 @@ public class RolePermission implements Serializable {
     @Override
     public String toString() {
         return "TRolePermission{" +
-            "roleId=" + roleId +
-            ", permissionId=" + permissionId +
-        "}";
+                "roleId=" + roleId +
+                ", permissionId=" + permissionId +
+                "}";
     }
 }
diff --git a/src/main/java/com/wisdo/mmining/entity/User.java b/src/main/java/com/wisdo/mmining/entity/User.java
index 702956d..6cecdbd 100644
--- a/src/main/java/com/wisdo/mmining/entity/User.java
+++ b/src/main/java/com/wisdo/mmining/entity/User.java
@@ -1,26 +1,24 @@
 package com.wisdo.mmining.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
-
-import java.util.Date;
-
-import java.io.Serializable;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author hjw
  * @since 2020-07-15
  */
-@ApiModel(value="TUser对象", description="")
+@ApiModel(value = "TUser对象", description = "")
 @TableName(value = "t_user")
 @Data
 public class User implements Serializable {
@@ -31,29 +29,29 @@ public class User implements Serializable {
     private Long id;
 
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
-private Integer isDeleted;
+    private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     @Version
     private Integer version;
 
diff --git a/src/main/java/com/wisdo/mmining/entity/WisdAbout.java b/src/main/java/com/wisdo/mmining/entity/WisdAbout.java
index 8d4ded4..089a256 100644
--- a/src/main/java/com/wisdo/mmining/entity/WisdAbout.java
+++ b/src/main/java/com/wisdo/mmining/entity/WisdAbout.java
@@ -16,7 +16,7 @@ import java.util.Date;
  * @author makejava
  * @since 2020-10-12 18:07:48
  */
-@ApiModel(value="wisd_about对象", description="")
+@ApiModel(value = "wisd_about对象", description = "")
 @TableName(value = "wisd_about")
 @Data
 public class WisdAbout implements Serializable {
@@ -26,30 +26,30 @@ public class WisdAbout implements Serializable {
     private Long id;
 
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
     private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
     /**
      * 关于我们富文本
@@ -57,4 +57,4 @@ public class WisdAbout implements Serializable {
     private Object aboutContent;
 
 
-    }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/main/java/com/wisdo/mmining/entity/WisdBack.java b/src/main/java/com/wisdo/mmining/entity/WisdBack.java
index 670f9a8..12dd94e 100644
--- a/src/main/java/com/wisdo/mmining/entity/WisdBack.java
+++ b/src/main/java/com/wisdo/mmining/entity/WisdBack.java
@@ -16,7 +16,7 @@ import java.util.Date;
  * @author makejava
  * @since 2020-10-09 09:39:22
  */
-@ApiModel(value="wisd_back对象", description="")
+@ApiModel(value = "wisd_back对象", description = "")
 @TableName(value = "wisd_back")
 @Data
 public class WisdBack implements Serializable {
@@ -26,30 +26,30 @@ public class WisdBack implements Serializable {
     private Long id;
 
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
-private Integer isDeleted;
+    private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
 
     /**
diff --git a/src/main/java/com/wisdo/mmining/entity/WisdBanner.java b/src/main/java/com/wisdo/mmining/entity/WisdBanner.java
index e4ce183..d8e4d65 100644
--- a/src/main/java/com/wisdo/mmining/entity/WisdBanner.java
+++ b/src/main/java/com/wisdo/mmining/entity/WisdBanner.java
@@ -16,7 +16,7 @@ import java.util.Date;
  * @author makejava
  * @since 2020-10-09 09:39:22
  */
-@ApiModel(value="wisd_banner对象", description="")
+@ApiModel(value = "wisd_banner对象", description = "")
 @TableName(value = "wisd_banner")
 @Data
 public class WisdBanner implements Serializable {
@@ -26,30 +26,30 @@ public class WisdBanner implements Serializable {
     private Long id;
 
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
     private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
 
     /**
diff --git a/src/main/java/com/wisdo/mmining/entity/WisdBill.java b/src/main/java/com/wisdo/mmining/entity/WisdBill.java
index f52b4b2..5ba10e8 100644
--- a/src/main/java/com/wisdo/mmining/entity/WisdBill.java
+++ b/src/main/java/com/wisdo/mmining/entity/WisdBill.java
@@ -17,7 +17,7 @@ import java.util.Date;
  * @author makejava
  * @since 2020-10-12 17:47:15
  */
-@ApiModel(value="wisd_bill对象", description="")
+@ApiModel(value = "wisd_bill对象", description = "")
 @TableName(value = "wisd_bill")
 @Data
 public class WisdBill implements Serializable {
@@ -27,29 +27,29 @@ public class WisdBill implements Serializable {
     private Long id;
 
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
     private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
     /**
      * 现金券数值
@@ -96,4 +96,4 @@ public class WisdBill implements Serializable {
      */
     private String billIntroduction;
 
-    }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/main/java/com/wisdo/mmining/entity/WisdBulk.java b/src/main/java/com/wisdo/mmining/entity/WisdBulk.java
index 3f9c7da..6a44bdc 100644
--- a/src/main/java/com/wisdo/mmining/entity/WisdBulk.java
+++ b/src/main/java/com/wisdo/mmining/entity/WisdBulk.java
@@ -17,7 +17,7 @@ import java.util.Date;
  * @author makejava
  * @since 2020-09-15 16:56:34
  */
-@ApiModel(value="wisd_bulk对象", description="")
+@ApiModel(value = "wisd_bulk对象", description = "")
 @TableName(value = "wisd_bulk")
 @Data
 public class WisdBulk implements Serializable {
@@ -27,30 +27,30 @@ public class WisdBulk implements Serializable {
     private Long id;
 
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
-private Integer isDeleted;
+    private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
     /**
      * 商品id
@@ -75,4 +75,4 @@ private Integer isDeleted;
     private Integer isEnable;
 
 
-    }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/main/java/com/wisdo/mmining/entity/WisdCashVolume.java b/src/main/java/com/wisdo/mmining/entity/WisdCashVolume.java
index c5a7227..3ab94f4 100644
--- a/src/main/java/com/wisdo/mmining/entity/WisdCashVolume.java
+++ b/src/main/java/com/wisdo/mmining/entity/WisdCashVolume.java
@@ -17,7 +17,7 @@ import java.util.Date;
  * @author makejava
  * @since 2020-09-15 16:56:34
  */
-@ApiModel(value="wisd_cash_volume对象", description="")
+@ApiModel(value = "wisd_cash_volume对象", description = "")
 @TableName(value = "wisd_cash_volume")
 @Data
 public class WisdCashVolume implements Serializable {
@@ -27,30 +27,30 @@ public class WisdCashVolume implements Serializable {
     private Long id;
 
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
-private Integer isDeleted;
+    private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
     /**
      * 现金券数值
@@ -89,11 +89,11 @@ private Integer isDeleted;
      */
     private Integer status;
     /**
-     *现金券已发放数量
+     * 现金券已发放数量
      */
     private Integer volumeSendNum;
     /**
-     *现金券剩余数量
+     * 现金券剩余数量
      */
     private Integer volumeRemaNum;
     /**
@@ -102,4 +102,4 @@ private Integer isDeleted;
     @TableField(exist = false)
     private String userId;
 
-    }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/main/java/com/wisdo/mmining/entity/WisdCompany.java b/src/main/java/com/wisdo/mmining/entity/WisdCompany.java
index 9a198a9..4d9d017 100644
--- a/src/main/java/com/wisdo/mmining/entity/WisdCompany.java
+++ b/src/main/java/com/wisdo/mmining/entity/WisdCompany.java
@@ -16,7 +16,7 @@ import java.util.Date;
  * @author makejava
  * @since 2020-09-15 16:56:34
  */
-@ApiModel(value="wisd_company对象", description="")
+@ApiModel(value = "wisd_company对象", description = "")
 @TableName(value = "wisd_company")
 @Data
 public class WisdCompany implements Serializable {
@@ -26,30 +26,30 @@ public class WisdCompany implements Serializable {
     private Long id;
 
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
-private Integer isDeleted;
+    private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
     /**
      * 公司名称
@@ -61,4 +61,4 @@ private Integer isDeleted;
     private Integer companyBluk;
 
 
-    }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/main/java/com/wisdo/mmining/entity/WisdContract.java b/src/main/java/com/wisdo/mmining/entity/WisdContract.java
index b6c9586..3f95653 100644
--- a/src/main/java/com/wisdo/mmining/entity/WisdContract.java
+++ b/src/main/java/com/wisdo/mmining/entity/WisdContract.java
@@ -16,7 +16,7 @@ import java.util.Date;
  * @author makejava
  * @since 2020-12-17 16:25:08
  */
-@ApiModel(value="wisd_contract对象", description="")
+@ApiModel(value = "wisd_contract对象", description = "")
 @TableName(value = "wisd_contract")
 @Data
 public class WisdContract implements Serializable {
@@ -26,31 +26,31 @@ public class WisdContract implements Serializable {
     private Long id;
 
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
     private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
-        /**
+    /**
      * 合同号
      */
 
@@ -58,7 +58,7 @@ public class WisdContract implements Serializable {
     /**
      * 合同开始时间
      */
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date contractStartTime;
 
@@ -67,10 +67,10 @@ public class WisdContract implements Serializable {
      */
     @TableField(exist = false)
     private String contractStartTimes;
-        /**
+    /**
      * 合同结束时间
      */
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date contractEndTime;
     /**
@@ -78,10 +78,10 @@ public class WisdContract implements Serializable {
      */
     @TableField(exist = false)
     private String contractEndTimes;
-        /**
+    /**
      * 商品id
      */
-    
+
     private String goodsId;
 
     /**
@@ -100,4 +100,4 @@ public class WisdContract implements Serializable {
     @TableField(exist = false)
     private String companyName;
 
-    }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/main/java/com/wisdo/mmining/entity/WisdDept.java b/src/main/java/com/wisdo/mmining/entity/WisdDept.java
index ddea9ab..4613ecb 100644
--- a/src/main/java/com/wisdo/mmining/entity/WisdDept.java
+++ b/src/main/java/com/wisdo/mmining/entity/WisdDept.java
@@ -16,7 +16,7 @@ import java.util.Date;
  * @author makejava
  * @since 2020-09-15 16:56:34
  */
-@ApiModel(value="wisd_dept对象", description="")
+@ApiModel(value = "wisd_dept对象", description = "")
 @TableName(value = "wisd_dept")
 @Data
 public class WisdDept implements Serializable {
@@ -26,30 +26,30 @@ public class WisdDept implements Serializable {
     private Long id;
 
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
-private Integer isDeleted;
+    private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
     /**
      * 名称
@@ -67,4 +67,4 @@ private Integer isDeleted;
     private String companyName;
 
 
-    }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/main/java/com/wisdo/mmining/entity/WisdFeedback.java b/src/main/java/com/wisdo/mmining/entity/WisdFeedback.java
index b7c72a8..8e9331d 100644
--- a/src/main/java/com/wisdo/mmining/entity/WisdFeedback.java
+++ b/src/main/java/com/wisdo/mmining/entity/WisdFeedback.java
@@ -16,7 +16,7 @@ import java.util.Date;
  * @author makejava
  * @since 2020-10-12 18:08:07
  */
-@ApiModel(value="wisd_feedback对象", description="")
+@ApiModel(value = "wisd_feedback对象", description = "")
 @TableName(value = "wisd_feedback")
 @Data
 public class WisdFeedback implements Serializable {
@@ -26,30 +26,30 @@ public class WisdFeedback implements Serializable {
     private Long id;
 
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
-private Integer isDeleted;
+    private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
     /**
      * 反馈内容
@@ -73,4 +73,4 @@ private Integer isDeleted;
      */
     private String feedbackReply;
 
-    }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/main/java/com/wisdo/mmining/entity/WisdFreight.java b/src/main/java/com/wisdo/mmining/entity/WisdFreight.java
index 61af64b..b30f1be 100644
--- a/src/main/java/com/wisdo/mmining/entity/WisdFreight.java
+++ b/src/main/java/com/wisdo/mmining/entity/WisdFreight.java
@@ -17,7 +17,7 @@ import java.util.Date;
  * @author makejava
  * @since 2020-10-10 11:21:20
  */
-@ApiModel(value="wisd_freight对象", description="")
+@ApiModel(value = "wisd_freight对象", description = "")
 @TableName(value = "wisd_freight")
 @Data
 public class WisdFreight implements Serializable {
@@ -27,30 +27,30 @@ public class WisdFreight implements Serializable {
     private Long id;
 
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
-private Integer isDeleted;
+    private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
     /**
      * 地区
@@ -65,4 +65,4 @@ private Integer isDeleted;
      */
     private BigDecimal freightPrice;
 
-    }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/main/java/com/wisdo/mmining/entity/WisdGoods.java b/src/main/java/com/wisdo/mmining/entity/WisdGoods.java
index b50d692..5470f76 100644
--- a/src/main/java/com/wisdo/mmining/entity/WisdGoods.java
+++ b/src/main/java/com/wisdo/mmining/entity/WisdGoods.java
@@ -19,7 +19,7 @@ import java.util.List;
  * @author makejava
  * @since 2020-09-15 16:56:34
  */
-@ApiModel(value="wisd_goods对象", description="")
+@ApiModel(value = "wisd_goods对象", description = "")
 @TableName(value = "wisd_goods")
 @Data
 public class WisdGoods implements Serializable {
@@ -30,34 +30,34 @@ public class WisdGoods implements Serializable {
     private Long id;
 
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     @Field("createUser")
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     @Field("createTime")
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
     @Field("isDeleted")
     private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     @Field("updateUser")
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     @Field("updateTime")
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     @Field("version")
     private Integer version;
     /**
diff --git a/src/main/java/com/wisdo/mmining/entity/WisdGoodsSpec.java b/src/main/java/com/wisdo/mmining/entity/WisdGoodsSpec.java
index 7e0d2df..0115fbc 100644
--- a/src/main/java/com/wisdo/mmining/entity/WisdGoodsSpec.java
+++ b/src/main/java/com/wisdo/mmining/entity/WisdGoodsSpec.java
@@ -17,7 +17,7 @@ import java.util.Date;
  * @author makejava
  * @since 2020-09-15 16:56:34
  */
-@ApiModel(value="wisd_goods_spec对象", description="")
+@ApiModel(value = "wisd_goods_spec对象", description = "")
 @TableName(value = "wisd_goods_spec")
 @Data
 public class WisdGoodsSpec implements Serializable {
@@ -27,30 +27,30 @@ public class WisdGoodsSpec implements Serializable {
     private Long id;
 
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
-private Integer isDeleted;
+    private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
     /**
      * 规格名称
@@ -74,7 +74,7 @@ private Integer isDeleted;
     @TableField(exist = false)
     private BigDecimal specBulyPrice;
     /**
-     *  商品id
+     * 商品id
      */
     private Long goodsId;
 
diff --git a/src/main/java/com/wisdo/mmining/entity/WisdGoodsType.java b/src/main/java/com/wisdo/mmining/entity/WisdGoodsType.java
index 4a4d4c5..116fc59 100644
--- a/src/main/java/com/wisdo/mmining/entity/WisdGoodsType.java
+++ b/src/main/java/com/wisdo/mmining/entity/WisdGoodsType.java
@@ -17,7 +17,7 @@ import java.util.List;
  * @author makejava
  * @since 2020-09-15 16:56:34
  */
-@ApiModel(value="wisd_goods_type对象", description="")
+@ApiModel(value = "wisd_goods_type对象", description = "")
 @TableName(value = "wisd_goods_type")
 @Data
 public class WisdGoodsType implements Serializable {
@@ -27,30 +27,30 @@ public class WisdGoodsType implements Serializable {
     private Long id;
 
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
-private Integer isDeleted;
+    private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
     /**
      * 分类名称
diff --git a/src/main/java/com/wisdo/mmining/entity/WisdIntegral.java b/src/main/java/com/wisdo/mmining/entity/WisdIntegral.java
index 0c75a12..2e1f178 100644
--- a/src/main/java/com/wisdo/mmining/entity/WisdIntegral.java
+++ b/src/main/java/com/wisdo/mmining/entity/WisdIntegral.java
@@ -16,7 +16,7 @@ import java.util.Date;
  * @author makejava
  * @since 2020-09-15 16:56:34
  */
-@ApiModel(value="wisd_integral对象", description="")
+@ApiModel(value = "wisd_integral对象", description = "")
 @TableName(value = "wisd_integral")
 @Data
 public class WisdIntegral implements Serializable {
@@ -26,30 +26,30 @@ public class WisdIntegral implements Serializable {
     private Long id;
 
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
-private Integer isDeleted;
+    private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
     /**
      * 积分等级名称
@@ -65,4 +65,4 @@ private Integer isDeleted;
     private String integralDiscount;
 
 
-    }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/main/java/com/wisdo/mmining/entity/WisdIntegrlRoles.java b/src/main/java/com/wisdo/mmining/entity/WisdIntegrlRoles.java
index c223928..46420ee 100644
--- a/src/main/java/com/wisdo/mmining/entity/WisdIntegrlRoles.java
+++ b/src/main/java/com/wisdo/mmining/entity/WisdIntegrlRoles.java
@@ -17,7 +17,7 @@ import java.util.Date;
  * @author makejava
  * @since 2020-10-13 16:57:30
  */
-@ApiModel(value="wisd_integrl_roles对象", description="")
+@ApiModel(value = "wisd_integrl_roles对象", description = "")
 @TableName(value = "wisd_integrl_roles")
 @Data
 public class WisdIntegrlRoles implements Serializable {
@@ -27,30 +27,30 @@ public class WisdIntegrlRoles implements Serializable {
     private Long id;
 
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
-private Integer isDeleted;
+    private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
 
     /**
diff --git a/src/main/java/com/wisdo/mmining/entity/WisdJoin.java b/src/main/java/com/wisdo/mmining/entity/WisdJoin.java
index 5252768..aefd553 100644
--- a/src/main/java/com/wisdo/mmining/entity/WisdJoin.java
+++ b/src/main/java/com/wisdo/mmining/entity/WisdJoin.java
@@ -16,7 +16,7 @@ import java.util.Date;
  * @author makejava
  * @since 2020-10-19 17:15:36
  */
-@ApiModel(value="wisd_join对象", description="")
+@ApiModel(value = "wisd_join对象", description = "")
 @TableName(value = "wisd_join")
 @Data
 public class WisdJoin implements Serializable {
@@ -26,29 +26,29 @@ public class WisdJoin implements Serializable {
     private Long id;
 
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
-private Integer isDeleted;
+    private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
     /**
      * 姓名
@@ -69,9 +69,9 @@ private Integer isDeleted;
     /**
      * 要货时间
      */
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String joinTime;
 
 
-    }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/main/java/com/wisdo/mmining/entity/WisdOrderDetail.java b/src/main/java/com/wisdo/mmining/entity/WisdOrderDetail.java
index 167a7a8..1cac5da 100644
--- a/src/main/java/com/wisdo/mmining/entity/WisdOrderDetail.java
+++ b/src/main/java/com/wisdo/mmining/entity/WisdOrderDetail.java
@@ -17,7 +17,7 @@ import java.util.Date;
  * @author makejava
  * @since 2020-09-15 16:56:34
  */
-@ApiModel(value="wisd_order_detail对象", description="")
+@ApiModel(value = "wisd_order_detail对象", description = "")
 @TableName(value = "wisd_order_detail")
 @Data
 public class WisdOrderDetail implements Serializable {
@@ -27,30 +27,30 @@ public class WisdOrderDetail implements Serializable {
     private Long id;
 
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
-private Integer isDeleted;
+    private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
     /**
      * 订单id
@@ -97,6 +97,4 @@ private Integer isDeleted;
     private Integer stockType;
 
 
-
-
-    }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/main/java/com/wisdo/mmining/entity/WisdPackage.java b/src/main/java/com/wisdo/mmining/entity/WisdPackage.java
index 9f6f4f9..e5ca558 100644
--- a/src/main/java/com/wisdo/mmining/entity/WisdPackage.java
+++ b/src/main/java/com/wisdo/mmining/entity/WisdPackage.java
@@ -16,7 +16,7 @@ import java.util.Date;
  * @author makejava
  * @since 2020-09-15 16:56:34
  */
-@ApiModel(value="wisd_package对象", description="")
+@ApiModel(value = "wisd_package对象", description = "")
 @TableName(value = "wisd_package")
 @Data
 public class WisdPackage implements Serializable {
@@ -26,29 +26,29 @@ public class WisdPackage implements Serializable {
     private Long id;
 
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
     private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
     /**
      * 套餐券名称
@@ -65,7 +65,7 @@ public class WisdPackage implements Serializable {
     /**
      * 使用时间（开始）
      */
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date packageStartTime;
 
@@ -77,7 +77,7 @@ public class WisdPackage implements Serializable {
     /**
      * 使用时间（结束）
      */
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date packageEndTime;
 
diff --git a/src/main/java/com/wisdo/mmining/entity/WisdProfits.java b/src/main/java/com/wisdo/mmining/entity/WisdProfits.java
index 514815c..c8b7b88 100644
--- a/src/main/java/com/wisdo/mmining/entity/WisdProfits.java
+++ b/src/main/java/com/wisdo/mmining/entity/WisdProfits.java
@@ -16,7 +16,7 @@ import java.util.Date;
  * @author makejava
  * @since 2020-10-15 15:29:37
  */
-@ApiModel(value="wisd_profits对象", description="")
+@ApiModel(value = "wisd_profits对象", description = "")
 @TableName(value = "wisd_profits")
 @Data
 public class WisdProfits implements Serializable {
@@ -26,29 +26,29 @@ public class WisdProfits implements Serializable {
     private Long id;
 
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
-private Integer isDeleted;
+    private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
     /**
      * 一级分润比例
@@ -60,4 +60,4 @@ private Integer isDeleted;
     private Integer twoProfits;
 
 
-    }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/main/java/com/wisdo/mmining/entity/WisdSettlement.java b/src/main/java/com/wisdo/mmining/entity/WisdSettlement.java
index ffb6451..eb13550 100644
--- a/src/main/java/com/wisdo/mmining/entity/WisdSettlement.java
+++ b/src/main/java/com/wisdo/mmining/entity/WisdSettlement.java
@@ -17,7 +17,7 @@ import java.util.Date;
  * @author makejava
  * @since 2020-10-12 18:07:48
  */
-@ApiModel(value="wisd_settlement对象", description="")
+@ApiModel(value = "wisd_settlement对象", description = "")
 @TableName(value = "wisd_settlement")
 @Data
 public class WisdSettlement implements Serializable {
@@ -27,30 +27,30 @@ public class WisdSettlement implements Serializable {
     private Long id;
 
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
     private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
     /**
      * 用户名称
@@ -87,7 +87,4 @@ public class WisdSettlement implements Serializable {
     private Long discountId;
 
 
-
-
-
 }
\ No newline at end of file
diff --git a/src/main/java/com/wisdo/mmining/entity/WisdStores.java b/src/main/java/com/wisdo/mmining/entity/WisdStores.java
index 2f61457..707d866 100644
--- a/src/main/java/com/wisdo/mmining/entity/WisdStores.java
+++ b/src/main/java/com/wisdo/mmining/entity/WisdStores.java
@@ -16,7 +16,7 @@ import java.util.Date;
  * @author makejava
  * @since 2020-10-12 09:50:02
  */
-@ApiModel(value="wisd_stores对象", description="")
+@ApiModel(value = "wisd_stores对象", description = "")
 @TableName(value = "wisd_stores")
 @Data
 public class WisdStores implements Serializable {
@@ -26,29 +26,29 @@ public class WisdStores implements Serializable {
     private Long id;
 
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
-private Integer isDeleted;
+    private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
     /**
      * 门店名称
@@ -62,7 +62,7 @@ private Integer isDeleted;
      * 门店地址省
      */
     private String storesProvince;
-        /**
+    /**
      * 门店地址市
      */
     private String storesCity;
diff --git a/src/main/java/com/wisdo/mmining/entity/WisdUser.java b/src/main/java/com/wisdo/mmining/entity/WisdUser.java
index dd4242f..d3d90d6 100644
--- a/src/main/java/com/wisdo/mmining/entity/WisdUser.java
+++ b/src/main/java/com/wisdo/mmining/entity/WisdUser.java
@@ -17,7 +17,7 @@ import java.util.Date;
  * @author makejava
  * @since 2020-09-15 16:56:35
  */
-@ApiModel(value="wisd_user对象", description="")
+@ApiModel(value = "wisd_user对象", description = "")
 @TableName(value = "wisd_user")
 @Data
 public class WisdUser implements Serializable {
@@ -27,30 +27,30 @@ public class WisdUser implements Serializable {
     private Long id;
 
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
     private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
 
     /**
diff --git a/src/main/java/com/wisdo/mmining/entity/WisdUserAddress.java b/src/main/java/com/wisdo/mmining/entity/WisdUserAddress.java
index 7deb7f1..1cf6eda 100644
--- a/src/main/java/com/wisdo/mmining/entity/WisdUserAddress.java
+++ b/src/main/java/com/wisdo/mmining/entity/WisdUserAddress.java
@@ -16,7 +16,7 @@ import java.util.Date;
  * @author makejava
  * @since 2020-10-10 10:14:16
  */
-@ApiModel(value="wisd_user_address对象", description="")
+@ApiModel(value = "wisd_user_address对象", description = "")
 @TableName(value = "wisd_user_address")
 @Data
 public class WisdUserAddress implements Serializable {
@@ -26,30 +26,30 @@ public class WisdUserAddress implements Serializable {
     private Long id;
 
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
     private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
     /**
      * 用户id
@@ -84,4 +84,4 @@ public class WisdUserAddress implements Serializable {
      */
     private Integer addressDefault;
 
-    }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/main/java/com/wisdo/mmining/entity/WisdUserCart.java b/src/main/java/com/wisdo/mmining/entity/WisdUserCart.java
index a1fb7b5..a73676a 100644
--- a/src/main/java/com/wisdo/mmining/entity/WisdUserCart.java
+++ b/src/main/java/com/wisdo/mmining/entity/WisdUserCart.java
@@ -16,7 +16,7 @@ import java.util.Date;
  * @author makejava
  * @since 2020-09-15 16:56:35
  */
-@ApiModel(value="wisd_user_cart对象", description="")
+@ApiModel(value = "wisd_user_cart对象", description = "")
 @TableName(value = "wisd_user_cart")
 @Data
 public class WisdUserCart implements Serializable {
@@ -26,30 +26,30 @@ public class WisdUserCart implements Serializable {
     private Long id;
 
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
-private Integer isDeleted;
+    private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
     /**
      * 用户id
@@ -74,4 +74,4 @@ private Integer isDeleted;
     private WisdGoods wisdGoods;
 
 
-    }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/main/java/com/wisdo/mmining/entity/WisdUserPackage.java b/src/main/java/com/wisdo/mmining/entity/WisdUserPackage.java
index c547828..38926b5 100644
--- a/src/main/java/com/wisdo/mmining/entity/WisdUserPackage.java
+++ b/src/main/java/com/wisdo/mmining/entity/WisdUserPackage.java
@@ -16,7 +16,7 @@ import java.util.Date;
  * @author makejava
  * @since 2020-09-15 16:56:35
  */
-@ApiModel(value="wisd_user_package对象", description="")
+@ApiModel(value = "wisd_user_package对象", description = "")
 @TableName(value = "wisd_user_package")
 @Data
 public class WisdUserPackage implements Serializable {
@@ -26,30 +26,30 @@ public class WisdUserPackage implements Serializable {
     private Long id;
 
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
-private Integer isDeleted;
+    private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
     /**
      * 用户id
@@ -65,4 +65,4 @@ private Integer isDeleted;
     private Integer isUsed;
 
 
-    }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/main/java/com/wisdo/mmining/entity/WisdUserPayrecord.java b/src/main/java/com/wisdo/mmining/entity/WisdUserPayrecord.java
index 21ca361..2da1fde 100644
--- a/src/main/java/com/wisdo/mmining/entity/WisdUserPayrecord.java
+++ b/src/main/java/com/wisdo/mmining/entity/WisdUserPayrecord.java
@@ -17,7 +17,7 @@ import java.util.Date;
  * @author makejava
  * @since 2020-09-15 16:56:35
  */
-@ApiModel(value="wisd_user_payrecord对象", description="")
+@ApiModel(value = "wisd_user_payrecord对象", description = "")
 @TableName(value = "wisd_user_payrecord")
 @Data
 public class WisdUserPayrecord implements Serializable {
@@ -27,30 +27,30 @@ public class WisdUserPayrecord implements Serializable {
     private Long id;
 
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
-private Integer isDeleted;
+    private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
     /**
      * 用户id
@@ -78,4 +78,4 @@ private Integer isDeleted;
     private String orderNum;
 
 
-    }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/main/java/com/wisdo/mmining/entity/WisdUserVolume.java b/src/main/java/com/wisdo/mmining/entity/WisdUserVolume.java
index 8b5187f..4c28d83 100644
--- a/src/main/java/com/wisdo/mmining/entity/WisdUserVolume.java
+++ b/src/main/java/com/wisdo/mmining/entity/WisdUserVolume.java
@@ -16,7 +16,7 @@ import java.util.Date;
  * @author makejava
  * @since 2020-09-15 16:56:35
  */
-@ApiModel(value="wisd_user_volume对象", description="")
+@ApiModel(value = "wisd_user_volume对象", description = "")
 @TableName(value = "wisd_user_volume")
 @Data
 public class WisdUserVolume implements Serializable {
@@ -26,30 +26,30 @@ public class WisdUserVolume implements Serializable {
     private Long id;
 
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
-private Integer isDeleted;
+    private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
     /**
      * 用户id
@@ -69,4 +69,4 @@ private Integer isDeleted;
     private Integer volumeIsdiscount;
 
 
-    }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/main/java/com/wisdo/mmining/entity/WisdVip.java b/src/main/java/com/wisdo/mmining/entity/WisdVip.java
index df6c24e..77524c2 100644
--- a/src/main/java/com/wisdo/mmining/entity/WisdVip.java
+++ b/src/main/java/com/wisdo/mmining/entity/WisdVip.java
@@ -16,7 +16,7 @@ import java.util.Date;
  * @author makejava
  * @since 2020-09-29 17:54:09
  */
-@ApiModel(value="wisd_vip对象", description="")
+@ApiModel(value = "wisd_vip对象", description = "")
 @TableName(value = "wisd_vip")
 @Data
 public class WisdVip implements Serializable {
@@ -26,30 +26,30 @@ public class WisdVip implements Serializable {
     private Long id;
 
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
-private Integer isDeleted;
+    private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
     /**
      * 等级名称
@@ -65,4 +65,4 @@ private Integer isDeleted;
     private Integer vipBalance;
 
 
-    }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/main/java/com/wisdo/mmining/entity/WisdWelfare.java b/src/main/java/com/wisdo/mmining/entity/WisdWelfare.java
index 7e1a37e..29a633c 100644
--- a/src/main/java/com/wisdo/mmining/entity/WisdWelfare.java
+++ b/src/main/java/com/wisdo/mmining/entity/WisdWelfare.java
@@ -16,7 +16,7 @@ import java.util.Date;
  * @author makejava
  * @since 2020-10-09 09:39:22
  */
-@ApiModel(value="wisd_welfare对象", description="")
+@ApiModel(value = "wisd_welfare对象", description = "")
 @TableName(value = "wisd_welfare")
 @Data
 public class WisdWelfare implements Serializable {
@@ -26,30 +26,30 @@ public class WisdWelfare implements Serializable {
     private Long id;
 
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
-private Integer isDeleted;
+    private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
 
     /**
@@ -62,4 +62,4 @@ private Integer isDeleted;
     private Integer welfareType;
 
 
-    }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/main/java/com/wisdo/mmining/entity/WisdWithdrawal.java b/src/main/java/com/wisdo/mmining/entity/WisdWithdrawal.java
index d413714..0430b84 100644
--- a/src/main/java/com/wisdo/mmining/entity/WisdWithdrawal.java
+++ b/src/main/java/com/wisdo/mmining/entity/WisdWithdrawal.java
@@ -17,7 +17,7 @@ import java.util.Date;
  * @author makejava
  * @since 2020-10-21 16:46:38
  */
-@ApiModel(value="wisd_withdrawal对象", description="")
+@ApiModel(value = "wisd_withdrawal对象", description = "")
 @TableName(value = "wisd_withdrawal")
 @Data
 public class WisdWithdrawal implements Serializable {
@@ -27,30 +27,30 @@ public class WisdWithdrawal implements Serializable {
     private Long id;
 
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
-private Integer isDeleted;
+    private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
     /**
      * 银行卡号
diff --git a/src/main/java/com/wisdo/mmining/entity/WisdWxuser.java b/src/main/java/com/wisdo/mmining/entity/WisdWxuser.java
index e3ccb99..ad99970 100644
--- a/src/main/java/com/wisdo/mmining/entity/WisdWxuser.java
+++ b/src/main/java/com/wisdo/mmining/entity/WisdWxuser.java
@@ -18,7 +18,7 @@ import java.util.List;
  * @author makejava
  * @since 2020-09-15 16:56:35
  */
-@ApiModel(value="wisd_wxuser对象", description="")
+@ApiModel(value = "wisd_wxuser对象", description = "")
 @TableName(value = "wisd_wxuser")
 @Data
 public class WisdWxuser implements Serializable {
@@ -28,30 +28,30 @@ public class WisdWxuser implements Serializable {
     private Long id;
 
 
-    @TableField(value = "create_user",fill = FieldFill.INSERT)
+    @TableField(value = "create_user", fill = FieldFill.INSERT)
     private String createUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "0正常1删除")
-    @TableField(value = "is_deleted",fill = FieldFill.INSERT)
+    @TableField(value = "is_deleted", fill = FieldFill.INSERT)
     @TableLogic
     private Integer isDeleted;
 
-    @TableField(value = "update_user",fill = FieldFill.UPDATE)
+    @TableField(value = "update_user", fill = FieldFill.UPDATE)
     private String updateUser;
 
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 
-    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "0开始")
-    @TableField(value = "version",fill = FieldFill.INSERT)
+    @TableField(value = "version", fill = FieldFill.INSERT)
     private Integer version;
 
     /**
diff --git a/src/main/java/com/wisdo/mmining/mapper/BackMapper.java b/src/main/java/com/wisdo/mmining/mapper/BackMapper.java
index 43b0405..df4616f 100644
--- a/src/main/java/com/wisdo/mmining/mapper/BackMapper.java
+++ b/src/main/java/com/wisdo/mmining/mapper/BackMapper.java
@@ -2,7 +2,6 @@ package com.wisdo.mmining.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.wisdo.mmining.entity.WisdBack;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/src/main/java/com/wisdo/mmining/mapper/ContractMapper.java b/src/main/java/com/wisdo/mmining/mapper/ContractMapper.java
index 220f035..588ce67 100644
--- a/src/main/java/com/wisdo/mmining/mapper/ContractMapper.java
+++ b/src/main/java/com/wisdo/mmining/mapper/ContractMapper.java
@@ -10,5 +10,5 @@ import org.springframework.stereotype.Repository;
  * @Description:
  */
 @Repository
-public interface ContractMapper  extends BaseMapper<WisdContract> {
+public interface ContractMapper extends BaseMapper<WisdContract> {
 }
diff --git a/src/main/java/com/wisdo/mmining/mapper/OrderMapper.java b/src/main/java/com/wisdo/mmining/mapper/OrderMapper.java
index 412b365..9bedaec 100644
--- a/src/main/java/com/wisdo/mmining/mapper/OrderMapper.java
+++ b/src/main/java/com/wisdo/mmining/mapper/OrderMapper.java
@@ -18,6 +18,7 @@ public interface OrderMapper extends BaseMapper<WisdOeder> {
 
     /**
      * 获取一年的业绩情况
+     *
      * @return
      */
     List<Echarts> getMonthSumByEcharts();
diff --git a/src/main/java/com/wisdo/mmining/mapper/PermissionMapper.java b/src/main/java/com/wisdo/mmining/mapper/PermissionMapper.java
index 5cc8524..72ff395 100644
--- a/src/main/java/com/wisdo/mmining/mapper/PermissionMapper.java
+++ b/src/main/java/com/wisdo/mmining/mapper/PermissionMapper.java
@@ -1,14 +1,14 @@
 package com.wisdo.mmining.mapper;
 
-import com.wisdo.mmining.entity.Permission;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.wisdo.mmining.entity.Permission;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author hjw
@@ -18,28 +18,26 @@ import java.util.List;
 public interface PermissionMapper extends BaseMapper<Permission> {
 
     /**
+     * 根据权限类型获取对应权限
      *
-     *   根据权限类型获取对应权限
-     * @author hjw
-     * @date 2020/8/25
      * @param
      * @param type
      * @param pid
      * @param roleId
      * @return java.util.List<Permission>
-     *
+     * @author hjw
+     * @date 2020/8/25
      */
     List<Permission> getMenuByType(int type, Long pid, Long roleId);
 
     /**
+     * 获取该角色下所有权限
      *
-     *  获取该角色下所有权限
-     * @author hjw
-     * @date 2020/8/25
      * @param
      * @param roleId
      * @return java.util.List<java.lang.Long>
-     *
+     * @author hjw
+     * @date 2020/8/25
      */
     List<Long> getPermissionByRoleId(Long roleId);
 
diff --git a/src/main/java/com/wisdo/mmining/mapper/RoleMapper.java b/src/main/java/com/wisdo/mmining/mapper/RoleMapper.java
index 9594efc..f071f0e 100644
--- a/src/main/java/com/wisdo/mmining/mapper/RoleMapper.java
+++ b/src/main/java/com/wisdo/mmining/mapper/RoleMapper.java
@@ -1,7 +1,7 @@
 package com.wisdo.mmining.mapper;
 
-import com.wisdo.mmining.entity.Role;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.wisdo.mmining.entity.Role;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -9,7 +9,7 @@ import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author hjw
@@ -19,27 +19,25 @@ import java.util.List;
 public interface RoleMapper extends BaseMapper<Role> {
 
     /**
+     * 批量插件角色权限
      *
-     *  批量插件角色权限
-     * @author hjw
-     * @date 2020/8/25
      * @param
      * @param roleId
      * @param permissions
      * @return int
-     *
+     * @author hjw
+     * @date 2020/8/25
      */
     int insertBatch(@Param("roleId") Long roleId, @Param("permissions") List<Long> permissions);
 
     /**
+     * 删除角色权限
      *
-     *  删除角色权限
-     * @author hjw
-     * @date 2020/8/25
      * @param
      * @param roleId
      * @return int
-     *
+     * @author hjw
+     * @date 2020/8/25
      */
     int deltePermission(@Param("roleId") Long roleId);
 
diff --git a/src/main/java/com/wisdo/mmining/mapper/RolePermissionMapper.java b/src/main/java/com/wisdo/mmining/mapper/RolePermissionMapper.java
index cf50afa..ba43648 100644
--- a/src/main/java/com/wisdo/mmining/mapper/RolePermissionMapper.java
+++ b/src/main/java/com/wisdo/mmining/mapper/RolePermissionMapper.java
@@ -1,11 +1,11 @@
 package com.wisdo.mmining.mapper;
 
-import com.wisdo.mmining.entity.RolePermission;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.wisdo.mmining.entity.RolePermission;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author hjw
diff --git a/src/main/java/com/wisdo/mmining/mapper/UserMapper.java b/src/main/java/com/wisdo/mmining/mapper/UserMapper.java
index af726c6..245f6c1 100644
--- a/src/main/java/com/wisdo/mmining/mapper/UserMapper.java
+++ b/src/main/java/com/wisdo/mmining/mapper/UserMapper.java
@@ -1,8 +1,8 @@
 package com.wisdo.mmining.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.wisdo.mmining.entity.User;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.wisdo.mmining.mapper.vo.UserVo;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
@@ -11,7 +11,7 @@ import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author hjw
@@ -21,14 +21,13 @@ import java.util.List;
 public interface UserMapper extends BaseMapper<User> {
 
     /**
+     * 翻页对象，可以作为 xml 参数直接使用，传递参数 Page 即自动分页
      *
-     *  翻页对象，可以作为 xml 参数直接使用，传递参数 Page 即自动分页
-     * @author hjw
-     * @date 2020/8/25
      * @param
      * @param page
      * @return java.util.List<UserVo>
-     *
+     * @author hjw
+     * @date 2020/8/25
      */
     @Select("SELECT t_user.*,t_role.`name` as roleName FROM t_user,t_role WHERE t_user.role_id=t_role.id")
     List<UserVo> getUserRole(Page<UserVo> page);
diff --git a/src/main/java/com/wisdo/mmining/mapper/WithdrawalMapper.java b/src/main/java/com/wisdo/mmining/mapper/WithdrawalMapper.java
index daa1e72..96eb566 100644
--- a/src/main/java/com/wisdo/mmining/mapper/WithdrawalMapper.java
+++ b/src/main/java/com/wisdo/mmining/mapper/WithdrawalMapper.java
@@ -10,5 +10,5 @@ import org.springframework.stereotype.Repository;
  * @Description:
  */
 @Repository
-public interface WithdrawalMapper  extends BaseMapper<WisdWithdrawal> {
+public interface WithdrawalMapper extends BaseMapper<WisdWithdrawal> {
 }
diff --git a/src/main/java/com/wisdo/mmining/service/BannerService.java b/src/main/java/com/wisdo/mmining/service/BannerService.java
index 5a06c25..bb627d4 100644
--- a/src/main/java/com/wisdo/mmining/service/BannerService.java
+++ b/src/main/java/com/wisdo/mmining/service/BannerService.java
@@ -14,6 +14,7 @@ public interface BannerService extends IService<WisdBanner> {
 
     /**
      * 分页查询
+     *
      * @param page
      * @param num
      * @return
@@ -22,6 +23,7 @@ public interface BannerService extends IService<WisdBanner> {
 
     /**
      * 根据类型查询
+     *
      * @param type
      * @return
      */
diff --git a/src/main/java/com/wisdo/mmining/service/CashVolumeService.java b/src/main/java/com/wisdo/mmining/service/CashVolumeService.java
index e66eb2b..7362496 100644
--- a/src/main/java/com/wisdo/mmining/service/CashVolumeService.java
+++ b/src/main/java/com/wisdo/mmining/service/CashVolumeService.java
@@ -16,6 +16,7 @@ public interface CashVolumeService extends IService<WisdCashVolume> {
 
     /**
      * 根据公司id获取
+     *
      * @param companyId
      * @return
      */
@@ -23,6 +24,7 @@ public interface CashVolumeService extends IService<WisdCashVolume> {
 
     /**
      * 根据公司id获取已发送
+     *
      * @param companyId
      * @return
      */
@@ -30,6 +32,7 @@ public interface CashVolumeService extends IService<WisdCashVolume> {
 
     /**
      * 根据公司id获取
+     *
      * @param companyId
      * @return
      */
@@ -37,6 +40,7 @@ public interface CashVolumeService extends IService<WisdCashVolume> {
 
     /**
      * 根据公司id获取已发送
+     *
      * @param companyId
      * @return
      */
@@ -44,19 +48,23 @@ public interface CashVolumeService extends IService<WisdCashVolume> {
 
     /**
      * 根据名称查询
+     *
      * @param name
      * @return
      */
-    WisdCashVolume getByName(String name,Long companyId);
+    WisdCashVolume getByName(String name, Long companyId);
 
     /**
      * 发放现金券
+     *
      * @param wisdCashVolume
      * @return
      */
     Result send(WisdCashVolume wisdCashVolume);
+
     /**
      * 发放现金券
+     *
      * @param wisdCashVolume
      * @return
      */
diff --git a/src/main/java/com/wisdo/mmining/service/CompanyService.java b/src/main/java/com/wisdo/mmining/service/CompanyService.java
index 06e2ca7..b01edba 100644
--- a/src/main/java/com/wisdo/mmining/service/CompanyService.java
+++ b/src/main/java/com/wisdo/mmining/service/CompanyService.java
@@ -13,6 +13,7 @@ public interface CompanyService extends IService<WisdCompany> {
 
     /**
      * 分页查询
+     *
      * @param page
      * @param num
      * @return
@@ -21,6 +22,7 @@ public interface CompanyService extends IService<WisdCompany> {
 
     /**
      * 根据名称查询
+     *
      * @param name
      * @return
      */
diff --git a/src/main/java/com/wisdo/mmining/service/ContractService.java b/src/main/java/com/wisdo/mmining/service/ContractService.java
index a817407..b113525 100644
--- a/src/main/java/com/wisdo/mmining/service/ContractService.java
+++ b/src/main/java/com/wisdo/mmining/service/ContractService.java
@@ -15,6 +15,7 @@ public interface ContractService extends IService<WisdContract> {
 
     /**
      * 分页查询
+     *
      * @param page
      * @param num
      * @return
@@ -24,6 +25,7 @@ public interface ContractService extends IService<WisdContract> {
 
     /**
      * 分页查询
+     *
      * @return
      */
     List<WisdContract> selectList(Long companyId);
diff --git a/src/main/java/com/wisdo/mmining/service/DeptService.java b/src/main/java/com/wisdo/mmining/service/DeptService.java
index d59528a..872c5a0 100644
--- a/src/main/java/com/wisdo/mmining/service/DeptService.java
+++ b/src/main/java/com/wisdo/mmining/service/DeptService.java
@@ -14,16 +14,18 @@ public interface DeptService extends IService<WisdDept> {
 
     /**
      * 分页查询
+     *
      * @param page
      * @param num
      * @return
      */
-    IPage<WisdDept> selectPage(Long companyId,String name, int page, int num);
+    IPage<WisdDept> selectPage(Long companyId, String name, int page, int num);
 
     /**
      * 根据名称查询
+     *
      * @param name
      * @return
      */
-    WisdDept getByName(String name,Long companyId);
+    WisdDept getByName(String name, Long companyId);
 }
diff --git a/src/main/java/com/wisdo/mmining/service/FeedBackService.java b/src/main/java/com/wisdo/mmining/service/FeedBackService.java
index 8d416ce..cbfad78 100644
--- a/src/main/java/com/wisdo/mmining/service/FeedBackService.java
+++ b/src/main/java/com/wisdo/mmining/service/FeedBackService.java
@@ -13,9 +13,10 @@ public interface FeedBackService extends IService<WisdFeedback> {
 
     /**
      * 分页查询
+     *
      * @param page
      * @param num
      * @return
      */
-    IPage<WisdFeedback> selectPage(String phone,int page, int num);
+    IPage<WisdFeedback> selectPage(String phone, int page, int num);
 }
diff --git a/src/main/java/com/wisdo/mmining/service/GoodsService.java b/src/main/java/com/wisdo/mmining/service/GoodsService.java
index 1538b61..659f49e 100644
--- a/src/main/java/com/wisdo/mmining/service/GoodsService.java
+++ b/src/main/java/com/wisdo/mmining/service/GoodsService.java
@@ -23,6 +23,7 @@ public interface GoodsService extends IService<WisdGoods> {
 
     /**
      * 保存
+     *
      * @param wisdGoods
      * @return
      */
@@ -30,6 +31,7 @@ public interface GoodsService extends IService<WisdGoods> {
 
     /**
      * 保存
+     *
      * @param wisdGoods
      * @return
      */
@@ -37,87 +39,98 @@ public interface GoodsService extends IService<WisdGoods> {
 
     /**
      * 分页查询
+     *
      * @param page
      * @param num
      * @return
      */
-    IPage<WisdGoods> selectPage(String name,Integer isProfits,Integer isDiscount,int page, int num);
+    IPage<WisdGoods> selectPage(String name, Integer isProfits, Integer isDiscount, int page, int num);
 
     /**
      * 分页查询
+     *
      * @param page
      * @param num
      * @return
      */
-    IPage<WisdGoods> contractlist(String name,Long contractId,Long companyId,int page, int num);
+    IPage<WisdGoods> contractlist(String name, Long contractId, Long companyId, int page, int num);
 
     /**
      * 分页查询
+     *
      * @param page
      * @param num
      * @return
      */
-    IPage<WisdGoods> contractseelist(String name,Long contractId,int page, int num);
+    IPage<WisdGoods> contractseelist(String name, Long contractId, int page, int num);
 
     /**
      * 积分分页查询
+     *
      * @param page
      * @param num
      * @return
      */
-    IPage<WisdGoods> selectintegrallistPage(String name,int page, int num);
+    IPage<WisdGoods> selectintegrallistPage(String name, int page, int num);
 
 
     /**
      * 节令分页查询
+     *
      * @param page
      * @param num
      * @return
      */
-    IPage<WisdGoods> selectseasonallistPage(String name,int page, int num);
+    IPage<WisdGoods> selectseasonallistPage(String name, int page, int num);
 
     /**
      * 节令分页查询2
+     *
      * @param page
      * @param num
      * @return
      */
-    IPage<WisdGoods> selectseasonallistPages(String name,int page, int num);
+    IPage<WisdGoods> selectseasonallistPages(String name, int page, int num);
 
     /**
      * 促销分页查询
+     *
      * @param page
      * @param num
      * @return
      */
-    IPage<WisdGoods> selectpromotionlistPage(String name,int page, int num);
+    IPage<WisdGoods> selectpromotionlistPage(String name, int page, int num);
 
     /**
      * 分润分页查询
+     *
      * @param page
      * @param num
      * @return
      */
-    IPage<WisdGoods> selectprofitslistPage(String name,int page, int num);
+    IPage<WisdGoods> selectprofitslistPage(String name, int page, int num);
 
     /**
      * 促销分页查询2
+     *
      * @param page
      * @param num
      * @return
      */
-    IPage<WisdGoods> selectpromotionlistPages(String name,int page, int num);
+    IPage<WisdGoods> selectpromotionlistPages(String name, int page, int num);
 
     /**
      * 套餐分页查询
+     *
      * @param page
      * @param num
      * @return
      */
-    IPage<WisdGoods> selectclassifylistlistPage(String name,int page, int num);
+    IPage<WisdGoods> selectclassifylistlistPage(String name, int page, int num);
 
     /**
      * 套餐查询
+     *
      * @param id
      * @return
      */
@@ -126,6 +139,7 @@ public interface GoodsService extends IService<WisdGoods> {
 
     /**
      * 根据名称查询
+     *
      * @param name
      * @return
      */
@@ -133,8 +147,9 @@ public interface GoodsService extends IService<WisdGoods> {
 
     /**
      * 删除
+     *
      * @param idList
      * @return
      */
-    Result deleteByIds(List<Long> idList,Integer type);
+    Result deleteByIds(List<Long> idList, Integer type);
 }
diff --git a/src/main/java/com/wisdo/mmining/service/GoodsSpecService.java b/src/main/java/com/wisdo/mmining/service/GoodsSpecService.java
index 52a7a5d..6bbe121 100644
--- a/src/main/java/com/wisdo/mmining/service/GoodsSpecService.java
+++ b/src/main/java/com/wisdo/mmining/service/GoodsSpecService.java
@@ -16,8 +16,9 @@ public interface GoodsSpecService extends IService<WisdGoodsSpec> {
 
     /**
      * 保存
+     *
      * @param wisdGoods
      * @return
      */
-    Result addBuly(Long contractId,WisdGoods wisdGoods);
+    Result addBuly(Long contractId, WisdGoods wisdGoods);
 }
diff --git a/src/main/java/com/wisdo/mmining/service/GoodsTypeService.java b/src/main/java/com/wisdo/mmining/service/GoodsTypeService.java
index 1208107..e0fd62b 100644
--- a/src/main/java/com/wisdo/mmining/service/GoodsTypeService.java
+++ b/src/main/java/com/wisdo/mmining/service/GoodsTypeService.java
@@ -14,6 +14,7 @@ public interface GoodsTypeService extends IService<WisdGoodsType> {
 
     /**
      * 分页查询
+     *
      * @param name
      * @param page
      * @param num
@@ -23,6 +24,7 @@ public interface GoodsTypeService extends IService<WisdGoodsType> {
 
     /**
      * 根据名称查询
+     *
      * @param name
      * @return
      */
@@ -30,6 +32,7 @@ public interface GoodsTypeService extends IService<WisdGoodsType> {
 
     /**
      * 删除
+     *
      * @param id
      * @return
      */
diff --git a/src/main/java/com/wisdo/mmining/service/JoinService.java b/src/main/java/com/wisdo/mmining/service/JoinService.java
index ea790d2..882150f 100644
--- a/src/main/java/com/wisdo/mmining/service/JoinService.java
+++ b/src/main/java/com/wisdo/mmining/service/JoinService.java
@@ -13,9 +13,10 @@ public interface JoinService extends IService<WisdJoin> {
 
     /**
      * 分页查询
+     *
      * @param page
      * @param num
      * @return
      */
-    IPage<WisdJoin> selectPage(String userName,String userPhone,int page, int num);
+    IPage<WisdJoin> selectPage(String userName, String userPhone, int page, int num);
 }
diff --git a/src/main/java/com/wisdo/mmining/service/OperationLogService.java b/src/main/java/com/wisdo/mmining/service/OperationLogService.java
index f4edd94..9bb57dd 100644
--- a/src/main/java/com/wisdo/mmining/service/OperationLogService.java
+++ b/src/main/java/com/wisdo/mmining/service/OperationLogService.java
@@ -14,15 +14,14 @@ import com.wisdo.mmining.entity.OperationLog;
 public interface OperationLogService extends IService<OperationLog> {
 
     /**
+     * 操作日志管理
      *
-     *  操作日志管理
-     * @author hjw
-     * @date 2020/8/25
      * @param
      * @param page
      * @param num
      * @return com.baomidou.mybatisplus.extension.plugins.pagination.Page<OperationLog>
-     *
+     * @author hjw
+     * @date 2020/8/25
      */
     Page<OperationLog> table(int page, int num);
 
diff --git a/src/main/java/com/wisdo/mmining/service/OrderDetailService.java b/src/main/java/com/wisdo/mmining/service/OrderDetailService.java
index d7706d4..e0dd7bb 100644
--- a/src/main/java/com/wisdo/mmining/service/OrderDetailService.java
+++ b/src/main/java/com/wisdo/mmining/service/OrderDetailService.java
@@ -14,6 +14,7 @@ public interface OrderDetailService extends IService<WisdOrderDetail> {
 
     /**
      * 根据订单号查询
+     *
      * @param orderId
      * @return
      */
diff --git a/src/main/java/com/wisdo/mmining/service/OrderService.java b/src/main/java/com/wisdo/mmining/service/OrderService.java
index 25e05b5..e82cf8f 100644
--- a/src/main/java/com/wisdo/mmining/service/OrderService.java
+++ b/src/main/java/com/wisdo/mmining/service/OrderService.java
@@ -22,22 +22,25 @@ public interface OrderService extends IService<WisdOeder> {
 
     /**
      * 分页查询
+     *
      * @param page
      * @param num
      * @return
      */
-    IPage<WisdOeder> selectPage(String pickTimeStart,String pickTimeEnd,String createTimeStart,String createTimeEnd,Long companyId,Long addressId,Integer orderPick,String orderNumber,String userName,String userPhone,Integer status,Integer orderPayWay,int page, int num);
+    IPage<WisdOeder> selectPage(String pickTimeStart, String pickTimeEnd, String createTimeStart, String createTimeEnd, Long companyId, Long addressId, Integer orderPick, String orderNumber, String userName, String userPhone, Integer status, Integer orderPayWay, int page, int num);
 
     /**
      * 分页查询
+     *
      * @param page
      * @param num
      * @return
      */
-    IPage<WisdOeder> selectefundPage(String createTimeStart,String createTimeEnd,Long companyId,Long addressId,Integer orderPick,String orderNumber,String userName,String userPhone,Integer status,Integer orderPayWay,int page, int num);
+    IPage<WisdOeder> selectefundPage(String createTimeStart, String createTimeEnd, Long companyId, Long addressId, Integer orderPick, String orderNumber, String userName, String userPhone, Integer status, Integer orderPayWay, int page, int num);
 
     /**
      * 分页查询
+     *
      * @param page
      * @param num
      * @return
@@ -71,6 +74,7 @@ public interface OrderService extends IService<WisdOeder> {
 
     /**
      * 获取一年的业绩情况
+     *
      * @return
      */
     List<Echarts> getMonthSumByEcharts();
diff --git a/src/main/java/com/wisdo/mmining/service/PackageService.java b/src/main/java/com/wisdo/mmining/service/PackageService.java
index 0199bd8..98dc2c4 100644
--- a/src/main/java/com/wisdo/mmining/service/PackageService.java
+++ b/src/main/java/com/wisdo/mmining/service/PackageService.java
@@ -16,27 +16,31 @@ public interface PackageService extends IService<WisdPackage> {
 
     /**
      * 根据公司id获取
+     *
      * @param companyId
      * @return
      */
-    IPage<WisdPackage> getListByCompanyId(String name,Long companyId, int page, int num);
+    IPage<WisdPackage> getListByCompanyId(String name, Long companyId, int page, int num);
 
     /**
      * 根据公司id获取已发送
+     *
      * @param companyId
      * @return
      */
-    IPage<WisdPackage> getIssueListByCompanyId(String name,Long companyId, int page, int num);
+    IPage<WisdPackage> getIssueListByCompanyId(String name, Long companyId, int page, int num);
 
     /**
      * 根据名称查询
+     *
      * @param name
      * @return
      */
-    WisdPackage getByName(String name,Long companyId);
+    WisdPackage getByName(String name, Long companyId);
 
     /**
      * 发放套餐券
+     *
      * @param wisdPackage
      * @return
      */
diff --git a/src/main/java/com/wisdo/mmining/service/PermissionService.java b/src/main/java/com/wisdo/mmining/service/PermissionService.java
index 7d8d445..3b9c241 100644
--- a/src/main/java/com/wisdo/mmining/service/PermissionService.java
+++ b/src/main/java/com/wisdo/mmining/service/PermissionService.java
@@ -7,7 +7,7 @@ import java.util.List;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author hjw
@@ -16,39 +16,36 @@ import java.util.List;
 public interface PermissionService extends IService<Permission> {
 
     /**
+     * 获取所有权限
      *
-     *  获取所有权限
-     * @author hjw
-     * @date 2020/8/25
      * @param
      * @return java.util.List<Permission>
-     *
+     * @author hjw
+     * @date 2020/8/25
      */
     List<Permission> getAll();
 
     /**
+     * 获取所有菜单根据角色
      *
-     *  获取所有菜单根据角色
-     * @author hjw
-     * @date 2020/8/25
      * @param
      * @param type
      * @param pid
      * @param roleId
      * @return java.util.List<Permission>
-     *
+     * @author hjw
+     * @date 2020/8/25
      */
     List<Permission> getMenuByType(int type, Long pid, Long roleId);
 
     /**
+     * 获取权限根据角色
      *
-     *  获取权限根据角色
-     * @author hjw
-     * @date 2020/8/25
      * @param
      * @param roleId
      * @return java.util.List<java.lang.Long>
-     *
+     * @author hjw
+     * @date 2020/8/25
      */
     List<Long> getPermissionByRoleId(Long roleId);
 
diff --git a/src/main/java/com/wisdo/mmining/service/RolePermissionService.java b/src/main/java/com/wisdo/mmining/service/RolePermissionService.java
index 2448e8f..f355d93 100644
--- a/src/main/java/com/wisdo/mmining/service/RolePermissionService.java
+++ b/src/main/java/com/wisdo/mmining/service/RolePermissionService.java
@@ -1,11 +1,11 @@
 package com.wisdo.mmining.service;
 
-import com.wisdo.mmining.entity.RolePermission;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.wisdo.mmining.entity.RolePermission;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author hjw
diff --git a/src/main/java/com/wisdo/mmining/service/RoleService.java b/src/main/java/com/wisdo/mmining/service/RoleService.java
index af28999..5879b62 100644
--- a/src/main/java/com/wisdo/mmining/service/RoleService.java
+++ b/src/main/java/com/wisdo/mmining/service/RoleService.java
@@ -9,7 +9,7 @@ import java.util.List;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author hjw
@@ -18,39 +18,36 @@ import java.util.List;
 public interface RoleService extends IService<Role> {
 
     /**
+     * 后台分页
      *
-     *  后台分页
-     * @author hjw
-     * @date 2020/8/25
      * @param
      * @param name
      * @param num
      * @param page
      * @return com.baomidou.mybatisplus.core.metadata.IPage<Role>
-     *
+     * @author hjw
+     * @date 2020/8/25
      */
     IPage<Role> getPage(String name, int num, int page);
 
     /**
+     * 修改角色
      *
-     *  修改角色
-     * @author hjw
-     * @date 2020/8/25
      * @param
      * @param tRoleVo
      * @return boolean
-     *
+     * @author hjw
+     * @date 2020/8/25
      */
     boolean saveOrUpdateT(RoleVo tRoleVo);
 
     /**
+     * 获取所有角色
      *
-     *  获取所有角色
-     * @author hjw
-     * @date 2020/8/25
      * @param
      * @return java.util.List<Role>
-     *
+     * @author hjw
+     * @date 2020/8/25
      */
     List<Role> getAll();
 
diff --git a/src/main/java/com/wisdo/mmining/service/StoresService.java b/src/main/java/com/wisdo/mmining/service/StoresService.java
index df46c39..915404f 100644
--- a/src/main/java/com/wisdo/mmining/service/StoresService.java
+++ b/src/main/java/com/wisdo/mmining/service/StoresService.java
@@ -15,6 +15,7 @@ public interface StoresService extends IService<WisdStores> {
 
     /**
      * 分页查询
+     *
      * @param page
      * @param num
      * @return
diff --git a/src/main/java/com/wisdo/mmining/service/UserService.java b/src/main/java/com/wisdo/mmining/service/UserService.java
index e39c772..36c6b63 100644
--- a/src/main/java/com/wisdo/mmining/service/UserService.java
+++ b/src/main/java/com/wisdo/mmining/service/UserService.java
@@ -8,7 +8,7 @@ import com.wisdo.mmining.mapper.vo.UserVo;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author hjw
@@ -17,51 +17,47 @@ import com.wisdo.mmining.mapper.vo.UserVo;
 public interface UserService extends IService<User> {
 
     /**
+     * 逻辑删除
      *
-     *  逻辑删除
-     * @author hjw
-     * @date 2020/8/25
      * @param
      * @param id
      * @return int
-     *
+     * @author hjw
+     * @date 2020/8/25
      */
     int logicDelete(Long id);
 
     /**
+     * 用户名查询用户
      *
-     *  用户名查询用户
-     * @author hjw
-     * @date 2020/8/25
      * @param
      * @param username
      * @return User
-     *
+     * @author hjw
+     * @date 2020/8/25
      */
     User getUserByUsername(String username);
 
 
     /**
+     * 后台分页
      *
-     *  后台分页
-     * @author hjw
-     * @date 2020/8/25
      * @param
      * @param page
      * @return com.baomidou.mybatisplus.extension.plugins.pagination.Page<UserVo>
-     *
+     * @author hjw
+     * @date 2020/8/25
      */
     IPage<User> getUserRole(Long companyId, String username, int page, int num);
 
     /**
+     * 查询用户
      *
-     *  查询用户
-     * @author hjw
-     * @date 2020/8/25
      * @param
      * @param id
      * @return User
-     *
+     * @author hjw
+     * @date 2020/8/25
      */
     User getById(Long id);
 
diff --git a/src/main/java/com/wisdo/mmining/service/VipService.java b/src/main/java/com/wisdo/mmining/service/VipService.java
index 9112f4d..990dfb4 100644
--- a/src/main/java/com/wisdo/mmining/service/VipService.java
+++ b/src/main/java/com/wisdo/mmining/service/VipService.java
@@ -13,6 +13,7 @@ public interface VipService extends IService<WisdVip> {
 
     /**
      * 分页查询
+     *
      * @param page
      * @param num
      * @return
@@ -21,6 +22,7 @@ public interface VipService extends IService<WisdVip> {
 
     /**
      * 根据类型查询
+     *
      * @param name
      * @return
      */
@@ -28,6 +30,7 @@ public interface VipService extends IService<WisdVip> {
 
     /**
      * 积分等级操作
+     *
      * @param userId
      * @return
      */
diff --git a/src/main/java/com/wisdo/mmining/service/WelfareService.java b/src/main/java/com/wisdo/mmining/service/WelfareService.java
index cfed133..e83092d 100644
--- a/src/main/java/com/wisdo/mmining/service/WelfareService.java
+++ b/src/main/java/com/wisdo/mmining/service/WelfareService.java
@@ -13,6 +13,7 @@ public interface WelfareService extends IService<WisdWelfare> {
 
     /**
      * 获取
+     *
      * @param
      * @return
      */
diff --git a/src/main/java/com/wisdo/mmining/service/WisdUserService.java b/src/main/java/com/wisdo/mmining/service/WisdUserService.java
index db2629a..5b669a1 100644
--- a/src/main/java/com/wisdo/mmining/service/WisdUserService.java
+++ b/src/main/java/com/wisdo/mmining/service/WisdUserService.java
@@ -17,7 +17,6 @@ import java.util.List;
 public interface WisdUserService extends IService<WisdUser> {
 
 
-
     WisdUser getByUserId(Long id);
 
     /**
@@ -27,21 +26,23 @@ public interface WisdUserService extends IService<WisdUser> {
 
     /**
      * 分页查询
+     *
      * @param page
      * @param num
      * @return
      */
-    IPage<WisdUser> selectPage(Long companyId,String userName,String userPhone, int page, int num);
+    IPage<WisdUser> selectPage(Long companyId, String userName, String userPhone, int page, int num);
 
     /**
      * 根据电话号码查询
+     *
      * @param phone
      * @return
      */
-    WisdUser getByPhone(String phone,Long companyId);
+    WisdUser getByPhone(String phone, Long companyId);
 
     /**
      * 员工导入
      */
-    Result importUser(MultipartFile file, InputStream inputStream, String companyId,String deptId);
+    Result importUser(MultipartFile file, InputStream inputStream, String companyId, String deptId);
 }
diff --git a/src/main/java/com/wisdo/mmining/service/WithdrawalService.java b/src/main/java/com/wisdo/mmining/service/WithdrawalService.java
index 29e365b..6701356 100644
--- a/src/main/java/com/wisdo/mmining/service/WithdrawalService.java
+++ b/src/main/java/com/wisdo/mmining/service/WithdrawalService.java
@@ -12,10 +12,11 @@ import java.util.Map;
  * @Date: 2020/10/21 16:54
  * @Description:
  */
-public interface WithdrawalService  extends IService<WisdWithdrawal> {
+public interface WithdrawalService extends IService<WisdWithdrawal> {
 
     /**
      * 分页查询
+     *
      * @param page
      * @param num
      * @return
diff --git a/src/main/java/com/wisdo/mmining/service/WxuserService.java b/src/main/java/com/wisdo/mmining/service/WxuserService.java
index 6331655..be1cbab 100644
--- a/src/main/java/com/wisdo/mmining/service/WxuserService.java
+++ b/src/main/java/com/wisdo/mmining/service/WxuserService.java
@@ -17,6 +17,7 @@ public interface WxuserService extends IService<WisdWxuser> {
 
     /**
      * 分页查询
+     *
      * @param page
      * @param num
      * @return
@@ -25,6 +26,7 @@ public interface WxuserService extends IService<WisdWxuser> {
 
     /**
      * 分页查询
+     *
      * @param page
      * @param num
      * @return
diff --git a/src/main/java/com/wisdo/mmining/service/impl/BannerServiceImpl.java b/src/main/java/com/wisdo/mmining/service/impl/BannerServiceImpl.java
index 9c11c60..afe9591 100644
--- a/src/main/java/com/wisdo/mmining/service/impl/BannerServiceImpl.java
+++ b/src/main/java/com/wisdo/mmining/service/impl/BannerServiceImpl.java
@@ -25,16 +25,16 @@ public class BannerServiceImpl extends ServiceImpl<BannerMapper, WisdBanner> imp
     public IPage<WisdBanner> selectPage(int page, int num) {
         QueryWrapper<WisdBanner> queryWrapper = new QueryWrapper<>();
         queryWrapper.orderByAsc("banner_type");
-        Page<WisdBanner> p = new Page<>(page,num);
-        IPage<WisdBanner> wisdBannerIPage = bannerMapper.selectPage(p,queryWrapper);
+        Page<WisdBanner> p = new Page<>(page, num);
+        IPage<WisdBanner> wisdBannerIPage = bannerMapper.selectPage(p, queryWrapper);
         return wisdBannerIPage;
     }
 
     @Override
     public WisdBanner getByType(Integer type) {
         QueryWrapper<WisdBanner> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("banner_type",type);
-        WisdBanner wisdBanner=bannerMapper.selectOne(queryWrapper);
+        queryWrapper.eq("banner_type", type);
+        WisdBanner wisdBanner = bannerMapper.selectOne(queryWrapper);
         return wisdBanner;
     }
 }
diff --git a/src/main/java/com/wisdo/mmining/service/impl/BillServiceImpl.java b/src/main/java/com/wisdo/mmining/service/impl/BillServiceImpl.java
index 302e8ea..80fc1a7 100644
--- a/src/main/java/com/wisdo/mmining/service/impl/BillServiceImpl.java
+++ b/src/main/java/com/wisdo/mmining/service/impl/BillServiceImpl.java
@@ -22,23 +22,23 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, WisdBill> implement
 
     @Override
     public Boolean addBill(Integer type, Integer category, String orderNum, Long userId, String introduction, BigDecimal numerical) {
-        WisdBill wisdBill=new WisdBill();
+        WisdBill wisdBill = new WisdBill();
         wisdBill.setBillType(type);
         wisdBill.setBillCategory(category);
         wisdBill.setBillOrderNumber(orderNum);
         wisdBill.setUserId(userId);
         wisdBill.setBillIntroduction(introduction);
-        if (category==1){
+        if (category == 1) {
             wisdBill.setBillPackage(numerical.intValue());
-        }else if (category==2){
+        } else if (category == 2) {
             wisdBill.setBillDiscount(numerical);
-        }else if (category==3){
+        } else if (category == 3) {
             wisdBill.setBillVolume(numerical);
-        }else if (category==4){
+        } else if (category == 4) {
             wisdBill.setBillIntegral(numerical.intValue());
-        }else if (category==5){
+        } else if (category == 5) {
             wisdBill.setBillPay(numerical);
-        }else if (category==6){
+        } else if (category == 6) {
             wisdBill.setBillBalance(numerical);
         }
         return saveOrUpdate(wisdBill);
diff --git a/src/main/java/com/wisdo/mmining/service/impl/BlukServiceImpl.java b/src/main/java/com/wisdo/mmining/service/impl/BlukServiceImpl.java
index 7c5678e..737d6a3 100644
--- a/src/main/java/com/wisdo/mmining/service/impl/BlukServiceImpl.java
+++ b/src/main/java/com/wisdo/mmining/service/impl/BlukServiceImpl.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.wisdo.mmining.entity.WisdBulk;
 import com.wisdo.mmining.mapper.BulkMapper;
 import com.wisdo.mmining.service.BlukService;
-import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/src/main/java/com/wisdo/mmining/service/impl/CashVolumeServiceImpl.java b/src/main/java/com/wisdo/mmining/service/impl/CashVolumeServiceImpl.java
index 29a6a5c..5eb734b 100644
--- a/src/main/java/com/wisdo/mmining/service/impl/CashVolumeServiceImpl.java
+++ b/src/main/java/com/wisdo/mmining/service/impl/CashVolumeServiceImpl.java
@@ -19,8 +19,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-
 /**
  * @Auther: cg
  * @Date: 2020/9/18 15:19
@@ -39,44 +37,44 @@ public class CashVolumeServiceImpl extends ServiceImpl<CashVolumeMapper, WisdCas
     private WxuserService wxuserService;
 
     @Override
-    public IPage<WisdCashVolume> getListByCompanyId(Long companyId,int page, int num) {
+    public IPage<WisdCashVolume> getListByCompanyId(Long companyId, int page, int num) {
         QueryWrapper<WisdCashVolume> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("company_id",companyId);
-        queryWrapper.eq("volume_isdiscount",0);
-        Page<WisdCashVolume> p = new Page<>(page,num);
-        IPage<WisdCashVolume> wisdCashVolumeIPage = cashVolumeMapper.selectPage(p,queryWrapper);
+        queryWrapper.eq("company_id", companyId);
+        queryWrapper.eq("volume_isdiscount", 0);
+        Page<WisdCashVolume> p = new Page<>(page, num);
+        IPage<WisdCashVolume> wisdCashVolumeIPage = cashVolumeMapper.selectPage(p, queryWrapper);
         return wisdCashVolumeIPage;
     }
 
     @Override
     public IPage<WisdCashVolume> getIssueListByCompanyId(Long companyId, int page, int num) {
         QueryWrapper<WisdCashVolume> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("company_id",companyId);
-        queryWrapper.eq("status",1);
-        queryWrapper.eq("volume_isdiscount",0);
-        Page<WisdCashVolume> p = new Page<>(page,num);
-        IPage<WisdCashVolume> wisdCashVolumeIPage = cashVolumeMapper.selectPage(p,queryWrapper);
+        queryWrapper.eq("company_id", companyId);
+        queryWrapper.eq("status", 1);
+        queryWrapper.eq("volume_isdiscount", 0);
+        Page<WisdCashVolume> p = new Page<>(page, num);
+        IPage<WisdCashVolume> wisdCashVolumeIPage = cashVolumeMapper.selectPage(p, queryWrapper);
         return wisdCashVolumeIPage;
     }
 
     @Override
     public IPage<WisdCashVolume> getList2ByCompanyId(Long companyId, int page, int num) {
         QueryWrapper<WisdCashVolume> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("company_id",companyId);
-        queryWrapper.eq("volume_isdiscount",1);
-        Page<WisdCashVolume> p = new Page<>(page,num);
-        IPage<WisdCashVolume> wisdCashVolumeIPage = cashVolumeMapper.selectPage(p,queryWrapper);
+        queryWrapper.eq("company_id", companyId);
+        queryWrapper.eq("volume_isdiscount", 1);
+        Page<WisdCashVolume> p = new Page<>(page, num);
+        IPage<WisdCashVolume> wisdCashVolumeIPage = cashVolumeMapper.selectPage(p, queryWrapper);
         return wisdCashVolumeIPage;
     }
 
     @Override
     public IPage<WisdCashVolume> getIssueList2ByCompanyId(Long companyId, int page, int num) {
         QueryWrapper<WisdCashVolume> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("company_id",companyId);
-        queryWrapper.and(wraper ->wraper.eq("status",1).or().eq("status",2));
-        queryWrapper.eq("volume_isdiscount",1);
-        Page<WisdCashVolume> p = new Page<>(page,num);
-        IPage<WisdCashVolume> wisdCashVolumeIPage = cashVolumeMapper.selectPage(p,queryWrapper);
+        queryWrapper.eq("company_id", companyId);
+        queryWrapper.and(wraper -> wraper.eq("status", 1).or().eq("status", 2));
+        queryWrapper.eq("volume_isdiscount", 1);
+        Page<WisdCashVolume> p = new Page<>(page, num);
+        IPage<WisdCashVolume> wisdCashVolumeIPage = cashVolumeMapper.selectPage(p, queryWrapper);
         return wisdCashVolumeIPage;
     }
 
@@ -84,83 +82,83 @@ public class CashVolumeServiceImpl extends ServiceImpl<CashVolumeMapper, WisdCas
     public WisdCashVolume getByName(String name, Long companyId) {
         QueryWrapper<WisdCashVolume> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("package_name", name);
-        queryWrapper.eq("company_id",companyId);
+        queryWrapper.eq("company_id", companyId);
         return cashVolumeMapper.selectOne(queryWrapper);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result send(WisdCashVolume wisdCashVolume) {
-        String[] userIds=wisdCashVolume.getUserId().split(",");
-        wisdCashVolume.setVolumeSendNum(wisdCashVolume.getVolumeSendNum()+userIds.length);
-        if (wisdCashVolume.getVolumeRemaNum()-userIds.length<0){
-            return new Result(ResultUtil.ERROR,"现金券不足");
+        String[] userIds = wisdCashVolume.getUserId().split(",");
+        wisdCashVolume.setVolumeSendNum(wisdCashVolume.getVolumeSendNum() + userIds.length);
+        if (wisdCashVolume.getVolumeRemaNum() - userIds.length < 0) {
+            return new Result(ResultUtil.ERROR, "现金券不足");
         }
-        wisdCashVolume.setVolumeRemaNum(wisdCashVolume.getVolumeRemaNum()-userIds.length);
+        wisdCashVolume.setVolumeRemaNum(wisdCashVolume.getVolumeRemaNum() - userIds.length);
         saveOrUpdate(wisdCashVolume);
-        for (int i=0;i<userIds.length;i++){
+        for (int i = 0; i < userIds.length; i++) {
             QueryWrapper<WisdUserVolume> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("user_id",userIds[i]);
-            queryWrapper.eq("volume_id",wisdCashVolume.getId());
-            WisdUserVolume wisdUserVolume=userVolumeService.getOne(queryWrapper);
-            if (wisdUserVolume!=null){
-                return new Result(ResultUtil.ERROR,"不能重复发放现金券");
+            queryWrapper.eq("user_id", userIds[i]);
+            queryWrapper.eq("volume_id", wisdCashVolume.getId());
+            WisdUserVolume wisdUserVolume = userVolumeService.getOne(queryWrapper);
+            if (wisdUserVolume != null) {
+                return new Result(ResultUtil.ERROR, "不能重复发放现金券");
             }
-            WisdUserVolume wisdUserVolume1=new WisdUserVolume();
+            WisdUserVolume wisdUserVolume1 = new WisdUserVolume();
             wisdUserVolume1.setUserId(Long.parseLong(userIds[i]));
             wisdUserVolume1.setVolumeId(wisdCashVolume.getId());
             userVolumeService.save(wisdUserVolume1);
-            WisdUser wisdUser=wisdUserService.getByUserId(Long.parseLong(userIds[i]));
+            WisdUser wisdUser = wisdUserService.getByUserId(Long.parseLong(userIds[i]));
             wisdUser.setUserVolumeBalance(wisdUser.getUserVolumeBalance().add(wisdCashVolume.getVolumePrice()));
             wisdUserService.saveOrUpdate(wisdUser);
 
             QueryWrapper<WisdWxuser> wisdWxuserQueryWrapper = new QueryWrapper<>();
-            wisdWxuserQueryWrapper.eq("company_user_id",wisdUser.getId());
-            WisdWxuser wisdWxuser=wxuserService.getOne(wisdWxuserQueryWrapper);
-            if (wisdWxuser!=null){
+            wisdWxuserQueryWrapper.eq("company_user_id", wisdUser.getId());
+            WisdWxuser wisdWxuser = wxuserService.getOne(wisdWxuserQueryWrapper);
+            if (wisdWxuser != null) {
                 wisdWxuser.setUserVolumeBalance(wisdWxuser.getUserVolumeBalance().add(wisdCashVolume.getVolumePrice()));
                 wxuserService.saveOrUpdate(wisdWxuser);
             }
         }
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result senddDscount(WisdCashVolume wisdCashVolume) {
-        String[] userIds=wisdCashVolume.getUserId().split(",");
-        wisdCashVolume.setVolumeSendNum(wisdCashVolume.getVolumeSendNum()+userIds.length);
-        if (wisdCashVolume.getVolumeRemaNum()-userIds.length<0){
-            return new Result(ResultUtil.ERROR,"现金折扣券不足");
+        String[] userIds = wisdCashVolume.getUserId().split(",");
+        wisdCashVolume.setVolumeSendNum(wisdCashVolume.getVolumeSendNum() + userIds.length);
+        if (wisdCashVolume.getVolumeRemaNum() - userIds.length < 0) {
+            return new Result(ResultUtil.ERROR, "现金折扣券不足");
         }
-        wisdCashVolume.setVolumeRemaNum(wisdCashVolume.getVolumeRemaNum()-userIds.length);
+        wisdCashVolume.setVolumeRemaNum(wisdCashVolume.getVolumeRemaNum() - userIds.length);
         saveOrUpdate(wisdCashVolume);
-        for (int i=0;i<userIds.length;i++){
+        for (int i = 0; i < userIds.length; i++) {
             QueryWrapper<WisdUserVolume> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("user_id",userIds[i]);
-            queryWrapper.eq("volume_id",wisdCashVolume.getId());
-            WisdUserVolume wisdUserVolume=userVolumeService.getOne(queryWrapper);
-            if (wisdUserVolume!=null){
-                return new Result(ResultUtil.ERROR,"不能重复发放现金折扣券");
+            queryWrapper.eq("user_id", userIds[i]);
+            queryWrapper.eq("volume_id", wisdCashVolume.getId());
+            WisdUserVolume wisdUserVolume = userVolumeService.getOne(queryWrapper);
+            if (wisdUserVolume != null) {
+                return new Result(ResultUtil.ERROR, "不能重复发放现金折扣券");
             }
-            WisdUserVolume wisdUserVolume1=new WisdUserVolume();
+            WisdUserVolume wisdUserVolume1 = new WisdUserVolume();
             wisdUserVolume1.setUserId(Long.parseLong(userIds[i]));
             wisdUserVolume1.setVolumeId(wisdCashVolume.getId());
             wisdUserVolume1.setVolumeIsdiscount(1);
             userVolumeService.save(wisdUserVolume1);
-            WisdUser wisdUser=wisdUserService.getByUserId(Long.parseLong(userIds[i]));
+            WisdUser wisdUser = wisdUserService.getByUserId(Long.parseLong(userIds[i]));
             wisdUser.setUserDiscountBalance(wisdUser.getUserDiscountBalance().add(wisdCashVolume.getVolumePrice()));
             wisdUser.setUserDiscount(wisdCashVolume.getVolumeDiscount());
             wisdUserService.saveOrUpdate(wisdUser);
             QueryWrapper<WisdWxuser> wisdWxuserQueryWrapper = new QueryWrapper<>();
-            wisdWxuserQueryWrapper.eq("company_user_id",wisdUser.getId());
-            WisdWxuser wisdWxuser=wxuserService.getOne(wisdWxuserQueryWrapper);
-            if (wisdWxuser!=null){
+            wisdWxuserQueryWrapper.eq("company_user_id", wisdUser.getId());
+            WisdWxuser wisdWxuser = wxuserService.getOne(wisdWxuserQueryWrapper);
+            if (wisdWxuser != null) {
                 wisdWxuser.setUserDiscountBalance(wisdWxuser.getUserDiscountBalance().add(wisdCashVolume.getVolumePrice()));
                 wisdWxuser.setUserDiscount(wisdCashVolume.getVolumeDiscount());
                 wxuserService.saveOrUpdate(wisdWxuser);
             }
         }
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG);
     }
 }
diff --git a/src/main/java/com/wisdo/mmining/service/impl/CompanyServiceImpl.java b/src/main/java/com/wisdo/mmining/service/impl/CompanyServiceImpl.java
index d691bff..8447185 100644
--- a/src/main/java/com/wisdo/mmining/service/impl/CompanyServiceImpl.java
+++ b/src/main/java/com/wisdo/mmining/service/impl/CompanyServiceImpl.java
@@ -24,12 +24,12 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, WisdCompany>
     @Override
     public IPage<WisdCompany> selectPage(String name, int page, int num) {
         QueryWrapper<WisdCompany> queryWrapper = new QueryWrapper<>();
-        if (name!=null && !"".equals(name)) {
+        if (name != null && !"".equals(name)) {
             queryWrapper.like("company_name", name);
         }
         queryWrapper.like("is_deleted", 0);
-        Page<WisdCompany> p = new Page<>(page,num);
-        IPage<WisdCompany> wisdCompanyIPage = companyMapper.selectPage(p,queryWrapper);
+        Page<WisdCompany> p = new Page<>(page, num);
+        IPage<WisdCompany> wisdCompanyIPage = companyMapper.selectPage(p, queryWrapper);
         return wisdCompanyIPage;
     }
 
diff --git a/src/main/java/com/wisdo/mmining/service/impl/ContractServiceImpl.java b/src/main/java/com/wisdo/mmining/service/impl/ContractServiceImpl.java
index 3f3372d..df53614 100644
--- a/src/main/java/com/wisdo/mmining/service/impl/ContractServiceImpl.java
+++ b/src/main/java/com/wisdo/mmining/service/impl/ContractServiceImpl.java
@@ -7,12 +7,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.wisdo.mmining.entity.WisdBulk;
 import com.wisdo.mmining.entity.WisdCompany;
 import com.wisdo.mmining.entity.WisdContract;
-import com.wisdo.mmining.entity.WisdGoodsSpec;
 import com.wisdo.mmining.mapper.BulkMapper;
 import com.wisdo.mmining.mapper.CompanyMapper;
 import com.wisdo.mmining.mapper.ContractMapper;
-import com.wisdo.mmining.mapper.GoodsSpecMapper;
-import com.wisdo.mmining.service.CompanyService;
 import com.wisdo.mmining.service.ContractService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -38,19 +35,19 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, WisdContrac
     public IPage<WisdContract> selectPage(String name, int page, int num) {
         QueryWrapper<WisdContract> queryWrapper = new QueryWrapper<>();
         QueryWrapper<WisdCompany> companyQueryWrapper = new QueryWrapper<>();
-        if (name!=null && !"".equals(name)) {
+        if (name != null && !"".equals(name)) {
             companyQueryWrapper.like("company_name", name);
-            WisdCompany wisdCompany=companyMapper.selectOne(companyQueryWrapper);
-            if (wisdCompany!=null){
-                queryWrapper.eq("company_id",wisdCompany.getId());
+            WisdCompany wisdCompany = companyMapper.selectOne(companyQueryWrapper);
+            if (wisdCompany != null) {
+                queryWrapper.eq("company_id", wisdCompany.getId());
             }
         }
         queryWrapper.like("is_deleted", 0);
-        Page<WisdContract> p = new Page<>(page,num);
-        IPage<WisdContract> wisdContractIPage = contractMapper.selectPage(p,queryWrapper);
+        Page<WisdContract> p = new Page<>(page, num);
+        IPage<WisdContract> wisdContractIPage = contractMapper.selectPage(p, queryWrapper);
         wisdContractIPage.getRecords().stream().forEach(wisdContract -> {
-            WisdCompany wisdCompany=companyMapper.selectById(wisdContract.getCompanyId());
-            if (wisdCompany!=null) {
+            WisdCompany wisdCompany = companyMapper.selectById(wisdContract.getCompanyId());
+            if (wisdCompany != null) {
                 wisdContract.setCompanyName(wisdCompany.getCompanyName());
             }
         });
@@ -68,12 +65,12 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, WisdContrac
 
     @Override
     public Void contractovOperdue(Long contractId) {
-        WisdContract contract=getById(contractId);
-        String[] goodsId=contract.getGoodsId().split(",");
-        for (int i=0;i<goodsId.length;i++){
+        WisdContract contract = getById(contractId);
+        String[] goodsId = contract.getGoodsId().split(",");
+        for (int i = 0; i < goodsId.length; i++) {
             QueryWrapper<WisdBulk> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("goods_id",goodsId[i]);
-            queryWrapper.eq("company_id",contract.getCompanyId());
+            queryWrapper.eq("goods_id", goodsId[i]);
+            queryWrapper.eq("company_id", contract.getCompanyId());
             bulkMapper.delete(queryWrapper);
         }
         contract.setStatus(2);
@@ -83,12 +80,12 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, WisdContrac
 
     @Override
     public Void contractDel(Long contractId) {
-        WisdContract contract=getById(contractId);
-        String[] goodsId=contract.getGoodsId().split(",");
-        for (int i=0;i<goodsId.length;i++){
+        WisdContract contract = getById(contractId);
+        String[] goodsId = contract.getGoodsId().split(",");
+        for (int i = 0; i < goodsId.length; i++) {
             QueryWrapper<WisdBulk> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("goods_id",goodsId[i]);
-            queryWrapper.eq("company_id",contract.getCompanyId());
+            queryWrapper.eq("goods_id", goodsId[i]);
+            queryWrapper.eq("company_id", contract.getCompanyId());
             bulkMapper.delete(queryWrapper);
         }
         return null;
diff --git a/src/main/java/com/wisdo/mmining/service/impl/DeptServiceImpl.java b/src/main/java/com/wisdo/mmining/service/impl/DeptServiceImpl.java
index 336f78d..b170a8d 100644
--- a/src/main/java/com/wisdo/mmining/service/impl/DeptServiceImpl.java
+++ b/src/main/java/com/wisdo/mmining/service/impl/DeptServiceImpl.java
@@ -9,7 +9,6 @@ import com.wisdo.mmining.entity.WisdCompany;
 import com.wisdo.mmining.entity.WisdDept;
 import com.wisdo.mmining.mapper.CompanyMapper;
 import com.wisdo.mmining.mapper.DeptMapper;
-import com.wisdo.mmining.service.CompanyService;
 import com.wisdo.mmining.service.DeptService;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.subject.Subject;
@@ -30,26 +29,26 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, WisdDept> implement
     private CompanyMapper companyMapper;
 
     @Override
-    public IPage<WisdDept> selectPage(Long companyId,String name, int page, int num) {
+    public IPage<WisdDept> selectPage(Long companyId, String name, int page, int num) {
         QueryWrapper<WisdDept> queryWrapper = new QueryWrapper<>();
-        if (name!=null && !"".equals(name)) {
+        if (name != null && !"".equals(name)) {
             queryWrapper.like("dept_name", name);
         }
         queryWrapper.like("is_deleted", 0);
         Subject subject = SecurityUtils.getSubject();
-        User user= (User) subject.getSession().getAttribute("sys_user");
-        if (user.getCompanyId()!=0){
+        User user = (User) subject.getSession().getAttribute("sys_user");
+        if (user.getCompanyId() != 0) {
             queryWrapper.eq("company_id", user.getCompanyId());
-        }else {
-            if (companyId!=0 &&companyId!=null && !"".equals(companyId)) {
+        } else {
+            if (companyId != 0 && companyId != null && !"".equals(companyId)) {
                 queryWrapper.eq("company_id", companyId);
             }
         }
-        Page<WisdDept> p = new Page<>(page,num);
-        IPage<WisdDept> wisdDeptIPage = deptMapper.selectPage(p,queryWrapper);
+        Page<WisdDept> p = new Page<>(page, num);
+        IPage<WisdDept> wisdDeptIPage = deptMapper.selectPage(p, queryWrapper);
         wisdDeptIPage.getRecords().stream().forEach(wisdDept -> {
-            WisdCompany wisdCompany=companyMapper.selectById(wisdDept.getCompanyId());
-            if (wisdCompany!=null) {
+            WisdCompany wisdCompany = companyMapper.selectById(wisdDept.getCompanyId());
+            if (wisdCompany != null) {
                 wisdDept.setCompanyName(wisdCompany.getCompanyName());
             }
         });
@@ -57,7 +56,7 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, WisdDept> implement
     }
 
     @Override
-    public WisdDept getByName(String name,Long companyId) {
+    public WisdDept getByName(String name, Long companyId) {
         QueryWrapper<WisdDept> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("dept_name", name);
         queryWrapper.eq("company_id", companyId);
diff --git a/src/main/java/com/wisdo/mmining/service/impl/FeedBackServiceImpl.java b/src/main/java/com/wisdo/mmining/service/impl/FeedBackServiceImpl.java
index 1bdc3b5..13f03c2 100644
--- a/src/main/java/com/wisdo/mmining/service/impl/FeedBackServiceImpl.java
+++ b/src/main/java/com/wisdo/mmining/service/impl/FeedBackServiceImpl.java
@@ -22,15 +22,15 @@ public class FeedBackServiceImpl extends ServiceImpl<FeedBackMapper, WisdFeedbac
     private FeedBackMapper feedBackMapper;
 
     @Override
-    public IPage<WisdFeedback> selectPage(String phone,int page, int num) {
+    public IPage<WisdFeedback> selectPage(String phone, int page, int num) {
         QueryWrapper<WisdFeedback> queryWrapper = new QueryWrapper<>();
         queryWrapper.like("is_deleted", 0);
         queryWrapper.orderByDesc("create_time");
-        if (phone!=null&&!"".equals(phone)){
-            queryWrapper.like("feedback_phone",phone);
+        if (phone != null && !"".equals(phone)) {
+            queryWrapper.like("feedback_phone", phone);
         }
-        Page<WisdFeedback> p = new Page<>(page,num);
-        IPage<WisdFeedback> wisdCompanyIPage = feedBackMapper.selectPage(p,queryWrapper);
+        Page<WisdFeedback> p = new Page<>(page, num);
+        IPage<WisdFeedback> wisdCompanyIPage = feedBackMapper.selectPage(p, queryWrapper);
         return wisdCompanyIPage;
     }
 }
diff --git a/src/main/java/com/wisdo/mmining/service/impl/GoodsServiceImpl.java b/src/main/java/com/wisdo/mmining/service/impl/GoodsServiceImpl.java
index 4735879..1a987d0 100644
--- a/src/main/java/com/wisdo/mmining/service/impl/GoodsServiceImpl.java
+++ b/src/main/java/com/wisdo/mmining/service/impl/GoodsServiceImpl.java
@@ -1,7 +1,5 @@
 package com.wisdo.mmining.service.impl;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -20,15 +18,12 @@ import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.response.QueryResponse;
-import org.apache.solr.common.SolrInputDocument;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -271,7 +266,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, WisdGoods> implem
     }
 
     @Override
-    public IPage<WisdGoods> contractseelist(String name,Long contractId, int page, int num) {
+    public IPage<WisdGoods> contractseelist(String name, Long contractId, int page, int num) {
         List<WisdGoods> wisdGoodsList = new ArrayList<>();
 //        QueryWrapper<WisdGoods> queryWrapper = new QueryWrapper<>();
 //        queryWrapper.eq("goods_classify", 10);
@@ -280,7 +275,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, WisdGoods> implem
 //        }
 //        Page<WisdGoods> p = new Page<>(page, num);
 //        IPage<WisdGoods> wisdGoodsIPage = goodsMapper.selectPage(p, queryWrapper);
-        IPage<WisdGoods> wisdGoodsIPage=null;
+        IPage<WisdGoods> wisdGoodsIPage = null;
         if (contractId != null) {
             WisdContract wisdContract = contractMapper.selectById(contractId);
             if (wisdContract.getGoodsId() != null) {
@@ -295,7 +290,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, WisdGoods> implem
                 }
                 QueryWrapper<WisdGoods> queryWrapper = new QueryWrapper<>();
                 queryWrapper.in("id", idList);
-                if (name!=null && !"".equals(name)) {
+                if (name != null && !"".equals(name)) {
                     queryWrapper.like("goods_name", name);
                 }
                 Page<WisdGoods> p = new Page<>(page, num);
@@ -482,7 +477,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, WisdGoods> implem
                 deleteClassGoods(idList);
             }
             try {
-                for (Long id:idList) {
+                for (Long id : idList) {
                     SolrQuery solrQuery = new SolrQuery();
                     String str = "goodsId:" + id;
                     solrQuery.setQuery(str);
diff --git a/src/main/java/com/wisdo/mmining/service/impl/GoodsSpecServiceImpl.java b/src/main/java/com/wisdo/mmining/service/impl/GoodsSpecServiceImpl.java
index e285ee5..a9aac01 100644
--- a/src/main/java/com/wisdo/mmining/service/impl/GoodsSpecServiceImpl.java
+++ b/src/main/java/com/wisdo/mmining/service/impl/GoodsSpecServiceImpl.java
@@ -2,15 +2,16 @@ package com.wisdo.mmining.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.wisdo.mmining.entity.*;
+import com.wisdo.mmining.entity.WisdBulk;
+import com.wisdo.mmining.entity.WisdContract;
+import com.wisdo.mmining.entity.WisdGoods;
+import com.wisdo.mmining.entity.WisdGoodsSpec;
 import com.wisdo.mmining.mapper.GoodsSpecMapper;
 import com.wisdo.mmining.result.Result;
 import com.wisdo.mmining.result.ResultUtil;
 import com.wisdo.mmining.service.BlukService;
 import com.wisdo.mmining.service.ContractService;
 import com.wisdo.mmining.service.GoodsSpecService;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -37,32 +38,32 @@ public class GoodsSpecServiceImpl extends ServiceImpl<GoodsSpecMapper, WisdGoods
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Result addBuly(Long contractId,WisdGoods wisdGoods) {
+    public Result addBuly(Long contractId, WisdGoods wisdGoods) {
         QueryWrapper<WisdBulk> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("goods_id", wisdGoods.getId());
         queryWrapper.eq("company_id", wisdGoods.getCompanyId());
         blukService.remove(queryWrapper);
         try {
             int i = 0;
-            for (WisdGoodsSpec wisdGoodsSpec:wisdGoods.getWisdGoodsSpecList()){
+            for (WisdGoodsSpec wisdGoodsSpec : wisdGoods.getWisdGoodsSpecList()) {
                 if (i == 0) {
                     i++;
                     continue;
                 }
-                if (wisdGoodsSpec.getSpecBulyPrice()!=null && !wisdGoodsSpec.getSpecBulyPrice().equals(0)) {
+                if (wisdGoodsSpec.getSpecBulyPrice() != null && !wisdGoodsSpec.getSpecBulyPrice().equals(0)) {
                     WisdBulk wisdBulk = new WisdBulk();
                     wisdBulk.setGoodsId(wisdGoods.getId());
                     wisdBulk.setSpecId(wisdGoodsSpec.getId());
                     wisdBulk.setGoodsBulkPrice(wisdGoodsSpec.getSpecBulyPrice());
                     wisdBulk.setCompanyId(wisdGoods.getCompanyId());
-                    WisdContract wisdContract=contractService.getById(contractId);
+                    WisdContract wisdContract = contractService.getById(contractId);
                     wisdBulk.setIsEnable(wisdContract.getStatus());
                     blukService.save(wisdBulk);
                 }
             }
-        }catch (Exception e){
-            return new Result(ResultUtil.ERROR,ResultUtil.ERROR_MSG);
+        } catch (Exception e) {
+            return new Result(ResultUtil.ERROR, ResultUtil.ERROR_MSG);
         }
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG);
     }
 }
diff --git a/src/main/java/com/wisdo/mmining/service/impl/GoodsTypeServiceImpl.java b/src/main/java/com/wisdo/mmining/service/impl/GoodsTypeServiceImpl.java
index 1597345..a3ff907 100644
--- a/src/main/java/com/wisdo/mmining/service/impl/GoodsTypeServiceImpl.java
+++ b/src/main/java/com/wisdo/mmining/service/impl/GoodsTypeServiceImpl.java
@@ -29,11 +29,11 @@ public class GoodsTypeServiceImpl extends ServiceImpl<GoodsTypeMapper, WisdGoods
     @Override
     public IPage<WisdGoodsType> selectPage(String name, int page, int num) {
         QueryWrapper<WisdGoodsType> queryWrapper = new QueryWrapper<>();
-        if (name!=null) {
+        if (name != null) {
             queryWrapper.like("type_name", name);
         }
-        Page<WisdGoodsType> p = new Page<>(page,num);
-        IPage<WisdGoodsType> wisdGoodsTypePage = goodsTypeMapper.selectPage(p,queryWrapper);
+        Page<WisdGoodsType> p = new Page<>(page, num);
+        IPage<WisdGoodsType> wisdGoodsTypePage = goodsTypeMapper.selectPage(p, queryWrapper);
         return wisdGoodsTypePage;
     }
 
@@ -48,30 +48,30 @@ public class GoodsTypeServiceImpl extends ServiceImpl<GoodsTypeMapper, WisdGoods
     @Transactional(rollbackFor = Exception.class)
     public Result deleteById(Long id) {
         WisdGoodsType wisdGoodsType = getById(id);
-        Boolean flag=false;
-        if (wisdGoodsType.getTypeLevel()==3){
-            flag=removeById(id);
-        }else if (wisdGoodsType.getTypeLevel()==2){
+        Boolean flag = false;
+        if (wisdGoodsType.getTypeLevel() == 3) {
+            flag = removeById(id);
+        } else if (wisdGoodsType.getTypeLevel() == 2) {
             QueryWrapper<WisdGoodsType> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("pid", id);
             remove(queryWrapper);
-            flag=removeById(id);
-        }else {
+            flag = removeById(id);
+        } else {
             QueryWrapper<WisdGoodsType> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("pid", id);
-            List<WisdGoodsType> wisdGoodsTwoTypeList =list(queryWrapper);
-            for (WisdGoodsType wisdGoodsType1:wisdGoodsTwoTypeList){
+            List<WisdGoodsType> wisdGoodsTwoTypeList = list(queryWrapper);
+            for (WisdGoodsType wisdGoodsType1 : wisdGoodsTwoTypeList) {
                 QueryWrapper<WisdGoodsType> queryWrapper1 = new QueryWrapper<>();
                 queryWrapper1.eq("pid", wisdGoodsType1.getId());
                 remove(queryWrapper1);
             }
             remove(queryWrapper);
-            flag=removeById(id);
+            flag = removeById(id);
         }
-        if(flag){
-            return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG);
-        }else{
-            return new Result(ResultUtil.ERROR,ResultUtil.ERROR_MSG);
+        if (flag) {
+            return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG);
+        } else {
+            return new Result(ResultUtil.ERROR, ResultUtil.ERROR_MSG);
         }
     }
 }
diff --git a/src/main/java/com/wisdo/mmining/service/impl/JoinServiceImpl.java b/src/main/java/com/wisdo/mmining/service/impl/JoinServiceImpl.java
index ffc7c7c..a205705 100644
--- a/src/main/java/com/wisdo/mmining/service/impl/JoinServiceImpl.java
+++ b/src/main/java/com/wisdo/mmining/service/impl/JoinServiceImpl.java
@@ -22,7 +22,7 @@ public class JoinServiceImpl extends ServiceImpl<JoinMapper, WisdJoin> implement
     private JoinMapper joinMapper;
 
     @Override
-    public IPage<WisdJoin> selectPage(String userName,String userPhone,int page, int num) {
+    public IPage<WisdJoin> selectPage(String userName, String userPhone, int page, int num) {
         QueryWrapper<WisdJoin> queryWrapper = new QueryWrapper<>();
         queryWrapper.orderByDesc("create_time");
         if (userName != null && !"".equals(userName)) {
@@ -31,8 +31,8 @@ public class JoinServiceImpl extends ServiceImpl<JoinMapper, WisdJoin> implement
         if (userPhone != null && !"".equals(userPhone)) {
             queryWrapper.like("join_phone", userPhone);
         }
-        Page<WisdJoin> p = new Page<>(page,num);
-        IPage<WisdJoin> wisdBannerIPage = joinMapper.selectPage(p,queryWrapper);
+        Page<WisdJoin> p = new Page<>(page, num);
+        IPage<WisdJoin> wisdBannerIPage = joinMapper.selectPage(p, queryWrapper);
         return wisdBannerIPage;
     }
 }
diff --git a/src/main/java/com/wisdo/mmining/service/impl/OperationLogServiceImpl.java b/src/main/java/com/wisdo/mmining/service/impl/OperationLogServiceImpl.java
index f84a9fd..d070ec2 100644
--- a/src/main/java/com/wisdo/mmining/service/impl/OperationLogServiceImpl.java
+++ b/src/main/java/com/wisdo/mmining/service/impl/OperationLogServiceImpl.java
@@ -24,8 +24,8 @@ public class OperationLogServiceImpl extends ServiceImpl<OperationLogMapper, Ope
 
     @Override
     public Page<OperationLog> table(int page, int num) {
-        Page p = new Page(page,num);
-        Page<OperationLog> pData = tOperationLogMapper.selectPage(p,null);
+        Page p = new Page(page, num);
+        Page<OperationLog> pData = tOperationLogMapper.selectPage(p, null);
         return pData;
     }
 }
diff --git a/src/main/java/com/wisdo/mmining/service/impl/OrderDetailServiceImpl.java b/src/main/java/com/wisdo/mmining/service/impl/OrderDetailServiceImpl.java
index 35baf1d..789c7ef 100644
--- a/src/main/java/com/wisdo/mmining/service/impl/OrderDetailServiceImpl.java
+++ b/src/main/java/com/wisdo/mmining/service/impl/OrderDetailServiceImpl.java
@@ -24,8 +24,8 @@ public class OrderDetailServiceImpl extends ServiceImpl<OrderDetailMapper, WisdO
     @Override
     public List<WisdOrderDetail> getByOrderId(Long orderId) {
         QueryWrapper<WisdOrderDetail> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("order_id",orderId);
-        List<WisdOrderDetail> wisdOrderDetailList=orderDetailMapper.selectList(queryWrapper);
+        queryWrapper.eq("order_id", orderId);
+        List<WisdOrderDetail> wisdOrderDetailList = orderDetailMapper.selectList(queryWrapper);
         return wisdOrderDetailList;
     }
 }
diff --git a/src/main/java/com/wisdo/mmining/service/impl/OrderServiceImpl.java b/src/main/java/com/wisdo/mmining/service/impl/OrderServiceImpl.java
index 922d170..21a4c43 100644
--- a/src/main/java/com/wisdo/mmining/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/wisdo/mmining/service/impl/OrderServiceImpl.java
@@ -162,7 +162,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, WisdOeder> implem
         return wisdCompanyIPage;
     }
 
-    private String path = "/home/wisdommining/upload/file/";
+    private final String path = "/home/wisdommining/upload/file/";
 
     public Boolean promotionNum(Long userId, WisdGoods wisdGoods, Integer goodsNum) {
         QueryWrapper<WisdOeder> queryWrapper = new QueryWrapper<>();
@@ -173,11 +173,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, WisdOeder> implem
         List<WisdOeder> wisdOederList = list(queryWrapper);
         Integer count = 0;
         if (wisdOederList.isEmpty()) {
-            if (goodsNum <= wisdGoods.getPromotionNum()) {
-                return true;
-            } else {
-                return false;
-            }
+            return goodsNum <= wisdGoods.getPromotionNum();
         }
         for (WisdOeder wisdOeder : wisdOederList) {
             QueryWrapper<WisdOrderDetail> orderDetailQueryWrapper = new QueryWrapper<>();
@@ -188,10 +184,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, WisdOeder> implem
                 count += wisdOrderDetail.getGoodsNum();
             }
         }
-        if (count <= wisdGoods.getPromotionNum()) {
-            return true;
-        }
-        return false;
+        return count <= wisdGoods.getPromotionNum();
     }
 
     @Override
@@ -386,7 +379,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, WisdOeder> implem
                     if (wisdOeder != null) {
                         if (list.get(i).get(11).toString() != null && !"".equals(list.get(i).get(11).toString()) && list.get(i).get(12).toString() != null && !"".equals(list.get(i).get(12).toString())) {
                             wisdOeder.setLogisticsName(list.get(i).get(11).toString());
-                            wisdOeder.setLogisticsNum(list.get(i).get(12).toString());
+                            wisdOeder.setLogistics(list.get(i).get(12).toString());
                             if (wisdOeder.getStatus() == 2) {
                                 wisdOeder.setStatus(3);
                                 wisdOeder.setOrderDeliverTime(new Date());
diff --git a/src/main/java/com/wisdo/mmining/service/impl/PackageServiceImpl.java b/src/main/java/com/wisdo/mmining/service/impl/PackageServiceImpl.java
index 49348fc..34f3ebe 100644
--- a/src/main/java/com/wisdo/mmining/service/impl/PackageServiceImpl.java
+++ b/src/main/java/com/wisdo/mmining/service/impl/PackageServiceImpl.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.wisdo.mmining.entity.WisdCashVolume;
 import com.wisdo.mmining.entity.WisdPackage;
 import com.wisdo.mmining.entity.WisdUserPackage;
 import com.wisdo.mmining.mapper.PackageMapper;
@@ -31,27 +30,27 @@ public class PackageServiceImpl extends ServiceImpl<PackageMapper, WisdPackage>
     private UserPackageService userPackageService;
 
     @Override
-    public IPage<WisdPackage> getListByCompanyId(String name,Long companyId, int page, int num) {
+    public IPage<WisdPackage> getListByCompanyId(String name, Long companyId, int page, int num) {
         QueryWrapper<WisdPackage> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("company_id",companyId);
-        if (name!=null && !"".equals(name)) {
+        queryWrapper.eq("company_id", companyId);
+        if (name != null && !"".equals(name)) {
             queryWrapper.like("package_name", name);
         }
-        Page<WisdPackage> p = new Page<>(page,num);
-        IPage<WisdPackage> wisdPackageIPage = packageMapper.selectPage(p,queryWrapper);
+        Page<WisdPackage> p = new Page<>(page, num);
+        IPage<WisdPackage> wisdPackageIPage = packageMapper.selectPage(p, queryWrapper);
         return wisdPackageIPage;
     }
 
     @Override
-    public IPage<WisdPackage> getIssueListByCompanyId(String name,Long companyId, int page, int num) {
+    public IPage<WisdPackage> getIssueListByCompanyId(String name, Long companyId, int page, int num) {
         QueryWrapper<WisdPackage> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("company_id",companyId);
-        queryWrapper.eq("status",1);
-        if (name!=null && !"".equals(name)) {
+        queryWrapper.eq("company_id", companyId);
+        queryWrapper.eq("status", 1);
+        if (name != null && !"".equals(name)) {
             queryWrapper.like("package_name", name);
         }
-        Page<WisdPackage> p = new Page<>(page,num);
-        IPage<WisdPackage> wisdPackageIPage = packageMapper.selectPage(p,queryWrapper);
+        Page<WisdPackage> p = new Page<>(page, num);
+        IPage<WisdPackage> wisdPackageIPage = packageMapper.selectPage(p, queryWrapper);
         return wisdPackageIPage;
     }
 
@@ -59,34 +58,34 @@ public class PackageServiceImpl extends ServiceImpl<PackageMapper, WisdPackage>
     public WisdPackage getByName(String name, Long companyId) {
         QueryWrapper<WisdPackage> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("package_name", name);
-        queryWrapper.eq("company_id",companyId);
+        queryWrapper.eq("company_id", companyId);
         return packageMapper.selectOne(queryWrapper);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result send(WisdPackage wisdPackage) {
-        String[] userIds=wisdPackage.getUserId().split(",");
-        wisdPackage.setPackageSendNum(wisdPackage.getPackageSendNum()+userIds.length);
-        if (wisdPackage.getPackageRemaNum()-userIds.length<0){
-            return new Result(ResultUtil.ERROR,"套餐券不足");
+        String[] userIds = wisdPackage.getUserId().split(",");
+        wisdPackage.setPackageSendNum(wisdPackage.getPackageSendNum() + userIds.length);
+        if (wisdPackage.getPackageRemaNum() - userIds.length < 0) {
+            return new Result(ResultUtil.ERROR, "套餐券不足");
         }
-        wisdPackage.setPackageRemaNum(wisdPackage.getPackageRemaNum()-userIds.length);
+        wisdPackage.setPackageRemaNum(wisdPackage.getPackageRemaNum() - userIds.length);
         saveOrUpdate(wisdPackage);
-        for (int i=0;i<userIds.length;i++){
+        for (int i = 0; i < userIds.length; i++) {
             QueryWrapper<WisdUserPackage> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("user_id",userIds[i]);
-            queryWrapper.eq("package_id",wisdPackage.getId());
-            WisdUserPackage wisdUserPackage1=userPackageService.getOne(queryWrapper);
-            if (wisdUserPackage1!=null){
-                return new Result(ResultUtil.ERROR,"不能重复发放套餐券");
+            queryWrapper.eq("user_id", userIds[i]);
+            queryWrapper.eq("package_id", wisdPackage.getId());
+            WisdUserPackage wisdUserPackage1 = userPackageService.getOne(queryWrapper);
+            if (wisdUserPackage1 != null) {
+                return new Result(ResultUtil.ERROR, "不能重复发放套餐券");
             }
-            WisdUserPackage wisdUserPackage=new WisdUserPackage();
+            WisdUserPackage wisdUserPackage = new WisdUserPackage();
             wisdUserPackage.setUserId(Long.parseLong(userIds[i]));
             wisdUserPackage.setPackageId(wisdPackage.getId());
             userPackageService.save(wisdUserPackage);
         }
-        return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG);
+        return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG);
     }
 
     @Override
diff --git a/src/main/java/com/wisdo/mmining/service/impl/PermissionServiceImpl.java b/src/main/java/com/wisdo/mmining/service/impl/PermissionServiceImpl.java
index 7ff109e..5e8d3bc 100644
--- a/src/main/java/com/wisdo/mmining/service/impl/PermissionServiceImpl.java
+++ b/src/main/java/com/wisdo/mmining/service/impl/PermissionServiceImpl.java
@@ -15,7 +15,7 @@ import java.util.Map;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author hjw
@@ -36,11 +36,11 @@ public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, Permiss
 
     @Override
     public List<Permission> getMenuByType(int type, Long pid, Long roleId) {
-        Map<String,Object> map = new HashMap<>(16);
-        map.put("type",type);
-        map.put("pid",pid);
-        map.put("roleId",roleId);
-        List<Permission> tPermissions = tPermissionMapper.getMenuByType(type,pid,roleId);
+        Map<String, Object> map = new HashMap<>(16);
+        map.put("type", type);
+        map.put("pid", pid);
+        map.put("roleId", roleId);
+        List<Permission> tPermissions = tPermissionMapper.getMenuByType(type, pid, roleId);
         return tPermissions;
     }
 
diff --git a/src/main/java/com/wisdo/mmining/service/impl/ProfitsServiceImpl.java b/src/main/java/com/wisdo/mmining/service/impl/ProfitsServiceImpl.java
index 7b57005..e342cd0 100644
--- a/src/main/java/com/wisdo/mmining/service/impl/ProfitsServiceImpl.java
+++ b/src/main/java/com/wisdo/mmining/service/impl/ProfitsServiceImpl.java
@@ -21,7 +21,8 @@ import java.util.List;
 @Service
 public class ProfitsServiceImpl extends ServiceImpl<ProfitsMapper, WisdProfits> implements ProfitsService {
 
-    @Autowired @Lazy
+    @Autowired
+    @Lazy
     private OrderService orderService;
     @Autowired
     private OrderDetailService orderDetailService;
@@ -42,19 +43,19 @@ public class ProfitsServiceImpl extends ServiceImpl<ProfitsMapper, WisdProfits>
     @Transactional(rollbackFor = Exception.class)
     public Boolean profits(String orderNumber) {
         System.out.println("分润开始*****************");
-        WisdOeder wisdOeder=orderService.getOrderByNumber(orderNumber);
-        WisdProfits wisdProfits=getById(1);
-        List<WisdOrderDetail> wisdOrderDetailList=orderDetailService.getByOrderId(wisdOeder.getId());
-        WisdWxuser wxuser=wxuserService.getById(wisdOeder.getUserId());
-        if (wxuser.getUserPid()!=0) {
+        WisdOeder wisdOeder = orderService.getOrderByNumber(orderNumber);
+        WisdProfits wisdProfits = getById(1);
+        List<WisdOrderDetail> wisdOrderDetailList = orderDetailService.getByOrderId(wisdOeder.getId());
+        WisdWxuser wxuser = wxuserService.getById(wisdOeder.getUserId());
+        if (wxuser.getUserPid() != 0) {
             WisdWxuser twowxuser = wxuserService.getById(wxuser.getUserPid());
-            if (twowxuser!=null&&twowxuser.getUserAllIntegral()>500) {
+            if (twowxuser != null && twowxuser.getUserAllIntegral() > 500) {
                 System.out.println("二级分润开始*****************");
                 twpprofits(wxuser, twowxuser, wisdOeder, wisdProfits, wisdOrderDetailList, 2);
             }
-            if (twowxuser.getUserPid()!=0) {
-                WisdWxuser onewxuser=wxuserService.getById(twowxuser.getUserPid());
-                if (onewxuser!=null&&onewxuser.getUserAllIntegral()>500) {
+            if (twowxuser.getUserPid() != 0) {
+                WisdWxuser onewxuser = wxuserService.getById(twowxuser.getUserPid());
+                if (onewxuser != null && onewxuser.getUserAllIntegral() > 500) {
                     System.out.println("一级分润开始*****************");
                     twpprofits(wxuser, onewxuser, wisdOeder, wisdProfits, wisdOrderDetailList, 1);
                 }
@@ -65,25 +66,24 @@ public class ProfitsServiceImpl extends ServiceImpl<ProfitsMapper, WisdProfits>
     }
 
 
-
-    public void twpprofits(WisdWxuser wxuser,WisdWxuser twowxuser,WisdOeder wisdOeder,WisdProfits wisdProfits,List<WisdOrderDetail> wisdOrderDetailList,Integer type){
-        for (WisdOrderDetail wisdOrderDetail:wisdOrderDetailList){
-            WisdGoods wisdGoods=goodsService.getById(wisdOrderDetail.getGoodsId());
-            if (wisdGoods.getIsProfits()==1&&wisdGoods.getGoodsClassify()!=2&&wisdGoods.getGoodsClassify()!=1){
-                WisdGoodsSpec wisdGoodsSpec=goodsSpecService.getById(wisdOrderDetail.getSpecId());
-                if (wxuser.getUserIscompany()==1) {
-                    WisdUser wisdUser=wisdUserService.getByUserId(wxuser.getUserId());
+    public void twpprofits(WisdWxuser wxuser, WisdWxuser twowxuser, WisdOeder wisdOeder, WisdProfits wisdProfits, List<WisdOrderDetail> wisdOrderDetailList, Integer type) {
+        for (WisdOrderDetail wisdOrderDetail : wisdOrderDetailList) {
+            WisdGoods wisdGoods = goodsService.getById(wisdOrderDetail.getGoodsId());
+            if (wisdGoods.getIsProfits() == 1 && wisdGoods.getGoodsClassify() != 2 && wisdGoods.getGoodsClassify() != 1) {
+                WisdGoodsSpec wisdGoodsSpec = goodsSpecService.getById(wisdOrderDetail.getSpecId());
+                if (wxuser.getUserIscompany() == 1) {
+                    WisdUser wisdUser = wisdUserService.getByUserId(wxuser.getUserId());
                     QueryWrapper<WisdBulk> queryWrapper3 = new QueryWrapper<>();
                     queryWrapper3.eq("goods_id", wisdGoods.getId());
                     queryWrapper3.eq("company_id", wisdUser.getCompanyId());
                     queryWrapper3.eq("spec_id", wisdGoodsSpec.getId());
-                    WisdBulk wisdBulk=blukService.getOne(queryWrapper3);
-                    if (wisdBulk!=null) {
-                        if (twowxuser!=null) {
-                            Double integral=0D;
-                            if (type==2) {
+                    WisdBulk wisdBulk = blukService.getOne(queryWrapper3);
+                    if (wisdBulk != null) {
+                        if (twowxuser != null) {
+                            Double integral = 0D;
+                            if (type == 2) {
                                 integral = wisdBulk.getGoodsBulkPrice().doubleValue() * (wisdGoods.getTwoProfits() / 100D);
-                            }else{
+                            } else {
                                 integral = wisdBulk.getGoodsBulkPrice().doubleValue() * (wisdGoods.getOneProfits() / 100D);
                             }
                             if (integral < 0.01) {
@@ -92,37 +92,37 @@ public class ProfitsServiceImpl extends ServiceImpl<ProfitsMapper, WisdProfits>
                             twowxuser.setUserBalance(twowxuser.getUserBalance().add(new BigDecimal(integral)));
                             billService.addBill(1, 6, wisdOeder.getOrderNumber(), twowxuser.getId(), "分润获得", new BigDecimal(integral));
                         }
-                    }else {
-                        if (twowxuser!=null) {
-                            Double integral=0D;
-                            if (type==2) {
+                    } else {
+                        if (twowxuser != null) {
+                            Double integral = 0D;
+                            if (type == 2) {
                                 integral = wisdGoodsSpec.getSpecPrice().doubleValue() * (wisdGoods.getTwoProfits() / 100D);
-                            }else{
+                            } else {
                                 integral = wisdGoodsSpec.getSpecPrice().doubleValue() * (wisdGoods.getOneProfits() / 100D);
                             }
                             if (integral < 0.01) {
                                 integral = 0.01D;
                             }
                             twowxuser.setUserBalance(twowxuser.getUserBalance().add(new BigDecimal(integral)));
-                            billService.addBill(1,6,wisdOeder.getOrderNumber(),twowxuser.getId(),"分润获得",new BigDecimal(integral));
+                            billService.addBill(1, 6, wisdOeder.getOrderNumber(), twowxuser.getId(), "分润获得", new BigDecimal(integral));
                         }
                     }
-                }else {
-                    if (twowxuser!=null) {
-                        Double integral=0D;
-                        if (type==2) {
+                } else {
+                    if (twowxuser != null) {
+                        Double integral = 0D;
+                        if (type == 2) {
                             integral = wisdGoodsSpec.getSpecPrice().doubleValue() * (wisdGoods.getTwoProfits() / 100D);
-                        }else{
+                        } else {
                             integral = wisdGoodsSpec.getSpecPrice().doubleValue() * (wisdGoods.getOneProfits() / 100D);
                         }
                         if (integral < 0.01) {
                             integral = 0.01D;
                         }
                         twowxuser.setUserBalance(twowxuser.getUserBalance().add(new BigDecimal(integral)));
-                        billService.addBill(1,6,wisdOeder.getOrderNumber(),twowxuser.getId(),"分润获得",new BigDecimal(integral));
+                        billService.addBill(1, 6, wisdOeder.getOrderNumber(), twowxuser.getId(), "分润获得", new BigDecimal(integral));
                     }
                 }
-                if (twowxuser!=null) {
+                if (twowxuser != null) {
                     wxuserService.saveOrUpdate(twowxuser);
                 }
             }
diff --git a/src/main/java/com/wisdo/mmining/service/impl/RolePermissionServiceImpl.java b/src/main/java/com/wisdo/mmining/service/impl/RolePermissionServiceImpl.java
index fb5e6df..f52dbb2 100644
--- a/src/main/java/com/wisdo/mmining/service/impl/RolePermissionServiceImpl.java
+++ b/src/main/java/com/wisdo/mmining/service/impl/RolePermissionServiceImpl.java
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author hjw
diff --git a/src/main/java/com/wisdo/mmining/service/impl/RoleServiceImpl.java b/src/main/java/com/wisdo/mmining/service/impl/RoleServiceImpl.java
index 79808ac..2443832 100644
--- a/src/main/java/com/wisdo/mmining/service/impl/RoleServiceImpl.java
+++ b/src/main/java/com/wisdo/mmining/service/impl/RoleServiceImpl.java
@@ -3,11 +3,11 @@ package com.wisdo.mmining.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.wisdo.mmining.controller.vo.RoleVo;
 import com.wisdo.mmining.entity.Role;
 import com.wisdo.mmining.mapper.RoleMapper;
 import com.wisdo.mmining.service.RoleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -20,7 +20,7 @@ import java.util.stream.Stream;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author hjw
@@ -35,10 +35,10 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
     @Override
     public IPage<Role> getPage(String name, int num, int page) {
         QueryWrapper<Role> tRoleQueryWrapper = new QueryWrapper<>();
-        tRoleQueryWrapper.like("name",name);
+        tRoleQueryWrapper.like("name", name);
         tRoleQueryWrapper.orderByDesc("create_time");
-        Page<Role> p = new Page<>(page,num);
-        IPage<Role> tRolePage = tRoleMapper.selectPage(p,tRoleQueryWrapper);
+        Page<Role> p = new Page<>(page, num);
+        IPage<Role> tRolePage = tRoleMapper.selectPage(p, tRoleQueryWrapper);
         return tRolePage;
     }
 
@@ -49,23 +49,19 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
         List<Long> permissionList = new ArrayList<>();
         String[] permissionStr = tRoleVo.getPermissionStr().split(",");
         Stream<String> stream = Arrays.stream(permissionStr);
-        stream.forEach(permission->permissionList.add(Long.parseLong(permission)));
+        stream.forEach(permission -> permissionList.add(Long.parseLong(permission)));
         Role tRole = new Role();
-        BeanUtils.copyProperties(tRoleVo,tRole);
-        if(tRoleVo.getId()==null){
+        BeanUtils.copyProperties(tRoleVo, tRole);
+        if (tRoleVo.getId() == null) {
             int flag = tRoleMapper.insert(tRole);
-            if(flag==1){
-                if(tRoleMapper.insertBatch(tRole.getId(),permissionList)>0){
-                    return true;
-                }
+            if (flag == 1) {
+                return tRoleMapper.insertBatch(tRole.getId(), permissionList) > 0;
             }
-        }else{
+        } else {
             int flag = tRoleMapper.updateById(tRole);
-            if(flag==1){
-                if(tRoleMapper.deltePermission(tRole.getId())>0){
-                    if(tRoleMapper.insertBatch(tRole.getId(),permissionList)>0){
-                        return true;
-                    }
+            if (flag == 1) {
+                if (tRoleMapper.deltePermission(tRole.getId()) > 0) {
+                    return tRoleMapper.insertBatch(tRole.getId(), permissionList) > 0;
                 }
             }
         }
diff --git a/src/main/java/com/wisdo/mmining/service/impl/SettlementServiceImpl.java b/src/main/java/com/wisdo/mmining/service/impl/SettlementServiceImpl.java
index f3caf8e..a0c0626 100644
--- a/src/main/java/com/wisdo/mmining/service/impl/SettlementServiceImpl.java
+++ b/src/main/java/com/wisdo/mmining/service/impl/SettlementServiceImpl.java
@@ -12,5 +12,5 @@ import org.springframework.stereotype.Service;
  * @Description:
  */
 @Service
-public class SettlementServiceImpl  extends ServiceImpl<SettlementMapper, WisdSettlement> implements SettlementService {
+public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, WisdSettlement> implements SettlementService {
 }
diff --git a/src/main/java/com/wisdo/mmining/service/impl/StoresServiceImpl.java b/src/main/java/com/wisdo/mmining/service/impl/StoresServiceImpl.java
index d44c130..d681c39 100644
--- a/src/main/java/com/wisdo/mmining/service/impl/StoresServiceImpl.java
+++ b/src/main/java/com/wisdo/mmining/service/impl/StoresServiceImpl.java
@@ -24,10 +24,10 @@ public class StoresServiceImpl extends ServiceImpl<StoresMapper, WisdStores> imp
     @Override
     public IPage<WisdStores> selectPage(int page, int num) {
         QueryWrapper<WisdStores> queryWrapper = new QueryWrapper<>();
-        Page<WisdStores> p = new Page<>(page,num);
-        IPage<WisdStores> wisdStoresIPage = storesMapper.selectPage(p,queryWrapper);
-        for (WisdStores wisdStores:wisdStoresIPage.getRecords()){
-            wisdStores.setStoresAllAddress(wisdStores.getStoresProvince()+wisdStores.getStoresCity()+wisdStores.getStoresArea()+wisdStores.getStoresDetailed());
+        Page<WisdStores> p = new Page<>(page, num);
+        IPage<WisdStores> wisdStoresIPage = storesMapper.selectPage(p, queryWrapper);
+        for (WisdStores wisdStores : wisdStoresIPage.getRecords()) {
+            wisdStores.setStoresAllAddress(wisdStores.getStoresProvince() + wisdStores.getStoresCity() + wisdStores.getStoresArea() + wisdStores.getStoresDetailed());
         }
         return wisdStoresIPage;
     }
diff --git a/src/main/java/com/wisdo/mmining/service/impl/UserPackageServiceImpl.java b/src/main/java/com/wisdo/mmining/service/impl/UserPackageServiceImpl.java
index 51c9656..370e5db 100644
--- a/src/main/java/com/wisdo/mmining/service/impl/UserPackageServiceImpl.java
+++ b/src/main/java/com/wisdo/mmining/service/impl/UserPackageServiceImpl.java
@@ -32,10 +32,10 @@ public class UserPackageServiceImpl extends ServiceImpl<UserPackageMapper, WisdU
     public Void ackageovOperdue(Long id) {
         System.out.println("套餐券过期");
         QueryWrapper<WisdUserPackage> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("package_id",id);
-        List<WisdUserPackage> wisdUserPackageList=userPackageMapper.selectList(queryWrapper);
-        for (WisdUserPackage wisdUserPackage:wisdUserPackageList){
-            if (wisdUserPackage.getIsUsed()==0){
+        queryWrapper.eq("package_id", id);
+        List<WisdUserPackage> wisdUserPackageList = userPackageMapper.selectList(queryWrapper);
+        for (WisdUserPackage wisdUserPackage : wisdUserPackageList) {
+            if (wisdUserPackage.getIsUsed() == 0) {
                 wisdUserPackage.setIsUsed(2);
             }
         }
@@ -46,10 +46,10 @@ public class UserPackageServiceImpl extends ServiceImpl<UserPackageMapper, WisdU
     @Override
     public Void packageSms(Long id) {
         QueryWrapper<WisdUserPackage> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("package_id",id);
-        List<WisdUserPackage> userPackageList=list(queryWrapper);
-        for (WisdUserPackage wisdUserPackage:userPackageList){
-            WisdUser wisdUser=wisdUserService.getByUserId(wisdUserPackage.getUserId());
+        queryWrapper.eq("package_id", id);
+        List<WisdUserPackage> userPackageList = list(queryWrapper);
+        for (WisdUserPackage wisdUserPackage : userPackageList) {
+            WisdUser wisdUser = wisdUserService.getByUserId(wisdUserPackage.getUserId());
             SmsSend.sendMsgs(wisdUser.getUserPhone());
         }
         return null;
diff --git a/src/main/java/com/wisdo/mmining/service/impl/UserServiceImpl.java b/src/main/java/com/wisdo/mmining/service/impl/UserServiceImpl.java
index 00513ac..31cc230 100644
--- a/src/main/java/com/wisdo/mmining/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/wisdo/mmining/service/impl/UserServiceImpl.java
@@ -3,21 +3,19 @@ package com.wisdo.mmining.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.wisdo.mmining.entity.User;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.wisdo.mmining.entity.Role;
-import com.wisdo.mmining.entity.WisdDept;
+import com.wisdo.mmining.entity.User;
 import com.wisdo.mmining.mapper.RoleMapper;
 import com.wisdo.mmining.mapper.UserMapper;
-import com.wisdo.mmining.mapper.vo.UserVo;
 import com.wisdo.mmining.service.UserService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author hjw
@@ -42,26 +40,26 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     @Override
     public User getUserByUsername(String username) {
         QueryWrapper<User> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("username",username);
+        queryWrapper.eq("username", username);
         User tUser = tUserMapper.selectOne(queryWrapper);
         return tUser;
     }
 
 
     @Override
-    public IPage<User> getUserRole(Long companyId,String username, int page, int num) {
+    public IPage<User> getUserRole(Long companyId, String username, int page, int num) {
         QueryWrapper<User> queryWrapper = new QueryWrapper<>();
-        if (username!=null && !"".equals(username)) {
+        if (username != null && !"".equals(username)) {
             queryWrapper.like("username", username);
         }
-        if (companyId!=null && !"".equals(companyId)) {
+        if (companyId != null && !"".equals(companyId)) {
             queryWrapper.eq("company_id", companyId);
         }
-        Page<User> p = new Page<>(page,num);
-        IPage<User> userIPage = tUserMapper.selectPage(p,queryWrapper);
+        Page<User> p = new Page<>(page, num);
+        IPage<User> userIPage = tUserMapper.selectPage(p, queryWrapper);
         userIPage.getRecords().stream().forEach(user -> {
-            Role role=roleMapper.selectById(user.getRoleId());
-            if (role!=null) {
+            Role role = roleMapper.selectById(user.getRoleId());
+            if (role != null) {
                 user.setRoleName(role.getName());
             }
         });
diff --git a/src/main/java/com/wisdo/mmining/service/impl/VipServiceImpl.java b/src/main/java/com/wisdo/mmining/service/impl/VipServiceImpl.java
index 67051a1..3443bd0 100644
--- a/src/main/java/com/wisdo/mmining/service/impl/VipServiceImpl.java
+++ b/src/main/java/com/wisdo/mmining/service/impl/VipServiceImpl.java
@@ -31,23 +31,23 @@ public class VipServiceImpl extends ServiceImpl<VipMapper, WisdVip> implements V
     @Override
     public IPage<WisdVip> selectPage(int page, int num) {
         QueryWrapper<WisdVip> queryWrapper = new QueryWrapper<>();
-        Page<WisdVip> p = new Page<>(page,num);
-        IPage<WisdVip> wisdVipIPage = vipMapper.selectPage(p,queryWrapper);
+        Page<WisdVip> p = new Page<>(page, num);
+        IPage<WisdVip> wisdVipIPage = vipMapper.selectPage(p, queryWrapper);
         return wisdVipIPage;
     }
 
     @Override
     public WisdVip getByName(String name) {
         QueryWrapper<WisdVip> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("vip_name",name);
-        WisdVip wisdVip=vipMapper.selectOne(queryWrapper);
+        queryWrapper.eq("vip_name", name);
+        WisdVip wisdVip = vipMapper.selectOne(queryWrapper);
         return wisdVip;
     }
 
 
     @Override
     public Boolean addVip(Long userId) {
-        List<WisdVip> vipList=list();
+        List<WisdVip> vipList = list();
         vipList.sort(new Comparator<WisdVip>() {
             @Override
             public int compare(WisdVip o1, WisdVip o2) {
@@ -55,15 +55,15 @@ public class VipServiceImpl extends ServiceImpl<VipMapper, WisdVip> implements V
                 return price;
             }
         });
-        WisdWxuser wisdWxuser=wxuserService.getById(userId);
-        Long vipId=0L;
-        for (WisdVip wisdVip:vipList){
-            if (wisdWxuser.getUserAllIntegral()>=wisdVip.getVipIntegral()){
-                vipId=wisdVip.getId();
+        WisdWxuser wisdWxuser = wxuserService.getById(userId);
+        Long vipId = 0L;
+        for (WisdVip wisdVip : vipList) {
+            if (wisdWxuser.getUserAllIntegral() >= wisdVip.getVipIntegral()) {
+                vipId = wisdVip.getId();
             }
         }
-        WisdVip wisdVips=getById(vipId);
-        if (wisdVips!=null){
+        WisdVip wisdVips = getById(vipId);
+        if (wisdVips != null) {
             wisdWxuser.setUserVip(wisdVips.getVipName());
             wxuserService.saveOrUpdate(wisdWxuser);
         }
diff --git a/src/main/java/com/wisdo/mmining/service/impl/WelfareServiceImpl.java b/src/main/java/com/wisdo/mmining/service/impl/WelfareServiceImpl.java
index 00188dd..4f2dac4 100644
--- a/src/main/java/com/wisdo/mmining/service/impl/WelfareServiceImpl.java
+++ b/src/main/java/com/wisdo/mmining/service/impl/WelfareServiceImpl.java
@@ -24,8 +24,8 @@ public class WelfareServiceImpl extends ServiceImpl<WelfareMapper, WisdWelfare>
     @Override
     public IPage<WisdWelfare> getListByCompanyId(int page, int num) {
         QueryWrapper<WisdWelfare> queryWrapper = new QueryWrapper<>();
-        Page<WisdWelfare> p = new Page<>(page,num);
-        IPage<WisdWelfare> wisdCashVolumeIPage = welfareMapper.selectPage(p,queryWrapper);
+        Page<WisdWelfare> p = new Page<>(page, num);
+        IPage<WisdWelfare> wisdCashVolumeIPage = welfareMapper.selectPage(p, queryWrapper);
         return wisdCashVolumeIPage;
     }
 }
diff --git a/src/main/java/com/wisdo/mmining/service/impl/WisdUserServiceImpl.java b/src/main/java/com/wisdo/mmining/service/impl/WisdUserServiceImpl.java
index 5fc121f..54849fa 100644
--- a/src/main/java/com/wisdo/mmining/service/impl/WisdUserServiceImpl.java
+++ b/src/main/java/com/wisdo/mmining/service/impl/WisdUserServiceImpl.java
@@ -9,7 +9,10 @@ import com.wisdo.mmining.mapper.UserPackageMapper;
 import com.wisdo.mmining.mapper.WisdUserMapper;
 import com.wisdo.mmining.result.Result;
 import com.wisdo.mmining.result.ResultUtil;
-import com.wisdo.mmining.service.*;
+import com.wisdo.mmining.service.CompanyService;
+import com.wisdo.mmining.service.DeptService;
+import com.wisdo.mmining.service.WisdUserService;
+import com.wisdo.mmining.service.WxuserService;
 import com.wisdo.mmining.util.PhoneUtils;
 import com.wisdo.mmining.util.excel.ExcelUntils;
 import org.apache.shiro.SecurityUtils;
@@ -33,7 +36,7 @@ import java.util.List;
 public class WisdUserServiceImpl extends ServiceImpl<WisdUserMapper, WisdUser> implements WisdUserService {
 
     @Autowired
-    private WisdUserMapper  wisdUserMapper;
+    private WisdUserMapper wisdUserMapper;
     @Autowired
     private WxuserService wxuserService;
     @Autowired
@@ -51,13 +54,13 @@ public class WisdUserServiceImpl extends ServiceImpl<WisdUserMapper, WisdUser> i
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean delUser(List<Long> idList) {
-        List<WisdWxuser> wxuserList=new ArrayList<>();
-        List<WisdUser> wisdUserList=new ArrayList<>();
-        for (Long id:idList){
+        List<WisdWxuser> wxuserList = new ArrayList<>();
+        List<WisdUser> wisdUserList = new ArrayList<>();
+        for (Long id : idList) {
             QueryWrapper<WisdWxuser> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("company_user_id",id);
-            WisdWxuser wisdWxuser=wxuserService.getOne(queryWrapper);
-            if (wisdWxuser!=null) {
+            queryWrapper.eq("company_user_id", id);
+            WisdWxuser wisdWxuser = wxuserService.getOne(queryWrapper);
+            if (wisdWxuser != null) {
                 wisdWxuser.setUserIscompany(0);
                 wisdWxuser.setCompanyUserId(null);
                 wisdWxuser.setUserId(null);
@@ -66,7 +69,7 @@ public class WisdUserServiceImpl extends ServiceImpl<WisdUserMapper, WisdUser> i
                 wisdWxuser.setUserVolumeBalance(new BigDecimal(0));
                 wxuserList.add(wisdWxuser);
             }
-            WisdUser wisdUser=getById(id);
+            WisdUser wisdUser = getById(id);
             wisdUser.setUserIsDeparture(1);
             wisdUser.setIsDeleted(1);
             wisdUserList.add(wisdUser);
@@ -76,61 +79,61 @@ public class WisdUserServiceImpl extends ServiceImpl<WisdUserMapper, WisdUser> i
 //            wisdUserPackageList.forEach(item->userPackageMapper.deleteById(item.getId()));
 
         }
-        Boolean flags=wxuserService.updateBatchById(wxuserList);
-        if (flags ||wxuserList.size()==0) {
+        Boolean flags = wxuserService.updateBatchById(wxuserList);
+        if (flags || wxuserList.size() == 0) {
             boolean flag = updateBatchById(wisdUserList);
             boolean flag1 = removeByIds(idList);
-            return flag&&flag1;
-        }else {
+            return flag && flag1;
+        } else {
             return false;
         }
 
     }
 
     @Override
-    public IPage<WisdUser> selectPage(Long companyId,String userName,String userPhone, int page, int num) {
+    public IPage<WisdUser> selectPage(Long companyId, String userName, String userPhone, int page, int num) {
         QueryWrapper<WisdUser> queryWrapper = new QueryWrapper<>();
-        if (companyId!=null && !"".equals(companyId)) {
+        if (companyId != null && !"".equals(companyId)) {
             queryWrapper.eq("company_id", companyId);
         }
-        if (userName!=null && !"".equals(userName)) {
+        if (userName != null && !"".equals(userName)) {
             queryWrapper.like("user_name", userName);
         }
-        if (userPhone!=null && !"".equals(userPhone)) {
+        if (userPhone != null && !"".equals(userPhone)) {
             queryWrapper.like("user_phone", userPhone);
         }
         Subject subject = SecurityUtils.getSubject();
-        User user= (User) subject.getSession().getAttribute("sys_user");
-        if (user.getCompanyId()!=0){
+        User user = (User) subject.getSession().getAttribute("sys_user");
+        if (user.getCompanyId() != 0) {
             queryWrapper.eq("company_id", user.getCompanyId());
         }
         queryWrapper.eq("user_is_departure", 0);
-        Page<WisdUser> p = new Page<>(page,num);
-        IPage<WisdUser> wisdUserIPage = wisdUserMapper.selectPage(p,queryWrapper);
-        for (WisdUser wisdUser:wisdUserIPage.getRecords()){
-            if (wisdUser.getCompanyId()==0){
+        Page<WisdUser> p = new Page<>(page, num);
+        IPage<WisdUser> wisdUserIPage = wisdUserMapper.selectPage(p, queryWrapper);
+        for (WisdUser wisdUser : wisdUserIPage.getRecords()) {
+            if (wisdUser.getCompanyId() == 0) {
                 wisdUser.setCompanyName("平台管理员");
-            }else {
+            } else {
                 WisdCompany wisdCompany = companyService.getById(wisdUser.getCompanyId());
-                if (wisdCompany!=null) {
+                if (wisdCompany != null) {
                     wisdUser.setCompanyName(wisdCompany.getCompanyName());
-                }else {
+                } else {
                     wisdUser.setCompanyName("暂无公司");
                 }
-                WisdDept wisdDept=deptService.getById(wisdUser.getDeptId());
-                if (wisdDept!=null) {
+                WisdDept wisdDept = deptService.getById(wisdUser.getDeptId());
+                if (wisdDept != null) {
                     wisdUser.setDeptName(wisdDept.getDeptName());
-                }else {
+                } else {
                     wisdUser.setDeptName("暂无部门");
                 }
             }
-            if (wisdUser.getDeptId()==0){
+            if (wisdUser.getDeptId() == 0) {
                 wisdUser.setDeptName("平台管理员");
-            }else {
-                WisdDept wisdDept=deptService.getById(wisdUser.getDeptId());
-                if (wisdDept!=null) {
+            } else {
+                WisdDept wisdDept = deptService.getById(wisdUser.getDeptId());
+                if (wisdDept != null) {
                     wisdUser.setDeptName(wisdDept.getDeptName());
-                }else {
+                } else {
                     wisdUser.setDeptName("暂无部门");
                 }
             }
@@ -141,74 +144,71 @@ public class WisdUserServiceImpl extends ServiceImpl<WisdUserMapper, WisdUser> i
     @Override
     public WisdUser getByPhone(String phone, Long companyId) {
         QueryWrapper<WisdUser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("user_phone",phone);
-        queryWrapper.eq("company_id",companyId);
+        queryWrapper.eq("user_phone", phone);
+        queryWrapper.eq("company_id", companyId);
         queryWrapper.eq("user_is_departure", 0);
         return wisdUserMapper.selectOne(queryWrapper);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Result importUser(MultipartFile file, InputStream inputStream, String companyId,String deptId) {
+    public Result importUser(MultipartFile file, InputStream inputStream, String companyId, String deptId) {
         try {
             List<List<Object>> list = ExcelUntils.importExcel(inputStream, file.getOriginalFilename());
             inputStream.close();
             String temp = "";
-            for (int i = 0; i < list.size() - 1; i++)
-            {
+            for (int i = 0; i < list.size() - 1; i++) {
                 temp = list.get(i).get(1).toString();
-                for (int j = i + 1; j < list.size(); j++)
-                {
-                    if (temp.equals(list.get(j).get(1).toString()))
-                    {
-                        return new Result(ResultUtil.ERROR,"第" + (i + 1) + "个跟第" + (j + 1) + "个重复，值是：" + temp);
+                for (int j = i + 1; j < list.size(); j++) {
+                    if (temp.equals(list.get(j).get(1).toString())) {
+                        return new Result(ResultUtil.ERROR, "第" + (i + 1) + "个跟第" + (j + 1) + "个重复，值是：" + temp);
                     }
                 }
             }
             System.out.println(list);
-            List<WisdUser> userList=new ArrayList<>();
+            List<WisdUser> userList = new ArrayList<>();
             for (int i = 0; i < list.size(); i++) {
-                if (!PhoneUtils.isPhoneLegal(list.get(i).get(1).toString())){
+                if (!PhoneUtils.isPhoneLegal(list.get(i).get(1).toString())) {
                     try {
                         throw new Exception();
-                    }catch (Exception e){
-                        return new Result(ResultUtil.ERROR,"请输入正确手机号：" + list.get(i).get(1).toString());
+                    } catch (Exception e) {
+                        return new Result(ResultUtil.ERROR, "请输入正确手机号：" + list.get(i).get(1).toString());
                     }
                 }
                 QueryWrapper<WisdUser> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("user_phone",list.get(i).get(1).toString());
-                queryWrapper.eq("is_deleted",0);
-                queryWrapper.eq("user_is_departure",0);
-                WisdUser wisdUser1= wisdUserMapper.selectOne(queryWrapper);
-                if (wisdUser1!=null){
+                queryWrapper.eq("user_phone", list.get(i).get(1).toString());
+                queryWrapper.eq("is_deleted", 0);
+                queryWrapper.eq("user_is_departure", 0);
+                WisdUser wisdUser1 = wisdUserMapper.selectOne(queryWrapper);
+                if (wisdUser1 != null) {
                     try {
                         throw new Exception();
-                    }catch (Exception e){
-                        return new Result(ResultUtil.ERROR,"手机号重复，重复手机号是：" + list.get(i).get(1).toString());
+                    } catch (Exception e) {
+                        return new Result(ResultUtil.ERROR, "手机号重复，重复手机号是：" + list.get(i).get(1).toString());
                     }
                 }
-                WisdUser wisdUser=new WisdUser();
+                WisdUser wisdUser = new WisdUser();
                 wisdUser.setUserName(list.get(i).get(0).toString());
                 wisdUser.setUserPhone(list.get(i).get(1).toString());
                 wisdUser.setUserIscompany(1);
-                if (companyId!=null && !companyId.equals("null") && !companyId.equals("-1")) {
+                if (companyId != null && !companyId.equals("null") && !companyId.equals("-1")) {
                     wisdUser.setCompanyId(Long.parseLong(companyId));
-                }else {
+                } else {
                     Subject subject = SecurityUtils.getSubject();
-                    User user= (User) subject.getSession().getAttribute("sys_user");
+                    User user = (User) subject.getSession().getAttribute("sys_user");
                     wisdUser.setCompanyId(user.getCompanyId());
                 }
                 wisdUser.setDeptId(Long.parseLong(deptId));
                 userList.add(wisdUser);
             }
-            Boolean flags=saveBatch(userList);
-            if (flags){
-                return new Result(ResultUtil.SUCCESS,ResultUtil.SUCCESS_MSG);
-            }else {
-                return new Result(ResultUtil.ERROR,"添加失败");
+            Boolean flags = saveBatch(userList);
+            if (flags) {
+                return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG);
+            } else {
+                return new Result(ResultUtil.ERROR, "添加失败");
             }
-        }catch (Exception e){
-            return new Result(ResultUtil.ERROR,"添加失败");
+        } catch (Exception e) {
+            return new Result(ResultUtil.ERROR, "添加失败");
         }
 
     }
diff --git a/src/main/java/com/wisdo/mmining/service/impl/WithdrawalServiceImpl.java b/src/main/java/com/wisdo/mmining/service/impl/WithdrawalServiceImpl.java
index 3f9c18f..af4b3b0 100644
--- a/src/main/java/com/wisdo/mmining/service/impl/WithdrawalServiceImpl.java
+++ b/src/main/java/com/wisdo/mmining/service/impl/WithdrawalServiceImpl.java
@@ -45,9 +45,9 @@ import static com.wisdo.mmining.utils.CreateStrUtil.getRandomStringByLength;
  * @Description:
  */
 @Service
-public class WithdrawalServiceImpl  extends ServiceImpl<WithdrawalMapper, WisdWithdrawal> implements WithdrawalService {
+public class WithdrawalServiceImpl extends ServiceImpl<WithdrawalMapper, WisdWithdrawal> implements WithdrawalService {
 
-    private static Logger logger = Logger.getLogger(WithdrawalServiceImpl.class);
+    private static final Logger logger = Logger.getLogger(WithdrawalServiceImpl.class);
 
     @Autowired
     private WithdrawalMapper withdrawalMapper;
@@ -58,8 +58,8 @@ public class WithdrawalServiceImpl  extends ServiceImpl<WithdrawalMapper, WisdWi
     public IPage<WisdWithdrawal> selectPage(int page, int num) {
         QueryWrapper<WisdWithdrawal> queryWrapper = new QueryWrapper<>();
         queryWrapper.orderByDesc("create_time");
-        Page<WisdWithdrawal> p = new Page<>(page,num);
-        IPage<WisdWithdrawal> wisdWithdrawalIPage = withdrawalMapper.selectPage(p,queryWrapper);
+        Page<WisdWithdrawal> p = new Page<>(page, num);
+        IPage<WisdWithdrawal> wisdWithdrawalIPage = withdrawalMapper.selectPage(p, queryWrapper);
         return wisdWithdrawalIPage;
     }
 
@@ -124,7 +124,7 @@ public class WithdrawalServiceImpl  extends ServiceImpl<WithdrawalMapper, WisdWi
         Map cbMap = PayUtil.doXMLParse(jsonStr);
         logger.error(cbMap.toString());
         QueryWrapper<WisdWithdrawal> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("withdrawal_number",applyId);
+        queryWrapper.eq("withdrawal_number", applyId);
         WisdWithdrawal wisdWithdrawal = getOne(queryWrapper);
         if (cbMap.get("return_code").equals("SUCCESS") && cbMap.get("result_code").equals("SUCCESS")) {
             resultMap.put("result_code", "SUCCESS");
@@ -135,7 +135,7 @@ public class WithdrawalServiceImpl  extends ServiceImpl<WithdrawalMapper, WisdWi
             resultMap.put("errorMsg", cbMap.get("return_msg") + "：" + cbMap.get("err_code") + "：" + cbMap.get("err_code_des"));
             logger.error("微信提现银行卡错误：" + cbMap.get("return_msg") + "：" + cbMap.get("err_code") + "：" + cbMap.get("err_code_des"));
             wisdWithdrawal.setStatus(3);
-            WisdWxuser wisdWxuser=wxuserService.getById(wisdWithdrawal.getUserId());
+            WisdWxuser wisdWxuser = wxuserService.getById(wisdWithdrawal.getUserId());
             wisdWxuser.setUserBalance(wisdWxuser.getUserBalance().add(amout));
             wxuserService.saveOrUpdate(wisdWxuser);
         }
diff --git a/src/main/java/com/wisdo/mmining/service/impl/WxuserServiceImpl.java b/src/main/java/com/wisdo/mmining/service/impl/WxuserServiceImpl.java
index 3c0cf16..6450f4d 100644
--- a/src/main/java/com/wisdo/mmining/service/impl/WxuserServiceImpl.java
+++ b/src/main/java/com/wisdo/mmining/service/impl/WxuserServiceImpl.java
@@ -8,15 +8,10 @@ import com.wisdo.mmining.entity.WisdBill;
 import com.wisdo.mmining.entity.WisdOeder;
 import com.wisdo.mmining.entity.WisdVip;
 import com.wisdo.mmining.entity.WisdWxuser;
-import com.wisdo.mmining.mapper.OrderMapper;
 import com.wisdo.mmining.mapper.VipMapper;
 import com.wisdo.mmining.mapper.WxuserMapper;
 import com.wisdo.mmining.service.BillService;
-import com.wisdo.mmining.service.OrderService;
-import com.wisdo.mmining.service.VipService;
 import com.wisdo.mmining.service.WxuserService;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -41,38 +36,38 @@ public class WxuserServiceImpl extends ServiceImpl<WxuserMapper, WisdWxuser> imp
     @Override
     public IPage<WisdWxuser> selectPage(String wxNickname, String userPhone, int page, int num) {
         QueryWrapper<WisdWxuser> queryWrapper = new QueryWrapper<>();
-        if (wxNickname!=null&&!"".equals(wxNickname)){
-            queryWrapper.like("wx_nickname",wxNickname);
+        if (wxNickname != null && !"".equals(wxNickname)) {
+            queryWrapper.like("wx_nickname", wxNickname);
         }
-        if (userPhone!=null&&!"".equals(userPhone)){
-            queryWrapper.like("user_phone",userPhone);
+        if (userPhone != null && !"".equals(userPhone)) {
+            queryWrapper.like("user_phone", userPhone);
         }
         queryWrapper.orderByDesc("create_time");
-        Page<WisdWxuser> p = new Page<>(page,num);
-        IPage<WisdWxuser> wisdUserIPage = wxuserMapper.selectPage(p,queryWrapper);
+        Page<WisdWxuser> p = new Page<>(page, num);
+        IPage<WisdWxuser> wisdUserIPage = wxuserMapper.selectPage(p, queryWrapper);
         return wisdUserIPage;
     }
 
     @Override
     public IPage<WisdWxuser> storeslist(String wxNickname, String userPhone, int page, int num) {
         QueryWrapper<WisdWxuser> queryWrapper = new QueryWrapper<>();
-        if (wxNickname!=null&&!"".equals(wxNickname)){
-            queryWrapper.like("wx_nickname",wxNickname);
+        if (wxNickname != null && !"".equals(wxNickname)) {
+            queryWrapper.like("wx_nickname", wxNickname);
         }
-        if (userPhone!=null&&!"".equals(userPhone)){
-            queryWrapper.like("user_phone",userPhone);
+        if (userPhone != null && !"".equals(userPhone)) {
+            queryWrapper.like("user_phone", userPhone);
         }
-        queryWrapper.eq("user_isstores",1);
+        queryWrapper.eq("user_isstores", 1);
         queryWrapper.orderByDesc("create_time");
-        Page<WisdWxuser> p = new Page<>(page,num);
-        IPage<WisdWxuser> wisdUserIPage = wxuserMapper.selectPage(p,queryWrapper);
+        Page<WisdWxuser> p = new Page<>(page, num);
+        IPage<WisdWxuser> wisdUserIPage = wxuserMapper.selectPage(p, queryWrapper);
         return wisdUserIPage;
     }
 
     @Override
     public WisdWxuser getWxUserByOpenId(String openId) {
         QueryWrapper<WisdWxuser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("wx_openid",openId);
+        queryWrapper.eq("wx_openid", openId);
         return wxuserMapper.selectOne(queryWrapper);
     }
 
@@ -82,16 +77,16 @@ public class WxuserServiceImpl extends ServiceImpl<WxuserMapper, WisdWxuser> imp
     }
 
     @Override
-    public Boolean completIntegral(Long userId,WisdOeder wisdOeder) {
+    public Boolean completIntegral(Long userId, WisdOeder wisdOeder) {
         System.out.println("购买得积分开始");
-        WisdWxuser wisdWxuser=getById(userId);
-        wisdWxuser.setUserIntegral(wisdWxuser.getUserIntegral()+wisdOeder.getOrderActualPay().intValue()+wisdOeder.getOrderOtherPay().intValue());
-        wisdWxuser.setUserAllIntegral(wisdWxuser.getUserAllIntegral()+wisdOeder.getOrderActualPay().intValue()+wisdOeder.getOrderOtherPay().intValue());
-        Boolean flag=updateById(wisdWxuser);
-        if (flag){
+        WisdWxuser wisdWxuser = getById(userId);
+        wisdWxuser.setUserIntegral(wisdWxuser.getUserIntegral() + wisdOeder.getOrderActualPay().intValue() + wisdOeder.getOrderOtherPay().intValue());
+        wisdWxuser.setUserAllIntegral(wisdWxuser.getUserAllIntegral() + wisdOeder.getOrderActualPay().intValue() + wisdOeder.getOrderOtherPay().intValue());
+        Boolean flag = updateById(wisdWxuser);
+        if (flag) {
             System.out.println("购买得积分----添加账单");
             WisdBill wisdBill = new WisdBill();
-            wisdBill.setBillIntegral(wisdOeder.getOrderActualPay().intValue()+wisdOeder.getOrderOtherPay().intValue());
+            wisdBill.setBillIntegral(wisdOeder.getOrderActualPay().intValue() + wisdOeder.getOrderOtherPay().intValue());
             wisdBill.setBillType(1);
             wisdBill.setBillCategory(4);
             wisdBill.setUserId(userId);
@@ -107,14 +102,14 @@ public class WxuserServiceImpl extends ServiceImpl<WxuserMapper, WisdWxuser> imp
     @Override
     public List<WisdWxuser> getListByVip(String vipName) {
         QueryWrapper<WisdWxuser> queryWrapper = new QueryWrapper<>();
-        if (vipName!=null&&!"".equals(vipName)){
-            queryWrapper.eq("user_vip",vipName);
+        if (vipName != null && !"".equals(vipName)) {
+            queryWrapper.eq("user_vip", vipName);
         }
         return wxuserMapper.selectList(queryWrapper);
     }
 
-    public void addVip(Long id){
-        List<WisdVip> vipList=vipMapper.selectList(new QueryWrapper<>());
+    public void addVip(Long id) {
+        List<WisdVip> vipList = vipMapper.selectList(new QueryWrapper<>());
         vipList.sort(new Comparator<WisdVip>() {
             @Override
             public int compare(WisdVip o1, WisdVip o2) {
@@ -122,15 +117,15 @@ public class WxuserServiceImpl extends ServiceImpl<WxuserMapper, WisdWxuser> imp
                 return price;
             }
         });
-        WisdWxuser wisdWxuser=getById(id);
-        Long vipId=0L;
-        for (WisdVip wisdVip:vipList){
-            if (wisdWxuser.getUserAllIntegral()>=wisdVip.getVipIntegral()){
-                vipId=wisdVip.getId();
+        WisdWxuser wisdWxuser = getById(id);
+        Long vipId = 0L;
+        for (WisdVip wisdVip : vipList) {
+            if (wisdWxuser.getUserAllIntegral() >= wisdVip.getVipIntegral()) {
+                vipId = wisdVip.getId();
             }
         }
-        WisdVip wisdVips=vipMapper.selectById(vipId);
-        if (wisdVips!=null){
+        WisdVip wisdVips = vipMapper.selectById(vipId);
+        if (wisdVips != null) {
             wisdWxuser.setUserVip(wisdVips.getVipName());
             saveOrUpdate(wisdWxuser);
         }
diff --git a/src/main/java/com/wisdo/mmining/utils/CreateStrUtil.java b/src/main/java/com/wisdo/mmining/utils/CreateStrUtil.java
index 2ede9a6..84727cd 100644
--- a/src/main/java/com/wisdo/mmining/utils/CreateStrUtil.java
+++ b/src/main/java/com/wisdo/mmining/utils/CreateStrUtil.java
@@ -15,7 +15,7 @@ public class CreateStrUtil {
         for (int i = 0; i < length; i++) {
             result += random.nextInt(10);
         }
-        return System.currentTimeMillis() + "" + result;
+        return System.currentTimeMillis() + result;
     }
 
     public static String createStrForLength(int length) {
diff --git a/src/main/java/com/wisdo/mmining/utils/DistanceUtil.java b/src/main/java/com/wisdo/mmining/utils/DistanceUtil.java
index bcde0ff..504497b 100644
--- a/src/main/java/com/wisdo/mmining/utils/DistanceUtil.java
+++ b/src/main/java/com/wisdo/mmining/utils/DistanceUtil.java
@@ -5,6 +5,7 @@ package com.wisdo.mmining.utils;
  * @Date: 2020/10/13 14:59
  * @Description:
  */
+
 import org.gavaghan.geodesy.Ellipsoid;
 import org.gavaghan.geodesy.GeodeticCalculator;
 import org.gavaghan.geodesy.GeodeticCurve;
@@ -12,6 +13,7 @@ import org.gavaghan.geodesy.GlobalCoordinates;
 
 /**
  * 计算经纬度直线距离
+ *
  * @author: caoju
  */
 public class DistanceUtil {
diff --git a/src/main/java/com/wisdo/mmining/utils/HttpClients.java b/src/main/java/com/wisdo/mmining/utils/HttpClients.java
index f387a33..1c65df7 100644
--- a/src/main/java/com/wisdo/mmining/utils/HttpClients.java
+++ b/src/main/java/com/wisdo/mmining/utils/HttpClients.java
@@ -10,7 +10,7 @@ import org.apache.http.util.EntityUtils;
 import java.io.IOException;
 
 /**
- *  QQ工具类（主要用于解析QQ返回的信息）<br/>
+ * QQ工具类（主要用于解析QQ返回的信息）<br/>
  *
  * @author hjw
  * @date 2020/8/24
@@ -24,14 +24,14 @@ public class HttpClients {
 
     public static final String APPKEY = "d933c4daa9dc35302eabcb0133ccba69";
 
-    public static  final  String QQ_HTTP = "http://www.liankexue.cn";
+    public static final String QQ_HTTP = "http://www.liankexue.cn";
 
 
-    public static JSONObject parseJsonp(String jsonp){
+    public static JSONObject parseJsonp(String jsonp) {
         int startIndex = jsonp.indexOf("(");
         int endIndex = jsonp.lastIndexOf(")");
 
-        String json = jsonp.substring(startIndex + 1,endIndex);
+        String json = jsonp.substring(startIndex + 1, endIndex);
 
         return JSONObject.parseObject(json);
     }
@@ -45,13 +45,13 @@ public class HttpClients {
         HttpResponse response = client.execute(httpGet);
         HttpEntity entity = response.getEntity();
 
-        if(entity != null){
-            String result = EntityUtils.toString(entity,"UTF-8");
+        if (entity != null) {
+            String result = EntityUtils.toString(entity, "UTF-8");
             String accessToken = "access_token";
-            if(result.indexOf(accessToken) >= 0){
+            if (result.indexOf(accessToken) >= 0) {
                 String[] array = result.split("&");
-                for (String str : array){
-                    if(str.indexOf("access_token") >= 0){
+                for (String str : array) {
+                    if (str.indexOf("access_token") >= 0) {
                         token = str.substring(str.indexOf("=") + 1);
                         break;
                     }
@@ -71,16 +71,16 @@ public class HttpClients {
         HttpResponse response = client.execute(httpGet);
         HttpEntity entity = response.getEntity();
 
-        if(entity != null){
-            String result = EntityUtils.toString(entity,"UTF-8");
+        if (entity != null) {
+            String result = EntityUtils.toString(entity, "UTF-8");
             jsonObject = parseJsonp(result);
         }
 
         httpGet.releaseConnection();
 
-        if(jsonObject != null){
+        if (jsonObject != null) {
             return jsonObject.getString("openid");
-        }else {
+        } else {
             return null;
         }
     }
@@ -95,8 +95,8 @@ public class HttpClients {
         HttpEntity entity = response.getEntity();
 
 
-        if(entity != null){
-            String result = EntityUtils.toString(entity,"UTF-8");
+        if (entity != null) {
+            String result = EntityUtils.toString(entity, "UTF-8");
             jsonObject = JSONObject.parseObject(result);
         }
 
diff --git a/src/main/java/com/wisdo/mmining/utils/HttpUtil.java b/src/main/java/com/wisdo/mmining/utils/HttpUtil.java
index b6e7502..109fd3b 100644
--- a/src/main/java/com/wisdo/mmining/utils/HttpUtil.java
+++ b/src/main/java/com/wisdo/mmining/utils/HttpUtil.java
@@ -48,7 +48,7 @@ public class HttpUtil {
         return HttpUtil.post(requestUrl, accessToken, contentType, params);
     }
 
-    private static String nlp = "nlp";
+    private static final String nlp = "nlp";
 
     public static String post(String requestUrl, String accessToken, String contentType, String params)
             throws Exception {
@@ -337,7 +337,7 @@ public class HttpUtil {
         return sbUrl.toString();
     }
 
-    private static String https = "https://";
+    private static final String https = "https://";
 
     private static HttpClient wrapClient(String host) {
         HttpClient httpClient = new DefaultHttpClient();
@@ -356,9 +356,11 @@ public class HttpUtil {
                 public X509Certificate[] getAcceptedIssuers() {
                     return null;
                 }
+
                 @Override
                 public void checkClientTrusted(X509Certificate[] xcs, String str) {
                 }
+
                 @Override
                 public void checkServerTrusted(X509Certificate[] xcs, String str) {
                 }
diff --git a/src/main/java/com/wisdo/mmining/utils/HttpUtils.java b/src/main/java/com/wisdo/mmining/utils/HttpUtils.java
index e06f609..1bcac10 100644
--- a/src/main/java/com/wisdo/mmining/utils/HttpUtils.java
+++ b/src/main/java/com/wisdo/mmining/utils/HttpUtils.java
@@ -11,6 +11,7 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
+
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.transform.OutputKeys;
@@ -23,6 +24,7 @@ import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
 import java.net.URLConnection;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -40,8 +42,9 @@ public class HttpUtils {
 
     /**
      * : http get请求共用方法
-     * @param @param reqUrl
-     * @param @param params
+     *
+     * @param @param  reqUrl
+     * @param @param  params
      * @param @return
      * @param @throws Exception
      * @author dapengniao
@@ -72,8 +75,9 @@ public class HttpUtils {
 
     /**
      * : http post请求共用方法
-     * @param @param reqUrl
-     * @param @param params
+     *
+     * @param @param  reqUrl
+     * @param @param  params
      * @param @return
      * @param @throws Exception
      * @author dapengniao
@@ -121,8 +125,9 @@ public class HttpUtils {
 
     /**
      * : http post请求json数据
-     * @param @param urls
-     * @param @param params
+     *
+     * @param @param  urls
+     * @param @param  params
      * @param @return
      * @param @throws ClientProtocolException
      * @param @throws IOException
@@ -130,7 +135,7 @@ public class HttpUtils {
      * @date 2016年3月10日 下午3:58:15
      */
     public static String sendPostBuffer(String urls, String params)
-            throws ClientProtocolException, IOException {
+            throws IOException {
         HttpPost request = new HttpPost(urls);
 
         StringEntity se = new StringEntity(params, "UTF-8");
@@ -148,8 +153,9 @@ public class HttpUtils {
 
     /**
      * : http请求发送xml内容
-     * @param @param urlStr
-     * @param @param xmlInfo
+     *
+     * @param @param  urlStr
+     * @param @param  xmlInfo
      * @param @return
      * @author dapengniao
      * @date 2016年3月10日 下午3:58:32
@@ -166,7 +172,7 @@ public class HttpUtils {
             con.setRequestProperty("Content-Type", "text/xml");
             OutputStreamWriter out = new OutputStreamWriter(
                     con.getOutputStream());
-            out.write(new String(xmlInfo.getBytes("utf-8")));
+            out.write(new String(xmlInfo.getBytes(StandardCharsets.UTF_8)));
             out.flush();
             out.close();
             BufferedReader br = new BufferedReader(new InputStreamReader(
@@ -185,7 +191,9 @@ public class HttpUtils {
         }
         return "fail";
     }
+
     private static final int CODE = 0x1f8b;
+
     private static String getJsonStringFromGzip(InputStream is) {
         String jsonString = null;
         try {
@@ -204,7 +212,7 @@ public class HttpUtils {
             } else {
                 is = bis;
             }
-            InputStreamReader reader = new InputStreamReader(is, "utf-8");
+            InputStreamReader reader = new InputStreamReader(is, StandardCharsets.UTF_8);
             char[] data = new char[100];
             int readSize;
             StringBuffer sb = new StringBuffer();
@@ -228,34 +236,32 @@ public class HttpUtils {
     /**
      * 构建get方式的url
      *
-     * @param reqUrl
-     *            基础的url地址
-     * @param params
-     *            查询参数
+     * @param reqUrl 基础的url地址
+     * @param params 查询参数
      * @return 构建好的url
      */
     public static String buildUrl(String reqUrl, Map<String, String> params) {
         StringBuilder query = new StringBuilder();
         Set<String> set = params.keySet();
-        int i=0;
+        int i = 0;
         for (String key : set) {
-            if(i==set.size()-1) {
+            if (i == set.size() - 1) {
                 query.append(String.format("%s=%s", key, params.get(key)));
-            }else{
+            } else {
                 query.append(String.format("%s=%s&", key, params.get(key)));
             }
             i++;
         }
-        return reqUrl + "" + query.toString();
+        return reqUrl + query;
     }
 
     public static String mapToXml(Map<String, String> data) throws Exception {
         DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
-        DocumentBuilder documentBuilder= documentBuilderFactory.newDocumentBuilder();
+        DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
         org.w3c.dom.Document document = documentBuilder.newDocument();
         org.w3c.dom.Element root = document.createElement("xml");
         document.appendChild(root);
-        for (String key: data.keySet()) {
+        for (String key : data.keySet()) {
             String value = data.get(key);
             if (value == null) {
                 value = "";
@@ -276,8 +282,7 @@ public class HttpUtils {
         String output = writer.getBuffer().toString();
         try {
             writer.close();
-        }
-        catch (Exception ex) {
+        } catch (Exception ex) {
         }
         return output;
     }
diff --git a/src/main/java/com/wisdo/mmining/utils/LogisticsUtil.java b/src/main/java/com/wisdo/mmining/utils/LogisticsUtil.java
index c7eb974..95540ce 100644
--- a/src/main/java/com/wisdo/mmining/utils/LogisticsUtil.java
+++ b/src/main/java/com/wisdo/mmining/utils/LogisticsUtil.java
@@ -18,7 +18,7 @@ import java.util.Map;
  */
 public class LogisticsUtil {
 
-    private static String success = "200";
+    private static final String success = "200";
 
     /**
      * 查看快递
diff --git a/src/main/java/com/wisdo/mmining/utils/PayUtil.java b/src/main/java/com/wisdo/mmining/utils/PayUtil.java
index 11b1377..da05d88 100644
--- a/src/main/java/com/wisdo/mmining/utils/PayUtil.java
+++ b/src/main/java/com/wisdo/mmining/utils/PayUtil.java
@@ -9,6 +9,7 @@ import org.jdom.input.SAXBuilder;
 import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.security.SignatureException;
 import java.util.*;
 
@@ -60,11 +61,7 @@ public class PayUtil {
     public static boolean verify(String text, String sign, String key, String input_charset) {
         text = text + key;
         String mysign = DigestUtils.md5Hex(getContentBytes(text, input_charset));
-        if (mysign.equals(sign)) {
-            return true;
-        } else {
-            return false;
-        }
+        return mysign.equals(sign);
     }
 
     /**
@@ -85,17 +82,17 @@ public class PayUtil {
         }
     }
 
-    private static char a0 = '0';
-    private static char a9 = '9';
-    private static char A = 'A';
-    private static char Z = 'Z';
-    private static char a = 'a';
-    private static char z = 'z';
+    private static final char a0 = '0';
+    private static final char a9 = '9';
+    private static final char A = 'A';
+    private static final char Z = 'Z';
+    private static final char a = 'a';
+    private static final char z = 'z';
 
-    private static char s1 = 0x4e00;
-    private static char s2 = 0x7fff;
-    private static char s3 = 0x8000;
-    private static char s4 = 0x952f;
+    private static final char s1 = 0x4e00;
+    private static final char s2 = 0x7fff;
+    private static final char s3 = 0x8000;
+    private static final char s4 = 0x952f;
 
     private static boolean isValidChar(char ch) {
         if (ch >= a0 && ch <= a9) {
@@ -111,11 +108,8 @@ public class PayUtil {
             // 简体中文汉字编码
             return true;
         }
-        if (ch >= s3 && ch <= s4) {
-            // 简体中文汉字编码
-            return true;
-        }
-        return false;
+        // 简体中文汉字编码
+        return ch >= s3 && ch <= s4;
     }
 
     /**
@@ -181,12 +175,12 @@ public class PayUtil {
             //往服务器端写内容
             if (null != outputStr) {
                 OutputStream os = conn.getOutputStream();
-                os.write(outputStr.getBytes("utf-8"));
+                os.write(outputStr.getBytes(StandardCharsets.UTF_8));
                 os.close();
             }
             // 读取服务器端返回的内容
             InputStream is = conn.getInputStream();
-            InputStreamReader isr = new InputStreamReader(is, "utf-8");
+            InputStreamReader isr = new InputStreamReader(is, StandardCharsets.UTF_8);
             BufferedReader br = new BufferedReader(isr);
             buffer = new StringBuffer();
             String line = null;
@@ -228,7 +222,7 @@ public class PayUtil {
 
         Map m = new HashMap();
 
-        InputStream in = new ByteArrayInputStream(strxml.getBytes("UTF-8"));
+        InputStream in = new ByteArrayInputStream(strxml.getBytes(StandardCharsets.UTF_8));
         SAXBuilder builder = new SAXBuilder();
         Document doc = builder.build(in);
         Element root = doc.getRootElement();
diff --git a/src/main/java/com/wisdo/mmining/utils/PhoneUtils.java b/src/main/java/com/wisdo/mmining/utils/PhoneUtils.java
index b69549c..9d18381 100644
--- a/src/main/java/com/wisdo/mmining/utils/PhoneUtils.java
+++ b/src/main/java/com/wisdo/mmining/utils/PhoneUtils.java
@@ -14,6 +14,7 @@ public class PhoneUtils {
 
     /**
      * 大陆号码或香港号码都可以
+     *
      * @param str
      * @return 符合规则返回true
      * @throws PatternSyntaxException
@@ -23,7 +24,6 @@ public class PhoneUtils {
     }
 
     /**
-     *
      * 大陆手机号码11位数，匹配格式：前三位固定格式+后8位任意数
      * 此方法中前三位格式有：
      * 13+任意数
@@ -33,6 +33,7 @@ public class PhoneUtils {
      * 17+3,5,6,7,8
      * 18+任意数
      * 198,199
+     *
      * @param str
      * @return 正确返回true
      * @throws PatternSyntaxException
@@ -49,6 +50,7 @@ public class PhoneUtils {
 
     /**
      * 香港手机号码8位数，5|6|8|9开头+7位任意数
+     *
      * @param str
      * @return 正确返回true
      * @throws PatternSyntaxException
diff --git a/src/main/java/com/wisdo/mmining/utils/PkPerson.java b/src/main/java/com/wisdo/mmining/utils/PkPerson.java
index 03e770b..a5dd977 100644
--- a/src/main/java/com/wisdo/mmining/utils/PkPerson.java
+++ b/src/main/java/com/wisdo/mmining/utils/PkPerson.java
@@ -2,8 +2,6 @@ package com.wisdo.mmining.utils;
 
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * <Description> <br>
  *
diff --git a/src/main/java/com/wisdo/mmining/utils/QRCodeUtil.java b/src/main/java/com/wisdo/mmining/utils/QRCodeUtil.java
index e1dcec3..40a39a5 100644
--- a/src/main/java/com/wisdo/mmining/utils/QRCodeUtil.java
+++ b/src/main/java/com/wisdo/mmining/utils/QRCodeUtil.java
@@ -1,34 +1,22 @@
 package com.wisdo.mmining.utils;
 
+import com.google.zxing.*;
+import com.google.zxing.client.j2se.BufferedImageLuminanceSource;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.common.HybridBinarizer;
+
+import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-
-import javax.imageio.ImageIO;
-
-
-import com.google.zxing.BarcodeFormat;
-import com.google.zxing.Binarizer;
-import com.google.zxing.BinaryBitmap;
-import com.google.zxing.EncodeHintType;
-import com.google.zxing.LuminanceSource;
-import com.google.zxing.MultiFormatReader;
-import com.google.zxing.MultiFormatWriter;
-import com.google.zxing.NotFoundException;
-import com.google.zxing.Result;
-import com.google.zxing.WriterException;
-import com.google.zxing.client.j2se.BufferedImageLuminanceSource;
-import com.google.zxing.common.BitMatrix;
-import com.google.zxing.common.HybridBinarizer;
 /**
  * Google zxing二维码工具类
  *
- * @2017年12月20日
  * @author yinxf
- *
+ * @2017年12月20日
  */
 public class QRCodeUtil {
     //二维码颜色
@@ -40,15 +28,17 @@ public class QRCodeUtil {
         zxingCodeCreate("http://www.baidu.com", 300, 300, "D:/qrcode.jpg", "jpg");
 //    zxingCodeAnalyze("D:/qrcode.jpg");
     }
+
     /**
      * 生成二维码
-     * @param text    二维码内容
-     * @param width    二维码宽
-     * @param height    二维码高
-     * @param outPutPath    二维码生成保存路径
-     * @param imageType     二维码生成格式
+     *
+     * @param text       二维码内容
+     * @param width      二维码宽
+     * @param height     二维码高
+     * @param outPutPath 二维码生成保存路径
+     * @param imageType  二维码生成格式
      */
-    public static void zxingCodeCreate(String text, int width, int height, String outPutPath, String imageType){
+    public static void zxingCodeCreate(String text, int width, int height, String outPutPath, String imageType) {
         Map<EncodeHintType, String> his = new HashMap<EncodeHintType, String>();
         //设置编码字符集
         his.put(EncodeHintType.CHARACTER_SET, "utf-8");
@@ -70,7 +60,7 @@ public class QRCodeUtil {
             }
             File outPutImage = new File(outPutPath);
             //如果图片不存在创建图片
-            if(!outPutImage.exists())
+            if (!outPutImage.exists())
                 outPutImage.createNewFile();
             //5、将二维码写入图片
             ImageIO.write(image, imageType, outPutImage);
@@ -85,18 +75,18 @@ public class QRCodeUtil {
 
     /**
      * 二维码解析
-     * @param analyzePath    二维码路径
+     *
+     * @param analyzePath 二维码路径
      * @return
      * @throws IOException
      */
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    public static String zxingCodeAnalyze(String analyzePath) throws Exception{
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    public static String zxingCodeAnalyze(String analyzePath) throws Exception {
         MultiFormatReader formatReader = new MultiFormatReader();
         String resultStr = null;
         try {
             File file = new File(analyzePath);
-            if (!file.exists())
-            {
+            if (!file.exists()) {
                 return "二维码不存在";
             }
             BufferedImage image = ImageIO.read(file);
diff --git a/src/main/java/com/wisdo/mmining/utils/RSAUtils.java b/src/main/java/com/wisdo/mmining/utils/RSAUtils.java
index fca8049..7093483 100644
--- a/src/main/java/com/wisdo/mmining/utils/RSAUtils.java
+++ b/src/main/java/com/wisdo/mmining/utils/RSAUtils.java
@@ -5,6 +5,7 @@ import com.sun.org.apache.xerces.internal.impl.dv.util.Base64;
 import javax.crypto.Cipher;
 import java.io.*;
 import java.lang.reflect.Method;
+import java.nio.charset.StandardCharsets;
 import java.security.KeyFactory;
 import java.security.PrivateKey;
 import java.security.PublicKey;
@@ -24,18 +25,19 @@ public class RSAUtils {
         String encBankAcctName = "张三"; //加密的银行账户名
         //注意 这里的  pksc8_public.pem  是上一步获取微信支付公钥后经openssl 转化成PKCS8格式的公钥
         String keyfile = "d:/zd/pksc8_public.pem"; //读取PKCS8密钥文件
-        PublicKey pub=getPubKey(keyfile,"RSA");
-        String rsa ="RSA/ECB/OAEPWITHSHA-1ANDMGF1PADDING";
-        byte[] estr=encrypt(encBankAcctNo.getBytes("UTF-8"),pub,2048, 11,rsa);   //对银行账号进行加密
+        PublicKey pub = getPubKey(keyfile, "RSA");
+        String rsa = "RSA/ECB/OAEPWITHSHA-1ANDMGF1PADDING";
+        byte[] estr = encrypt(encBankAcctNo.getBytes(StandardCharsets.UTF_8), pub, 2048, 11, rsa);   //对银行账号进行加密
         encBankAcctNo = Base64.encode(estr);//并转为base64格式----  调用付款需要传的 银行卡号
 
-        byte[] name=encrypt(encBankAcctName.getBytes("UTF-8"),pub,2048, 11,rsa);   //对银行账号进行加密
-        encBankAcctName =Base64.encode(name);//并转为base64格式--调用付款需要传的 用户名
+        byte[] name = encrypt(encBankAcctName.getBytes(StandardCharsets.UTF_8), pub, 2048, 11, rsa);   //对银行账号进行加密
+        encBankAcctName = Base64.encode(name);//并转为base64格式--调用付款需要传的 用户名
         //将加密后的卡号和用户名 输出
-        System.out.println("encBankAcctNo---"+encBankAcctNo);
-        System.out.println("encBankAcctName---"+encBankAcctName);
+        System.out.println("encBankAcctNo---" + encBankAcctNo);
+        System.out.println("encBankAcctName---" + encBankAcctName);
 
     }
+
     public static byte[] decrypt(byte[] encryptedBytes, PrivateKey privateKey, int keyLength, int reserveSize, String cipherAlgorithm) throws Exception {
         int keyByteSize = keyLength / 8;
         int decryptBlockSize = keyByteSize - reserveSize;
@@ -59,16 +61,17 @@ public class RSAUtils {
         } catch (Exception e) {
             throw new Exception("DEENCRYPT ERROR:", e);
         } finally {
-            try{
-                if(outbuf != null){
+            try {
+                if (outbuf != null) {
                     outbuf.close();
                 }
-            }catch (Exception e){
+            } catch (Exception e) {
                 outbuf = null;
                 throw new Exception("CLOSE ByteArrayOutputStream ERROR:", e);
             }
         }
     }
+
     public static byte[] encrypt(byte[] plainBytes, PublicKey publicKey, int keyLength, int reserveSize, String cipherAlgorithm) throws Exception {
         int keyByteSize = keyLength / 8;
         int encryptBlockSize = keyByteSize - reserveSize;
@@ -95,61 +98,62 @@ public class RSAUtils {
         } catch (Exception e) {
             throw new Exception("ENCRYPT ERROR:", e);
         } finally {
-            try{
-                if(outbuf != null){
+            try {
+                if (outbuf != null) {
                     outbuf.close();
                 }
-            }catch (Exception e){
+            } catch (Exception e) {
                 outbuf = null;
                 throw new Exception("CLOSE ByteArrayOutputStream ERROR:", e);
             }
         }
     }
-    public static PrivateKey getPriKey(String privateKeyPath,String keyAlgorithm){
+
+    public static PrivateKey getPriKey(String privateKeyPath, String keyAlgorithm) {
         PrivateKey privateKey = null;
         InputStream inputStream = null;
         try {
-            if(inputStream==null){
+            if (inputStream == null) {
                 System.out.println("hahhah1!");
             }
             inputStream = new FileInputStream(privateKeyPath);
-            privateKey = getPrivateKey(inputStream,keyAlgorithm);
+            privateKey = getPrivateKey(inputStream, keyAlgorithm);
         } catch (Exception e) {
             e.printStackTrace();
         } finally {
-            if (inputStream != null){
+            if (inputStream != null) {
                 try {
                     inputStream.close();
-                }catch (Exception e){
+                } catch (Exception e) {
                     e.printStackTrace();
                 }
             }
         }
         return privateKey;
     }
-    public static PublicKey getPubKey(String publicKeyPath,String keyAlgorithm){
+
+    public static PublicKey getPubKey(String publicKeyPath, String keyAlgorithm) {
         PublicKey publicKey = null;
         InputStream inputStream = null;
-        try
-        {
+        try {
             inputStream = new FileInputStream(publicKeyPath);
-            publicKey = getPublicKey(inputStream,keyAlgorithm);
+            publicKey = getPublicKey(inputStream, keyAlgorithm);
         } catch (Exception e) {
             e.printStackTrace();//EAD PUBLIC KEY ERROR
         } finally {
-            if (inputStream != null){
+            if (inputStream != null) {
                 try {
                     inputStream.close();
-                }catch (Exception e){
+                } catch (Exception e) {
                     e.printStackTrace();
                 }
             }
         }
         return publicKey;
     }
+
     public static PublicKey getPublicKey(InputStream inputStream, String keyAlgorithm) throws Exception {
-        try
-        {
+        try {
 
             BufferedReader br = new BufferedReader(new InputStreamReader(inputStream));
             StringBuilder sb = new StringBuilder();
@@ -181,6 +185,7 @@ public class RSAUtils {
             }
         }
     }
+
     public static PrivateKey getPrivateKey(InputStream inputStream, String keyAlgorithm) throws Exception {
         try {
             BufferedReader br = new BufferedReader(new InputStreamReader(inputStream));
@@ -199,8 +204,8 @@ public class RSAUtils {
             PrivateKey privateKey = keyFactory.generatePrivate(priPKCS8);
             return privateKey;
         } catch (Exception e) {
-            throw new Exception("READ PRIVATE KEY ERROR:" ,e);
-        }  finally {
+            throw new Exception("READ PRIVATE KEY ERROR:", e);
+        } finally {
             try {
                 if (inputStream != null) {
                     inputStream.close();
@@ -211,23 +216,25 @@ public class RSAUtils {
             }
         }
     }
+
     //一下面是base64的编码和解码
-    public static String encodeBase64(byte[]input) throws Exception{
-        Class clazz=Class.forName("com.sun.org.apache.xerces.internal.impl.dv.util.Base64");
-        Method mainMethod= clazz.getMethod("encode", byte[].class);
+    public static String encodeBase64(byte[] input) throws Exception {
+        Class clazz = Class.forName("com.sun.org.apache.xerces.internal.impl.dv.util.Base64");
+        Method mainMethod = clazz.getMethod("encode", byte[].class);
         mainMethod.setAccessible(true);
-        Object retObj=mainMethod.invoke(null, new Object[]{input});
-        return (String)retObj;
+        Object retObj = mainMethod.invoke(null, new Object[]{input});
+        return (String) retObj;
     }
+
     /***
      * decode by Base64
      */
-    public static byte[] decodeBase64(String input) throws Exception{
-        Class clazz=Class.forName("com.sun.org.apache.xerces.internal.impl.dv.util.Base64");
-        Method mainMethod= clazz.getMethod("decode", String.class);
+    public static byte[] decodeBase64(String input) throws Exception {
+        Class clazz = Class.forName("com.sun.org.apache.xerces.internal.impl.dv.util.Base64");
+        Method mainMethod = clazz.getMethod("decode", String.class);
         mainMethod.setAccessible(true);
-        Object retObj=mainMethod.invoke(null, input);
-        return (byte[])retObj;
+        Object retObj = mainMethod.invoke(null, input);
+        return (byte[]) retObj;
     }
 
 }
diff --git a/src/main/java/com/wisdo/mmining/utils/RankQueue.java b/src/main/java/com/wisdo/mmining/utils/RankQueue.java
index 265467a..08727c7 100644
--- a/src/main/java/com/wisdo/mmining/utils/RankQueue.java
+++ b/src/main/java/com/wisdo/mmining/utils/RankQueue.java
@@ -12,7 +12,7 @@ import java.util.LinkedList;
  */
 public class RankQueue {
 
-    private LinkedList<PkPerson> list = new LinkedList<PkPerson>();
+    private final LinkedList<PkPerson> list = new LinkedList<PkPerson>();
 
     public void put(PkPerson v) {
         list.addFirst(v);
diff --git a/src/main/java/com/wisdo/mmining/utils/SmsSend.java b/src/main/java/com/wisdo/mmining/utils/SmsSend.java
index 412f271..492271d 100644
--- a/src/main/java/com/wisdo/mmining/utils/SmsSend.java
+++ b/src/main/java/com/wisdo/mmining/utils/SmsSend.java
@@ -15,10 +15,10 @@ public class SmsSend {
     /**
      * 相关秘钥等
      */
-    private static int appid = 1400385152;
-    private static String appkey = "39f413c5bd2dee6ab56f412db77a3692";
-    private static int tmplId = 639991;
-    private static String sign = "56集品";
+    private static final int appid = 1400385152;
+    private static final String appkey = "39f413c5bd2dee6ab56f412db77a3692";
+    private static final int tmplId = 639991;
+    private static final String sign = "56集品";
 
     /**
      * 平台发送短信，返回验证码
diff --git a/src/main/java/com/wisdo/mmining/utils/Tools.java b/src/main/java/com/wisdo/mmining/utils/Tools.java
index 6e5710a..1e9a740 100644
--- a/src/main/java/com/wisdo/mmining/utils/Tools.java
+++ b/src/main/java/com/wisdo/mmining/utils/Tools.java
@@ -1,8 +1,6 @@
 package com.wisdo.mmining.utils;
 
 
-
-
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 
@@ -14,6 +12,7 @@ import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.UnknownHostException;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -31,7 +30,7 @@ public class Tools {
         String appcode = "568384db0fae4a2383818be1e120981b"; // 【3】开通服务后 买家中心-查看AppCode
         //String no = no; // 【4】请求参数，详见文档描述
         //String type = "zto"; //  【4】请求参数，不知道可不填 95%能自动识别
-        String urlSend = host + path + "?no=" + no ; // 【5】拼接请求链接
+        String urlSend = host + path + "?no=" + no; // 【5】拼接请求链接
         List<Map> list = new ArrayList<>();
         try {
             URL url = new URL(urlSend);
@@ -80,7 +79,7 @@ public class Tools {
             // 打开注释查看详细报错异常信息
             // e.printStackTrace();
         }
-       return list;
+        return list;
     }
 
     /*
@@ -91,7 +90,7 @@ public class Tools {
         BufferedReader br = new BufferedReader(new InputStreamReader(is));
         String line = null;
         while ((line = br.readLine()) != null) {
-            line = new String(line.getBytes(), "utf-8");
+            line = new String(line.getBytes(), StandardCharsets.UTF_8);
             sb.append(line);
         }
         br.close();
diff --git a/src/main/java/com/wisdo/mmining/utils/WxBase64.java b/src/main/java/com/wisdo/mmining/utils/WxBase64.java
index 36027f1..825e15e 100644
--- a/src/main/java/com/wisdo/mmining/utils/WxBase64.java
+++ b/src/main/java/com/wisdo/mmining/utils/WxBase64.java
@@ -6,17 +6,17 @@ package com.wisdo.mmining.utils;
  * @Description:
  */
 public class WxBase64 {
-    static private final int     BASELENGTH           = 128;
-    static private final int     LOOKUPLENGTH         = 64;
-    static private final int     TWENTYFOURBITGROUP   = 24;
-    static private final int     EIGHTBIT             = 8;
-    static private final int     SIXTEENBIT           = 16;
-    static private final int     FOURBYTE             = 4;
-    static private final int     SIGN                 = -128;
-    static private final char    PAD                  = '=';
-    static private final boolean fDebug               = false;
-    static final private byte[]  base64Alphabet       = new byte[BASELENGTH];
-    static final private char[]  lookUpBase64Alphabet = new char[LOOKUPLENGTH];
+    static private final int BASELENGTH = 128;
+    static private final int LOOKUPLENGTH = 64;
+    static private final int TWENTYFOURBITGROUP = 24;
+    static private final int EIGHTBIT = 8;
+    static private final int SIXTEENBIT = 16;
+    static private final int FOURBYTE = 4;
+    static private final int SIGN = -128;
+    static private final char PAD = '=';
+    static private final boolean fDebug = false;
+    static final private byte[] base64Alphabet = new byte[BASELENGTH];
+    static final private char[] lookUpBase64Alphabet = new char[LOOKUPLENGTH];
 
     static {
         for (int i = 0; i < BASELENGTH; ++i) {
@@ -47,8 +47,8 @@ public class WxBase64 {
         for (int i = 52, j = 0; i <= 61; i++, j++) {
             lookUpBase64Alphabet[i] = (char) ('0' + j);
         }
-        lookUpBase64Alphabet[62] = (char) '+';
-        lookUpBase64Alphabet[63] = (char) '/';
+        lookUpBase64Alphabet[62] = '+';
+        lookUpBase64Alphabet[63] = '/';
 
     }
 
@@ -84,7 +84,7 @@ public class WxBase64 {
         int fewerThan24bits = lengthDataBits % TWENTYFOURBITGROUP;
         int numberTriplets = lengthDataBits / TWENTYFOURBITGROUP;
         int numberQuartet = fewerThan24bits != 0 ? numberTriplets + 1 : numberTriplets;
-        char encodedData[] = null;
+        char[] encodedData = null;
 
         encodedData = new char[numberQuartet * 4];
 
@@ -181,7 +181,7 @@ public class WxBase64 {
             return new byte[0];
         }
 
-        byte decodedData[] = null;
+        byte[] decodedData = null;
         byte b1 = 0, b2 = 0, b3 = 0, b4 = 0;
         char d1 = 0, d2 = 0, d3 = 0, d4 = 0;
 
@@ -256,8 +256,8 @@ public class WxBase64 {
     /**
      * remove WhiteSpace from MIME containing encoded Base64 data.
      *
-     * @param data  the byte array of base64 data (with WS)
-     * @return      the new length
+     * @param data the byte array of base64 data (with WS)
+     * @return the new length
      */
     private static int removeWhiteSpace(char[] data) {
         if (data == null) {
diff --git a/src/main/java/com/wisdo/mmining/utils/WxConfig.java b/src/main/java/com/wisdo/mmining/utils/WxConfig.java
index 2b18f38..bb734e1 100644
--- a/src/main/java/com/wisdo/mmining/utils/WxConfig.java
+++ b/src/main/java/com/wisdo/mmining/utils/WxConfig.java
@@ -15,13 +15,13 @@ public class WxConfig {
     public static final String GRANT_TYPE = "authorization_code";
 
     /**
-    *   微信扫码跳转网址
+     * 微信扫码跳转网址
      */
-    public static final  String WXSCANCODE_URL = "https://api.weixin.qq.com/sns/oauth2/access_token?";
+    public static final String WXSCANCODE_URL = "https://api.weixin.qq.com/sns/oauth2/access_token?";
 
     /**
-    *   获取用户个人信息
+     * 获取用户个人信息
      */
-    public static final  String USERINFO_URL = "https://api.weixin.qq.com/sns/userinfo?";
+    public static final String USERINFO_URL = "https://api.weixin.qq.com/sns/userinfo?";
 
 }
diff --git a/src/main/java/com/wisdo/mmining/utils/WxPayUtil.java b/src/main/java/com/wisdo/mmining/utils/WxPayUtil.java
index ada3622..38803a7 100644
--- a/src/main/java/com/wisdo/mmining/utils/WxPayUtil.java
+++ b/src/main/java/com/wisdo/mmining/utils/WxPayUtil.java
@@ -26,7 +26,7 @@ import java.util.Map;
 public class WxPayUtil {
 
     //退款
-    public static Map<String, Object> tuikuan(Double money,String orderNumber,String orderRefundNumber) {
+    public static Map<String, Object> tuikuan(Double money, String orderNumber, String orderRefundNumber) {
         Map<String, Object> reMap = new HashMap<String, Object>();
         System.out.println("退款金额：" + DoubleUtil.yuanToFen(money));
         String nonce_str = CreateStrUtil.getRandomStringByLength(32);
@@ -54,7 +54,7 @@ public class WxPayUtil {
                 + "</xml>";
 
         try {
-            String weixinPost = doRefund(WeiXinPayConfig.refund_url, xml).toString();
+            String weixinPost = doRefund(WeiXinPayConfig.refund_url, xml);
             Map map = PayUtil.doXMLParse(weixinPost);
             System.out.println("weixinPost" + map);
             if ("SUCCESS".equalsIgnoreCase(map.get("result_code").toString()) &&//提现成功返回
@@ -112,7 +112,7 @@ public class WxPayUtil {
                 + "</xml>";
 
         try {
-            String weixinPost = PayUtil.httpRequest(url,"POST", xml);
+            String weixinPost = PayUtil.httpRequest(url, "POST", xml);
             Map map = PayUtil.doXMLParse(weixinPost);
             System.out.println("weixinPost" + map);
             if ("SUCCESS".equalsIgnoreCase(map.get("result_code").toString()) &&//提现成功返回
diff --git a/src/main/java/com/wisdo/mmining/utils/WxUtil.java b/src/main/java/com/wisdo/mmining/utils/WxUtil.java
index efd02a9..c6de615 100644
--- a/src/main/java/com/wisdo/mmining/utils/WxUtil.java
+++ b/src/main/java/com/wisdo/mmining/utils/WxUtil.java
@@ -1,10 +1,5 @@
 package com.wisdo.mmining.utils;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.sun.org.apache.xerces.internal.parsers.XMLParser;
-import com.wisdo.mmining.entity.WisdBack;
-import com.wisdo.mmining.entity.WisdWithdrawal;
-import com.wisdo.mmining.service.WithdrawalService;
 import com.wisdo.mmining.weixin.WeiXinPayConfig;
 import org.apache.commons.collections.map.HashedMap;
 import org.apache.http.HttpEntity;
@@ -18,7 +13,6 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
 import org.apache.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.net.ssl.SSLContext;
 import java.io.File;
@@ -39,8 +33,7 @@ import static com.wisdo.mmining.utils.CreateStrUtil.getRandomStringByLength;
 public class WxUtil {
 
 
-
-    private static Logger logger = Logger.getLogger(WxUtil.class);
+    private static final Logger logger = Logger.getLogger(WxUtil.class);
 
     public static String doRefund(String url, String data) throws Exception {
         /**
diff --git a/src/main/java/com/wisdo/mmining/utils/smsUtils/SmsSend.java b/src/main/java/com/wisdo/mmining/utils/smsUtils/SmsSend.java
index c9e209b..8479e39 100644
--- a/src/main/java/com/wisdo/mmining/utils/smsUtils/SmsSend.java
+++ b/src/main/java/com/wisdo/mmining/utils/smsUtils/SmsSend.java
@@ -8,6 +8,7 @@ import java.util.ArrayList;
 /**
  * 描述<br/>
  * 发生短信
+ *
  * @author hjw
  * @date 2020/8/19
  */
@@ -15,6 +16,7 @@ public class SmsSend {
 
     /**
      * 平台发送短信，返回验证码.采用模板一
+     *
      * @param phone
      * @return
      */
@@ -31,7 +33,7 @@ public class SmsSend {
             SmsSingleSenderResult singleSenderResult;
             //指定模板单发
             ArrayList<String> params = new ArrayList<String>();
-            params.add("" + random + "");
+            params.add("" + random);
             singleSenderResult = singleSender.sendWithParam("86", phone, tmplId, params, "三品慧采", "", "");
             System.out.println(singleSenderResult);
         } catch (Exception e) {
@@ -41,9 +43,9 @@ public class SmsSend {
     }
 
 
-
     /**
      * 平台发送短信，返回验证码.采用模板一
+     *
      * @param phone
      * @return
      */
diff --git a/src/main/java/com/wisdo/mmining/utils/smsUtils/SmsSenderUtil.java b/src/main/java/com/wisdo/mmining/utils/smsUtils/SmsSenderUtil.java
index 848177e..caebd36 100644
--- a/src/main/java/com/wisdo/mmining/utils/smsUtils/SmsSenderUtil.java
+++ b/src/main/java/com/wisdo/mmining/utils/smsUtils/SmsSenderUtil.java
@@ -42,7 +42,7 @@ class SmsSenderUtil {
     }
 
     public int getRandom() {
-    	return random.nextInt(999999)%900000+100000;
+        return random.nextInt(999999) % 900000 + 100000;
     }
 
     public HttpURLConnection getPostHttpConn(String url) throws Exception {
@@ -61,42 +61,42 @@ class SmsSenderUtil {
     }
 
     public String calculateSig(
-    		String appkey,
-    		long random,
-    		String msg,
-    		long curTime,
-    		ArrayList<String> phoneNumbers) throws NoSuchAlgorithmException {
+            String appkey,
+            long random,
+            String msg,
+            long curTime,
+            ArrayList<String> phoneNumbers) throws NoSuchAlgorithmException {
         String phoneNumbersString = phoneNumbers.get(0);
         for (int i = 1; i < phoneNumbers.size(); i++) {
             phoneNumbersString += "," + phoneNumbers.get(i);
         }
         return strToHash(String.format(
-        		"appkey=%s&random=%d&time=%d&mobile=%s",
-        		appkey, random, curTime, phoneNumbersString));
+                "appkey=%s&random=%d&time=%d&mobile=%s",
+                appkey, random, curTime, phoneNumbersString));
     }
 
     public String calculateSigForTempl(
-    		String appkey,
-    		long random,
-    		long curTime,
-    		ArrayList<String> phoneNumbers) throws NoSuchAlgorithmException {
+            String appkey,
+            long random,
+            long curTime,
+            ArrayList<String> phoneNumbers) throws NoSuchAlgorithmException {
         String phoneNumbersString = phoneNumbers.get(0);
         for (int i = 1; i < phoneNumbers.size(); i++) {
             phoneNumbersString += "," + phoneNumbers.get(i);
         }
         return strToHash(String.format(
-        		"appkey=%s&random=%d&time=%d&mobile=%s",
-        		appkey, random, curTime, phoneNumbersString));
+                "appkey=%s&random=%d&time=%d&mobile=%s",
+                appkey, random, curTime, phoneNumbersString));
     }
 
     public String calculateSigForTempl(
-    		String appkey,
-    		long random,
-    		long curTime,
-    		String phoneNumber) throws NoSuchAlgorithmException {
-    	ArrayList<String> phoneNumbers = new ArrayList<String>();
-    	phoneNumbers.add(phoneNumber);
-    	return calculateSigForTempl(appkey, random, curTime, phoneNumbers);
+            String appkey,
+            long random,
+            long curTime,
+            String phoneNumber) throws NoSuchAlgorithmException {
+        ArrayList<String> phoneNumbers = new ArrayList<String>();
+        phoneNumbers.add(phoneNumber);
+        return calculateSigForTempl(appkey, random, curTime, phoneNumbers);
     }
 
     public JSONArray phoneNumbersToJsonArray(String nationCode, ArrayList<String> phoneNumbers) {
@@ -115,22 +115,22 @@ class SmsSenderUtil {
     public JSONArray smsParamsToJsonArray(ArrayList<String> params) {
         JSONArray smsParams = new JSONArray();
         for (int i = 0; i < params.size(); i++) {
-        	smsParams.put(params.get(i));
-		}
+            smsParams.put(params.get(i));
+        }
         return smsParams;
     }
 
     public SmsSingleSenderResult jsonToSmsSingleSenderResult(JSONObject json) {
-    	SmsSingleSenderResult result = new SmsSingleSenderResult();
+        SmsSingleSenderResult result = new SmsSingleSenderResult();
 
-    	result.result = json.getInt("result");
-    	result.errMsg = json.getString("errmsg");
-    	if (0 == result.result) {
-	    	result.ext = json.getString("ext");
-	    	result.sid = json.getString("sid");
-	    	result.fee = json.getInt("fee");
-    	}
-    	return result;
+        result.result = json.getInt("result");
+        result.errMsg = json.getString("errmsg");
+        if (0 == result.result) {
+            result.ext = json.getString("ext");
+            result.sid = json.getString("sid");
+            result.fee = json.getInt("fee");
+        }
+        return result;
     }
 
 
diff --git a/src/main/java/com/wisdo/mmining/utils/smsUtils/SmsSingleSender.java b/src/main/java/com/wisdo/mmining/utils/smsUtils/SmsSingleSender.java
index 71adbe5..3a9a1c6 100644
--- a/src/main/java/com/wisdo/mmining/utils/smsUtils/SmsSingleSender.java
+++ b/src/main/java/com/wisdo/mmining/utils/smsUtils/SmsSingleSender.java
@@ -6,6 +6,7 @@ import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.net.HttpURLConnection;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 
 /**
@@ -15,38 +16,39 @@ import java.util.ArrayList;
  * @date 2020/8/24
  */
 public class SmsSingleSender {
-	int appid;
-	String appkey;
+    int appid;
+    String appkey;
     String url = "https://yun.tim.qq.com/v5/tlssmssvr/sendsms";
 
-	SmsSenderUtil util = new SmsSenderUtil();
-	public SmsSingleSender(int appid, String appkey) throws Exception {
-		this.appid = appid;
-		this.appkey = appkey;
-	}
+    SmsSenderUtil util = new SmsSenderUtil();
 
-	/***
-	 *
-	 *  普通单发短信接口，明确指定内容，如果有多个签名，请在内容中以【】的方式添加到信息内容中，否则系统将使用默认签名
-	 * @author hjw
-	 * @date 2020/8/25
-	 * @param
-	 * @param type
-	 * @param nationCode
-	 * @param phoneNumber
-	 * @param msg
-	 * @param extend
-	 * @param ext
-	 * @return SmsSingleSenderResult
-	 *
-	 */
-	public SmsSingleSenderResult send(
-			int type,
-			String nationCode,
-			String phoneNumber,
-			String msg,
-			String extend,
-			String ext) throws Exception {
+    public SmsSingleSender(int appid, String appkey) throws Exception {
+        this.appid = appid;
+        this.appkey = appkey;
+    }
+
+    /***
+     *
+     *  普通单发短信接口，明确指定内容，如果有多个签名，请在内容中以【】的方式添加到信息内容中，否则系统将使用默认签名
+     * @author hjw
+     * @date 2020/8/25
+     * @param
+     * @param type
+     * @param nationCode
+     * @param phoneNumber
+     * @param msg
+     * @param extend
+     * @param ext
+     * @return SmsSingleSenderResult
+     *
+     */
+    public SmsSingleSenderResult send(
+            int type,
+            String nationCode,
+            String phoneNumber,
+            String msg,
+            String extend,
+            String ext) throws Exception {
 /*
 请求包体
 {
@@ -70,22 +72,22 @@ public class SmsSingleSender {
     "fee": 1
 }
 */
-		// 校验 type 类型
-		if (0 != type && 1 != type) {
-			throw new Exception("type " + type + " error");
-		}
-		if (null == extend) {
-			extend = "";
-		}
-		if (null == ext) {
-			ext = "";
-		}
+        // 校验 type 类型
+        if (0 != type && 1 != type) {
+            throw new Exception("type " + type + " error");
+        }
+        if (null == extend) {
+            extend = "";
+        }
+        if (null == ext) {
+            ext = "";
+        }
 
-		// 按照协议组织 post 请求包体
+        // 按照协议组织 post 请求包体
         long random = util.getRandom();
-        long curTime = System.currentTimeMillis()/1000;
+        long curTime = System.currentTimeMillis() / 1000;
 
-		JSONObject data = new JSONObject();
+        JSONObject data = new JSONObject();
         JSONObject tel = new JSONObject();
         tel.put("nationcode", nationCode);
         tel.put("mobile", phoneNumber);
@@ -93,24 +95,24 @@ public class SmsSingleSender {
         data.put("type", type);
         data.put("msg", msg);
         data.put("sig", util.strToHash(String.format(
-        		"appkey=%s&random=%d&time=%d&mobile=%s",
-        		appkey, random, curTime, phoneNumber)));
+                "appkey=%s&random=%d&time=%d&mobile=%s",
+                appkey, random, curTime, phoneNumber)));
         data.put("tel", tel);
         data.put("time", curTime);
         data.put("extend", extend);
         data.put("ext", ext);
 
         // 与上面的 random 必须一致
-		String wholeUrl = String.format("%s?sdkappid=%d&random=%d", url, appid, random);
+        String wholeUrl = String.format("%s?sdkappid=%d&random=%d", url, appid, random);
         HttpURLConnection conn = util.getPostHttpConn(wholeUrl);
-        OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream(), "utf-8");
+        OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream(), StandardCharsets.UTF_8);
         wr.write(data.toString());
         wr.flush();
         StringBuilder sb = new StringBuilder();
         int httpRspCode = conn.getResponseCode();
-		SmsSingleSenderResult result;
+        SmsSingleSenderResult result;
         if (httpRspCode == HttpURLConnection.HTTP_OK) {
-            BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream(), "utf-8"));
+            BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8));
             String line = null;
             while ((line = br.readLine()) != null) {
                 sb.append(line);
@@ -119,38 +121,37 @@ public class SmsSingleSender {
             JSONObject json = new JSONObject(sb.toString());
             result = util.jsonToSmsSingleSenderResult(json);
         } else {
-			result = new SmsSingleSenderResult();
-        	result.result = httpRspCode;
-        	result.errMsg = "http error " + httpRspCode + " " + conn.getResponseMessage();
+            result = new SmsSingleSenderResult();
+            result.result = httpRspCode;
+            result.errMsg = "http error " + httpRspCode + " " + conn.getResponseMessage();
         }
 
         return result;
-	}
+    }
 
-	/**
-	 *
-	 *  指定模板单发
-	 * @author hjw
-	 * @date 2020/8/25
-	 * @param
-	 * @param nationCode
-	 * @param phoneNumber
-	 * @param templId
-	 * @param params
-	 * @param sign
-	 * @param extend
-	 * @param ext
-	 * @return SmsSingleSenderResult
-	 *
-	 */
-	public SmsSingleSenderResult sendWithParam(
-			String nationCode,
-			String phoneNumber,
-			int templId,
-			ArrayList<String> params,
-			String sign,
-			String extend,
-			String ext) throws Exception {
+    /**
+     * 指定模板单发
+     *
+     * @param
+     * @param nationCode
+     * @param phoneNumber
+     * @param templId
+     * @param params
+     * @param sign
+     * @param extend
+     * @param ext
+     * @return SmsSingleSenderResult
+     * @author hjw
+     * @date 2020/8/25
+     */
+    public SmsSingleSenderResult sendWithParam(
+            String nationCode,
+            String phoneNumber,
+            int templId,
+            ArrayList<String> params,
+            String sign,
+            String extend,
+            String ext) throws Exception {
 /*
 请求包体
 {
@@ -179,26 +180,26 @@ public class SmsSingleSender {
     "fee": 1
 }
 */
-		if (null == nationCode || 0 == nationCode.length()) {
-			nationCode = "86";
-		}
-		if (null == params) {
-			params = new ArrayList<String>();
-		}
-		if (null == sign) {
-			sign = "";
-		}
-		if (null == extend) {
-			extend = "";
-		}
-		if (null == ext) {
-			ext = "";
-		}
+        if (null == nationCode || 0 == nationCode.length()) {
+            nationCode = "86";
+        }
+        if (null == params) {
+            params = new ArrayList<String>();
+        }
+        if (null == sign) {
+            sign = "";
+        }
+        if (null == extend) {
+            extend = "";
+        }
+        if (null == ext) {
+            ext = "";
+        }
 
-		long random = util.getRandom();
-		long curTime = System.currentTimeMillis()/1000;
+        long random = util.getRandom();
+        long curTime = System.currentTimeMillis() / 1000;
 
-		JSONObject data = new JSONObject();
+        JSONObject data = new JSONObject();
 
         JSONObject tel = new JSONObject();
         tel.put("nationcode", nationCode);
@@ -213,10 +214,10 @@ public class SmsSingleSender {
         data.put("extend", extend);
         data.put("ext", ext);
 
-		String wholeUrl = String.format("%s?sdkappid=%d&random=%d", url, appid, random);
+        String wholeUrl = String.format("%s?sdkappid=%d&random=%d", url, appid, random);
         HttpURLConnection conn = util.getPostHttpConn(wholeUrl);
 
-        OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream(), "utf-8");
+        OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream(), StandardCharsets.UTF_8);
         wr.write(data.toString());
         wr.flush();
 
@@ -225,7 +226,7 @@ public class SmsSingleSender {
         int httpRspCode = conn.getResponseCode();
         SmsSingleSenderResult result;
         if (httpRspCode == HttpURLConnection.HTTP_OK) {
-            BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream(), "utf-8"));
+            BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8));
             String line = null;
             while ((line = br.readLine()) != null) {
                 sb.append(line);
@@ -234,11 +235,11 @@ public class SmsSingleSender {
             JSONObject json = new JSONObject(sb.toString());
             result = util.jsonToSmsSingleSenderResult(json);
         } else {
-        	result = new SmsSingleSenderResult();
-        	result.result = httpRspCode;
-        	result.errMsg = "http error " + httpRspCode + " " + conn.getResponseMessage();
+            result = new SmsSingleSenderResult();
+            result.result = httpRspCode;
+            result.errMsg = "http error " + httpRspCode + " " + conn.getResponseMessage();
         }
 
         return result;
-	}
+    }
 }
diff --git a/src/main/java/com/wisdo/mmining/utils/smsUtils/SmsSingleSenderResult.java b/src/main/java/com/wisdo/mmining/utils/smsUtils/SmsSingleSenderResult.java
index f93d770..f925f94 100644
--- a/src/main/java/com/wisdo/mmining/utils/smsUtils/SmsSingleSenderResult.java
+++ b/src/main/java/com/wisdo/mmining/utils/smsUtils/SmsSingleSenderResult.java
@@ -8,16 +8,16 @@ package com.wisdo.mmining.utils.smsUtils;
  */
 public class SmsSingleSenderResult {
 
-	public int result;
-	public String errMsg = "";
-	public String ext = "";
-	public String sid = "";
-	public int fee;
+    public int result;
+    public String errMsg = "";
+    public String ext = "";
+    public String sid = "";
+    public int fee;
 
-	@Override
-	public String toString() {
-		return String.format(
-				"SmsSingleSenderResult\nresult %d\nerrMsg %s\next %s\nsid %s\nfee %d",
-				result, errMsg, ext, sid, fee);
-	}
+    @Override
+    public String toString() {
+        return String.format(
+                "SmsSingleSenderResult\nresult %d\nerrMsg %s\next %s\nsid %s\nfee %d",
+                result, errMsg, ext, sid, fee);
+    }
 }
diff --git a/src/main/webapp/WEB-INF/view/pages/order/order_refund_list.jsp b/src/main/webapp/WEB-INF/view/pages/order/order_refund_list.jsp
index 29a7559..b9d03fc 100644
--- a/src/main/webapp/WEB-INF/view/pages/order/order_refund_list.jsp
+++ b/src/main/webapp/WEB-INF/view/pages/order/order_refund_list.jsp
@@ -287,9 +287,7 @@
                         } else if (item.afterSalesStatus == 62 && item.orderRefundType == 3) {
                             return '<button class="layui-btn layui-btn-sm" lay-event="edit">详情</button><button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="deliveryStatus">同意退款</button><button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="nodeliveryStatus">拒绝退款</button>';
                         } else if (item.afterSalesStatus == 64 && (item.orderRefundType == 1 || item.orderRefundType == 2)) {
-                            return '<button class="layui-btn layui-btn-sm" lay-event="edit">详情</button><button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="deliveryMoney">完成退换货</button><button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="nodelivery">拒绝退换货</button>';
-                        } else if (item.afterSalesStatus == 63 && (item.orderRefundType == 1 || item.orderRefundType == 2)) {
-                            return '<button class="layui-btn layui-btn-sm" lay-event="edit">详情</button><button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="deliveryReplacedGoods">换货发货</button>';
+                            return '<button class="layui-btn layui-btn-sm" lay-event="edit">详情</button><button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="deliveryMoney">退换货发货</button><button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="nodelivery">拒绝退换货</button>';
                         } else {
                             return '<button class="layui-btn layui-btn-sm" lay-event="edit">详情</button><button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="del">删除</button>';
                         }
@@ -506,7 +504,7 @@
                         title: '发货',
                         type: 2,
                         content: root + "/order/getRefundLogistics?type=1&orderId=" + data.id,
-                        area: ['500px', '300px']
+                        area: ['700px', '600px']
                         , offset: '20%'
                     });
                 } else {
diff --git a/src/main/webapp/WEB-INF/view/pages/order/order_refund_logistics.jsp b/src/main/webapp/WEB-INF/view/pages/order/order_refund_logistics.jsp
index 125fbef..9ea5b07 100644
--- a/src/main/webapp/WEB-INF/view/pages/order/order_refund_logistics.jsp
+++ b/src/main/webapp/WEB-INF/view/pages/order/order_refund_logistics.jsp
@@ -7,10 +7,175 @@
     <title>56集品后台管理系统</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="${root}/static/core/css/form.css" media="all">
+    <script src="${root}/static/core/js/base/tailwindcss.js"></script>
+    <script>
+        let layer = null
+        layui.use(['layer'], function () {
+            const _layer = layui.layer;
+            layer = _layer
+        });
+    </script>
+    <script>
+        const __packages = ${packages};
+        const type = ${type};
+        const orderId = ${orderId};
+    </script>
 </head>
-<body style="background: white">
+<body style="background-color: white">
+<div id="root"></div>
+<script type="text/babel">
+    const {useState, useEffect} = React
+    const App = () => {
+        const [logisticsName, setLogisticsName] = useState("")
+        const [packages, setPackages] = useState(__packages)
+        useEffect(() => {
+            const _packages = [...packages]
+            const refundAll = !_packages.find(el => el.afterSalesStatus)
+            _packages.forEach(el => {
+                if (el.afterSalesStatus > 60 || refundAll) {
+                    el.logisticsNumber = ""
+                }
+            })
+            setPackages(_packages)
+        }, []);
+        return <div className="p-4">
+            <div className="layui-form-item">
+                <label htmlFor="logisticsName" className="layui-form-label w-24">物流名称</label>
+                <div className="layui-input-block">
+                    <input type="text" id="logisticsName" name="logisticsName" lay-verify="required"
+                           value={logisticsName}
+                           onInput={(ev) => {
+                               setLogisticsName(ev.target.value)
+                           }}
+                           placeholder="请输入物流名称" autoComplete="off" className="layui-input"/>
+                </div>
+            </div>
+            {(packages.filter(el => el.afterSalesStatus).length ? packages.filter(el => el.afterSalesStatus) : packages).map((pack, index) =>
+                <div
+                    key={pack.id}
+                    style={{
+                        // borderColor: activePackage === index ? "rgb(96 165 250)" : "rgb(209 213 219)",
+                        // boxShadow: activePackage === index ? "0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1);" : null,
+                    }}
+                    onClick={() => {
+                        // setActivePackage(() => index)
+                    }}
+                    className={"mt-4 pt-4 pr-2 border rounded relative"}>
+                    <div className="absolute left-4 -top-3 bg-white">需换货包裹{index + 1}</div>
+                    <div className="layui-form-item">
+                        <label className="layui-form-label w-[100px]"
+                               htmlFor={"logisticsNumber" + index}>运单号</label>
+                        <div className="layui-input-block">
+                            <input type="text" name="logisticsNumber" id={"logisticsNumber" + index}
+                                   value={pack.logisticsNumber}
+                                   placeholder="请输入运单号"
+                                   onInput={(ev) => {
+                                       const _packages = [...packages]
+                                       _packages.find(p => p.id === pack.id).logisticsNumber = ev.target.value
+                                       setPackages(_packages)
+                                   }}
+                                   autoComplete="off" className="layui-input"/>
+                        </div>
+                    </div>
+                    <div className="pl-2">
+                        <table className="layui-table">
+                            <thead>
+                            <tr>
+                                <th>名称</th>
+                                <th>规格</th>
+                                <th>数量</th>
+                                <th>操作</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            {
+                                pack.goods.map((goods, idx) => <tr key={goods.id}>
+                                        <td>{goods.name}</td>
+                                        <td>{goods.spec}</td>
+                                        <td>{goods.num}</td>
+                                        <td>
+                                            <button className="layui-btn layui-btn-xs" onClick={() => {
+                                                // 数量 -1，减至 0 时，从包裹中删除该项商品
+                                                const _packages = [...packages]
+                                                _packages.find(el => el.id === pack.id).goods[idx].num -= 1
+                                                setPackages(_packages.map(p => ({
+                                                    ...p,
+                                                    goods: p.goods.filter(g => g.num > 0)
+                                                })))
+                                            }}>移除
+                                            </button>
+                                        </td>
+                                    </tr>
+                                )
+                            }
+                            </tbody>
+                        </table>
+                    </div>
+                </div>)}
+
+            <div className="flex justify-center">
+                <button className="layui-btn layui-btn-primary layui-btn-sm subBtn w-[165px] mt-2"
+                        type="button" onClick={() => {
+                    $modal({
+                        type: 'confirm',
+                        icon: 'question',
+                        title: '提交确定',
+                        content: '确认提交吗？',
+                        mask: true,
+                        top: 50,
+                        maskClose: true,
+                        confirm: function (close) {
+                            var index = layer.load(2);
+                            $.ajax({
+                                method: "POST",
+                                url: root + "/order/deliveryRefundMoney",
+                                data: JSON.stringify({
+                                    type,
+                                    orderId,
+                                    logisticsName,
+                                    logistics: packages
+                                }),
+                                contentType: "application/json; charset=utf-8",
+                                success(e) {
+                                    layer.close(index);
+                                    if (e.code == 1) {
+                                        $.message({message: e.msg, type: "success"});
+                                        setTimeout(function () {
+                                            admin.close();
+                                            if (type == 1) {
+                                                admin.fatherReload();
+                                            } else {
+                                                admin.fatherReload();
+                                                admin.fatherFatherReload();
+                                            }
+                                        }, 500)
+                                    } else {
+                                        $.message({message: e.msg, type: "error"});
+                                    }
+                                }
+                            })
+                            close()
+                        },
+                        cancel: function (close) {
+                            close()
+                        }
+                    })
+                }}>提交
+                </button>
+            </div>
+        </div>
+    }
+    const container = document.getElementById("root")
+    const rootApp = ReactDOM.createRoot(container);
+    rootApp.render(
+        <App/>
+    );
+</script>
+</body>
+<%--<body style="background: white">
 <div class="layui-fluid">
     <div class="layui-row">
         <form class="layui-form" id="formData" lay-filter="formData">
@@ -78,5 +243,5 @@
             return false;
         });
     })
-</script>
+</script>--%>
 </html>
diff --git a/src/main/webapp/WEB-INF/view/pages/order/order_refund_remarke.jsp b/src/main/webapp/WEB-INF/view/pages/order/order_refund_remarke.jsp
index 29959b2..9363926 100644
--- a/src/main/webapp/WEB-INF/view/pages/order/order_refund_remarke.jsp
+++ b/src/main/webapp/WEB-INF/view/pages/order/order_refund_remarke.jsp
@@ -12,15 +12,128 @@
     <link rel="stylesheet" href="${root}/static/core/css/form.css" media="all">
     <script src="${root}/static/core/js/base/tailwindcss.js"></script>
     <script>
-        const packages = ${packages};
+        let layer = null
+        layui.use(['layer'], function () {
+            const _layer = layui.layer;
+            layer = _layer
+        });
+    </script>
+    <script>
+        const __packages = ${packages};
+        const type = ${type};
     </script>
 </head>
 <body style="background: white">
 <div id="root"></div>
 <script type="text/babel">
+    const {useState} = React
     const App = () => {
-        return <div>
-            {packages.map((_package, index) => _package).filter(el => el.after)}
+        const [orderRefundRemarke, setOrderRefundRemarke] = useState("")
+        return <div className="p-4">
+            {(__packages.find(el => el.afterSalesStatus) ? __packages.filter(el => el.afterSalesStatus) : __packages).map((pack, idx) =>
+                <div
+                    key={pack.id}
+                    style={{
+                        // borderColor: activePackage === index ? "rgb(96 165 250)" : "rgb(209 213 219)",
+                        // boxShadow: activePackage === index ? "0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1);" : null,
+                    }}
+                    onClick={() => {
+                        // setActivePackage(() => index)
+                    }}
+                    className={"mt-4 pt-4 pr-2 border rounded relative"}>
+                    <div className="absolute left-4 -top-3 bg-white">需换货包裹</div>
+                    <div className="layui-form-item">
+                        <label className="layui-form-label w-[100px]"
+                               htmlFor={"logisticsNumber" + idx}>运单号</label>
+                        <div className="layui-input-block">
+                            <input type="text" name="logisticsNumber" id={"logisticsNumber" + idx}
+                                   value={pack.logisticsNumber}
+                                   readOnly
+                                   placeholder="请输入运单号"
+                                   autoComplete="off" className="layui-input"/>
+                        </div>
+                    </div>
+                    <div className="pl-2">
+                        <table className="layui-table">
+                            <thead>
+                            <tr>
+                                <th>名称</th>
+                                <th>规格</th>
+                                <th>数量</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            {
+                                pack.goods.map((goods, idx) => <tr key={goods.id}>
+                                        <td>{goods.name}</td>
+                                        <td>{goods.spec}</td>
+                                        <td>{goods.num}</td>
+                                    </tr>
+                                )
+                            }
+                            </tbody>
+                        </table>
+                    </div>
+                </div>)}
+            <div className="layui-form-item mt-4">
+                <label htmlFor="orderRefundRemarke" className="layui-form-label w-24">备注</label>
+                <div className="layui-input-block">
+                    <textarea type="text" id="orderRefundRemarke" name="orderRefundRemarke" value={orderRefundRemarke}
+                              onInput={(ev) => {
+                                  setOrderRefundRemarke(ev.target.value)
+                              }} autoComplete="off" className="layui-input h-[250px]"></textarea>
+                </div>
+            </div>
+            <div className="flex justify-center">
+                <button className="layui-btn layui-btn-primary layui-btn-sm subBtn w-[165px] mt-2"
+                        type="button" onClick={() => {
+                    $modal({
+                        type: 'confirm',
+                        icon: 'question',
+                        title: '提交确定',
+                        content: '确认提交吗？',
+                        mask: true,
+                        top: 50,
+                        maskClose: true,
+                        confirm: function (close) {
+                            var index = layer.load(2);
+                            $.ajax({
+                                method: "POST",
+                                url: root + "/order/refundRemarkes",
+                                data: JSON.stringify({
+                                    type: ${type},
+                                    orderId: ${orderId},
+                                    agree: ${agree},
+                                    orderRefundRemarke
+                                }),
+                                contentType: "application/json; charset=utf-8",
+                                success(e) {
+                                    layer.close(index);
+                                    if (e.code == 1) {
+                                        $.message({message: e.msg, type: "success"});
+                                        setTimeout(function () {
+                                            admin.close();
+                                            if (type == 1) {
+                                                admin.fatherReload();
+                                            } else {
+                                                admin.fatherReload();
+                                                admin.fatherFatherReload();
+                                            }
+                                        }, 500)
+                                    } else {
+                                        $.message({message: e.msg, type: "error"});
+                                    }
+                                }
+                            })
+                            close()
+                        },
+                        cancel: function (close) {
+                            close()
+                        }
+                    })
+                }}>提交
+                </button>
+            </div>
         </div>
     }
     const container = document.getElementById("root")