Procházet zdrojové kódy

使用@AllArgsConstructor注解

fushengqian před 1 rokem
rodič
revize
4b738cd0fa
100 změnil soubory, kde provedl 528 přidání a 599 odebrání
  1. 2 9
      fuint-application/src/main/java/com/fuint/common/service/impl/AccountServiceImpl.java
  2. 2 2
      fuint-application/src/main/java/com/fuint/common/service/impl/ActionLogServiceImpl.java
  3. 2 2
      fuint-application/src/main/java/com/fuint/common/service/impl/AddressServiceImpl.java
  4. 10 6
      fuint-application/src/main/java/com/fuint/common/service/impl/AlipayServiceImpl.java
  5. 8 4
      fuint-application/src/main/java/com/fuint/common/service/impl/ArticleServiceImpl.java
  6. 8 6
      fuint-application/src/main/java/com/fuint/common/service/impl/BalanceServiceImpl.java
  7. 6 4
      fuint-application/src/main/java/com/fuint/common/service/impl/BannerServiceImpl.java
  8. 5 2
      fuint-application/src/main/java/com/fuint/common/service/impl/CaptchaServiceImpl.java
  9. 3 6
      fuint-application/src/main/java/com/fuint/common/service/impl/CartServiceImpl.java
  10. 5 6
      fuint-application/src/main/java/com/fuint/common/service/impl/CateServiceImpl.java
  11. 2 2
      fuint-application/src/main/java/com/fuint/common/service/impl/CommissionLogServiceImpl.java
  12. 2 2
      fuint-application/src/main/java/com/fuint/common/service/impl/CommissionRuleServiceImpl.java
  13. 11 7
      fuint-application/src/main/java/com/fuint/common/service/impl/ConfirmLogServiceImpl.java
  14. 20 12
      fuint-application/src/main/java/com/fuint/common/service/impl/CouponGroupServiceImpl.java
  15. 21 13
      fuint-application/src/main/java/com/fuint/common/service/impl/CouponServiceImpl.java
  16. 2 3
      fuint-application/src/main/java/com/fuint/common/service/impl/DutyServiceImpl.java
  17. 21 15
      fuint-application/src/main/java/com/fuint/common/service/impl/GiveServiceImpl.java
  18. 11 9
      fuint-application/src/main/java/com/fuint/common/service/impl/GoodsServiceImpl.java
  19. 4 4
      fuint-application/src/main/java/com/fuint/common/service/impl/MemberGroupServiceImpl.java
  20. 3 11
      fuint-application/src/main/java/com/fuint/common/service/impl/MemberServiceImpl.java
  21. 2 3
      fuint-application/src/main/java/com/fuint/common/service/impl/MerchantServiceImpl.java
  22. 2 3
      fuint-application/src/main/java/com/fuint/common/service/impl/MessageServiceImpl.java
  23. 18 11
      fuint-application/src/main/java/com/fuint/common/service/impl/OpenGiftServiceImpl.java
  24. 60 31
      fuint-application/src/main/java/com/fuint/common/service/impl/OrderServiceImpl.java
  25. 3 10
      fuint-application/src/main/java/com/fuint/common/service/impl/PaymentServiceImpl.java
  26. 8 7
      fuint-application/src/main/java/com/fuint/common/service/impl/PointServiceImpl.java
  27. 2 15
      fuint-application/src/main/java/com/fuint/common/service/impl/RefundServiceImpl.java
  28. 2 3
      fuint-application/src/main/java/com/fuint/common/service/impl/SendLogServiceImpl.java
  29. 8 6
      fuint-application/src/main/java/com/fuint/common/service/impl/SendSmsServiceImpl.java
  30. 5 5
      fuint-application/src/main/java/com/fuint/common/service/impl/SettingServiceImpl.java
  31. 8 6
      fuint-application/src/main/java/com/fuint/common/service/impl/SettlementServiceImpl.java
  32. 4 4
      fuint-application/src/main/java/com/fuint/common/service/impl/SmsTemplateServiceImpl.java
  33. 2 2
      fuint-application/src/main/java/com/fuint/common/service/impl/SourceServiceImpl.java
  34. 2 8
      fuint-application/src/main/java/com/fuint/common/service/impl/StaffServiceImpl.java
  35. 2 5
      fuint-application/src/main/java/com/fuint/common/service/impl/StockServiceImpl.java
  36. 2 6
      fuint-application/src/main/java/com/fuint/common/service/impl/StoreServiceImpl.java
  37. 2 3
      fuint-application/src/main/java/com/fuint/common/service/impl/UserActionServiceImpl.java
  38. 27 11
      fuint-application/src/main/java/com/fuint/common/service/impl/UserCouponServiceImpl.java
  39. 2 7
      fuint-application/src/main/java/com/fuint/common/service/impl/UserGradeServiceImpl.java
  40. 2 3
      fuint-application/src/main/java/com/fuint/common/service/impl/VerifyCodeServiceImpl.java
  41. 21 17
      fuint-application/src/main/java/com/fuint/common/service/impl/WeixinServiceImpl.java
  42. 2 5
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendAccountController.java
  43. 2 3
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendActionLogController.java
  44. 2 4
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendArticleController.java
  45. 2 4
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendBalanceController.java
  46. 2 4
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendBannerController.java
  47. 3 3
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCaptchaController.java
  48. 2 10
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCashierController.java
  49. 2 5
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCateController.java
  50. 2 3
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCommissionLogController.java
  51. 2 3
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCommissionRuleController.java
  52. 3 6
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendConfirmLogController.java
  53. 17 13
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCouponController.java
  54. 3 8
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCouponGroupController.java
  55. 4 10
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendDoConfirmController.java
  56. 8 3
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendDutyController.java
  57. 8 3
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendFileController.java
  58. 2 7
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendGiveLogController.java
  59. 2 10
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendGoodsController.java
  60. 11 4
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendHomeController.java
  61. 9 12
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendLoginController.java
  62. 2 6
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendMemberController.java
  63. 2 4
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendMemberGroupController.java
  64. 2 3
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendMerchantController.java
  65. 2 3
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendOpenGiftController.java
  66. 2 8
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendOrderController.java
  67. 2 4
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendPointController.java
  68. 2 5
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendRefundController.java
  69. 3 5
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSendLogController.java
  70. 2 4
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSettlementController.java
  71. 2 2
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSmsController.java
  72. 2 2
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSmsTemplateController.java
  73. 12 15
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSourceController.java
  74. 2 2
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendStaffController.java
  75. 11 5
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendStatisticController.java
  76. 2 9
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendStockController.java
  77. 2 4
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendStoreController.java
  78. 5 3
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSubMessageController.java
  79. 2 10
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendUserCouponController.java
  80. 2 2
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendUserGradeController.java
  81. 2 4
      fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientAddressController.java
  82. 4 7
      fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientArticleController.java
  83. 2 7
      fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientBalanceController.java
  84. 2 2
      fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientCaptchaController.java
  85. 2 9
      fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientCartController.java
  86. 2 4
      fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientCashierController.java
  87. 2 6
      fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientConfirmController.java
  88. 2 7
      fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientCouponController.java
  89. 5 3
      fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientFileController.java
  90. 2 3
      fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientGiveController.java
  91. 2 5
      fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientGoodsController.java
  92. 2 4
      fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientMessageController.java
  93. 2 3
      fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientMyCouponController.java
  94. 2 2
      fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientOrderController.java
  95. 3 4
      fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientPageController.java
  96. 3 12
      fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientPayController.java
  97. 2 2
      fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientPointsController.java
  98. 2 3
      fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientRefundController.java
  99. 2 3
      fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientRegionController.java
  100. 2 2
      fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientSettlementController.java

+ 2 - 9
fuint-application/src/main/java/com/fuint/common/service/impl/AccountServiceImpl.java

@@ -18,15 +18,13 @@ import com.fuint.utils.Digests;
 import com.fuint.utils.Encodes;
 import com.fuint.utils.Encodes;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
+import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
 import java.util.*;
 import java.util.*;
 
 
 /**
 /**
@@ -36,27 +34,22 @@ import java.util.*;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class AccountServiceImpl extends ServiceImpl<TAccountMapper, TAccount> implements AccountService {
 public class AccountServiceImpl extends ServiceImpl<TAccountMapper, TAccount> implements AccountService {
 
 
-    @Resource
     private TAccountMapper tAccountMapper;
     private TAccountMapper tAccountMapper;
 
 
-    @Resource
     private TDutyMapper tDutyMapper;
     private TDutyMapper tDutyMapper;
 
 
-    @Resource
     private TAccountDutyMapper tAccountDutyMapper;
     private TAccountDutyMapper tAccountDutyMapper;
 
 
-    @Resource
     private MtMerchantMapper mtMerchantMapper;
     private MtMerchantMapper mtMerchantMapper;
 
 
-    @Resource
     private MtStoreMapper mtStoreMapper;
     private MtStoreMapper mtStoreMapper;
 
 
     /**
     /**
      * 员工接口
      * 员工接口
      */
      */
-    @Autowired
     private StaffService staffService;
     private StaffService staffService;
 
 
     /**
     /**

+ 2 - 2
fuint-application/src/main/java/com/fuint/common/service/impl/ActionLogServiceImpl.java

@@ -10,11 +10,11 @@ import com.fuint.repository.mapper.TActionLogMapper;
 import com.fuint.repository.model.TActionLog;
 import com.fuint.repository.model.TActionLog;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
+import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
@@ -24,9 +24,9 @@ import java.util.List;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class ActionLogServiceImpl extends ServiceImpl<TActionLogMapper, TActionLog> implements ActionLogService {
 public class ActionLogServiceImpl extends ServiceImpl<TActionLogMapper, TActionLog> implements ActionLogService {
 
 
-    @Resource
     private TActionLogMapper tActionLogMapper;
     private TActionLogMapper tActionLogMapper;
 
 
     public void saveActionLog(TActionLog actionLog) {
     public void saveActionLog(TActionLog actionLog) {

+ 2 - 2
fuint-application/src/main/java/com/fuint/common/service/impl/AddressServiceImpl.java

@@ -8,9 +8,9 @@ import com.fuint.common.enums.YesOrNoEnum;
 import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.common.enums.StatusEnum;
 import com.fuint.common.enums.StatusEnum;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
 import java.util.List;
 import java.util.List;
 import java.util.Date;
 import java.util.Date;
 import java.util.Map;
 import java.util.Map;
@@ -23,9 +23,9 @@ import java.util.HashMap;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class AddressServiceImpl extends ServiceImpl<MtAddressMapper, MtAddress> implements AddressService {
 public class AddressServiceImpl extends ServiceImpl<MtAddressMapper, MtAddress> implements AddressService {
 
 
-    @Resource
     private MtAddressMapper mtAddressMapper;
     private MtAddressMapper mtAddressMapper;
 
 
     /**
     /**

+ 10 - 6
fuint-application/src/main/java/com/fuint/common/service/impl/AlipayServiceImpl.java

@@ -20,9 +20,9 @@ import com.fuint.utils.StringUtil;
 import com.ijpay.alipay.AliPayApi;
 import com.ijpay.alipay.AliPayApi;
 import com.ijpay.alipay.AliPayApiConfig;
 import com.ijpay.alipay.AliPayApiConfig;
 import com.ijpay.alipay.AliPayApiConfigKit;
 import com.ijpay.alipay.AliPayApiConfigKit;
+import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
@@ -35,19 +35,23 @@ import java.util.*;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class AlipayServiceImpl implements AlipayService {
 public class AlipayServiceImpl implements AlipayService {
 
 
     private static final Logger logger = LoggerFactory.getLogger(WeixinServiceImpl.class);
     private static final Logger logger = LoggerFactory.getLogger(WeixinServiceImpl.class);
 
 
-    @Autowired
+    private AliPayBean aliPayBean;
+
+    /**
+     * 订单服务接口
+     * */
     private OrderService orderService;
     private OrderService orderService;
 
 
-    @Autowired
+    /**
+     * 店铺服务接口
+     * */
     private StoreService storeService;
     private StoreService storeService;
 
 
-    @Autowired
-    AliPayBean aliPayBean;
-
     /**
     /**
      * 创建支付订单
      * 创建支付订单
      * @return
      * @return

+ 8 - 4
fuint-application/src/main/java/com/fuint/common/service/impl/ArticleServiceImpl.java

@@ -15,6 +15,7 @@ import com.fuint.repository.model.MtArticle;
 import com.fuint.common.service.SettingService;
 import com.fuint.common.service.SettingService;
 import com.fuint.common.enums.StatusEnum;
 import com.fuint.common.enums.StatusEnum;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
+import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
@@ -22,7 +23,6 @@ import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
 import java.util.*;
 import java.util.*;
 
 
 /**
 /**
@@ -32,15 +32,19 @@ import java.util.*;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class ArticleServiceImpl extends ServiceImpl<MtArticleMapper, MtArticle> implements ArticleService {
 public class ArticleServiceImpl extends ServiceImpl<MtArticleMapper, MtArticle> implements ArticleService {
 
 
-    @Resource
     private MtArticleMapper mtArticleMapper;
     private MtArticleMapper mtArticleMapper;
 
 
-    @Resource
+    /**
+     * 系统设置服务接口
+     * */
     private SettingService settingService;
     private SettingService settingService;
 
 
-    @Resource
+    /**
+     * 商户服务接口
+     * */
     private MerchantService merchantService;
     private MerchantService merchantService;
 
 
     /**
     /**

+ 8 - 6
fuint-application/src/main/java/com/fuint/common/service/impl/BalanceServiceImpl.java

@@ -25,13 +25,12 @@ import com.fuint.repository.model.MtUser;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
+import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.*;
 
 
@@ -42,18 +41,21 @@ import java.util.*;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class BalanceServiceImpl extends ServiceImpl<MtBalanceMapper, MtBalance> implements BalanceService {
 public class BalanceServiceImpl extends ServiceImpl<MtBalanceMapper, MtBalance> implements BalanceService {
 
 
-    @Resource
     private MtBalanceMapper mtBalanceMapper;
     private MtBalanceMapper mtBalanceMapper;
 
 
-    @Resource
     private MtUserMapper mtUserMapper;
     private MtUserMapper mtUserMapper;
 
 
-    @Resource
+    /**
+     * 微信相关服务接口
+     * */
     private WeixinService weixinService;
     private WeixinService weixinService;
 
 
-    @Resource
+    /**
+     * 会员服务接口
+     * */
     private MemberService memberService;
     private MemberService memberService;
 
 
     /**
     /**

+ 6 - 4
fuint-application/src/main/java/com/fuint/common/service/impl/BannerServiceImpl.java

@@ -16,6 +16,7 @@ import com.fuint.common.enums.StatusEnum;
 import com.fuint.repository.mapper.MtBannerMapper;
 import com.fuint.repository.mapper.MtBannerMapper;
 
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
+import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
@@ -24,24 +25,25 @@ import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
 import java.util.*;
 import java.util.*;
 
 
 /**
 /**
- * banner服务接口
+ * 焦点图服务接口
  *
  *
  * Created by FSQ
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class BannerServiceImpl extends ServiceImpl<MtBannerMapper, MtBanner> implements BannerService {
 public class BannerServiceImpl extends ServiceImpl<MtBannerMapper, MtBanner> implements BannerService {
 
 
     private static final Logger logger = LoggerFactory.getLogger(BannerServiceImpl.class);
     private static final Logger logger = LoggerFactory.getLogger(BannerServiceImpl.class);
 
 
-    @Resource
     private MtBannerMapper mtBannerMapper;
     private MtBannerMapper mtBannerMapper;
 
 
-    @Resource
+    /**
+     * 系统设置服务接口
+     * */
     private SettingService settingService;
     private SettingService settingService;
 
 
     /**
     /**

+ 5 - 2
fuint-application/src/main/java/com/fuint/common/service/impl/CaptchaServiceImpl.java

@@ -5,10 +5,10 @@ import com.fuint.common.service.CaptchaService;
 import com.google.code.kaptcha.Constants;
 import com.google.code.kaptcha.Constants;
 import com.google.code.kaptcha.Producer;
 import com.google.code.kaptcha.Producer;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
+import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
 import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpSession;
 import java.awt.image.BufferedImage;
 import java.awt.image.BufferedImage;
 
 
@@ -19,11 +19,14 @@ import java.awt.image.BufferedImage;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class CaptchaServiceImpl implements CaptchaService {
 public class CaptchaServiceImpl implements CaptchaService {
 
 
     private static final Logger logger = LoggerFactory.getLogger(CaptchaServiceImpl.class);
     private static final Logger logger = LoggerFactory.getLogger(CaptchaServiceImpl.class);
 
 
-    @Resource
+    /**
+     * 图形验证码生成器
+     * */
     private Producer captchaProducer;
     private Producer captchaProducer;
 
 
     /**
     /**

+ 3 - 6
fuint-application/src/main/java/com/fuint/common/service/impl/CartServiceImpl.java

@@ -13,9 +13,8 @@ import com.fuint.repository.model.MtCart;
 import com.fuint.repository.model.MtGoods;
 import com.fuint.repository.model.MtGoods;
 import com.fuint.repository.model.MtGoodsSku;
 import com.fuint.repository.model.MtGoodsSku;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
 import java.util.*;
 import java.util.*;
 
 
 /**
 /**
@@ -25,21 +24,19 @@ import java.util.*;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class CartServiceImpl extends ServiceImpl<MtCartMapper, MtCart> implements CartService {
 public class CartServiceImpl extends ServiceImpl<MtCartMapper, MtCart> implements CartService {
 
 
-    @Resource
     private MtCartMapper mtCartMapper;
     private MtCartMapper mtCartMapper;
 
 
-    @Resource
     private MtGoodsMapper mtGoodsMapper;
     private MtGoodsMapper mtGoodsMapper;
 
 
-    @Resource
     private MtGoodsSkuMapper mtGoodsSkuMapper;
     private MtGoodsSkuMapper mtGoodsSkuMapper;
 
 
     /**
     /**
      * 保存购物车
      * 保存购物车
      *
      *
-     * @param reqDto
+     * @param  reqDto
      * @throws BusinessCheckException
      * @throws BusinessCheckException
      */
      */
     @Override
     @Override

+ 5 - 6
fuint-application/src/main/java/com/fuint/common/service/impl/CateServiceImpl.java

@@ -19,17 +19,15 @@ import com.fuint.repository.model.MtStore;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
+import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
 import java.util.*;
 import java.util.*;
 
 
 /**
 /**
@@ -39,17 +37,18 @@ import java.util.*;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class CateServiceImpl extends ServiceImpl<MtGoodsCateMapper, MtGoodsCate> implements CateService {
 public class CateServiceImpl extends ServiceImpl<MtGoodsCateMapper, MtGoodsCate> implements CateService {
 
 
     private static final Logger log = LoggerFactory.getLogger(CateServiceImpl.class);
     private static final Logger log = LoggerFactory.getLogger(CateServiceImpl.class);
 
 
-    @Resource
     private MtGoodsMapper mtGoodsMapper;
     private MtGoodsMapper mtGoodsMapper;
 
 
-    @Resource
     private MtGoodsCateMapper cateMapper;
     private MtGoodsCateMapper cateMapper;
 
 
-    @Autowired
+    /**
+     * 店铺服务接口
+     * */
     private StoreService storeService;
     private StoreService storeService;
 
 
     /**
     /**

+ 2 - 2
fuint-application/src/main/java/com/fuint/common/service/impl/CommissionLogServiceImpl.java

@@ -14,6 +14,7 @@ import com.fuint.common.enums.StatusEnum;
 
 
 import com.fuint.repository.model.MtCommissionLog;
 import com.fuint.repository.model.MtCommissionLog;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
+import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
@@ -22,7 +23,6 @@ import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
 import java.util.*;
 import java.util.*;
 
 
 /**
 /**
@@ -32,11 +32,11 @@ import java.util.*;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class CommissionLogServiceImpl extends ServiceImpl<MtCommissionLogMapper, MtCommissionLog> implements CommissionLogService {
 public class CommissionLogServiceImpl extends ServiceImpl<MtCommissionLogMapper, MtCommissionLog> implements CommissionLogService {
 
 
     private static final Logger logger = LoggerFactory.getLogger(CommissionLogServiceImpl.class);
     private static final Logger logger = LoggerFactory.getLogger(CommissionLogServiceImpl.class);
 
 
-    @Resource
     private MtCommissionLogMapper mtCommissionLogMapper;
     private MtCommissionLogMapper mtCommissionLogMapper;
 
 
     /**
     /**

+ 2 - 2
fuint-application/src/main/java/com/fuint/common/service/impl/CommissionRuleServiceImpl.java

@@ -14,6 +14,7 @@ import com.fuint.common.enums.StatusEnum;
 
 
 import com.fuint.repository.model.MtCommissionRule;
 import com.fuint.repository.model.MtCommissionRule;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
+import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
@@ -22,7 +23,6 @@ import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
 import java.util.*;
 import java.util.*;
 
 
 /**
 /**
@@ -32,11 +32,11 @@ import java.util.*;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class CommissionRuleServiceImpl extends ServiceImpl<MtCommissionRuleMapper, MtCommissionRule> implements CommissionRuleService {
 public class CommissionRuleServiceImpl extends ServiceImpl<MtCommissionRuleMapper, MtCommissionRule> implements CommissionRuleService {
 
 
     private static final Logger logger = LoggerFactory.getLogger(CommissionRuleServiceImpl.class);
     private static final Logger logger = LoggerFactory.getLogger(CommissionRuleServiceImpl.class);
 
 
-    @Resource
     private MtCommissionRuleMapper mtCommissionRuleMapper;
     private MtCommissionRuleMapper mtCommissionRuleMapper;
 
 
     /**
     /**

+ 11 - 7
fuint-application/src/main/java/com/fuint/common/service/impl/ConfirmLogServiceImpl.java

@@ -16,13 +16,11 @@ import com.fuint.repository.mapper.MtConfirmLogMapper;
 import com.fuint.repository.model.*;
 import com.fuint.repository.model.*;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
+import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
 import java.util.*;
 import java.util.*;
 
 
 /**
 /**
@@ -32,18 +30,24 @@ import java.util.*;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class ConfirmLogServiceImpl extends ServiceImpl<MtConfirmLogMapper, MtConfirmLog> implements ConfirmLogService {
 public class ConfirmLogServiceImpl extends ServiceImpl<MtConfirmLogMapper, MtConfirmLog> implements ConfirmLogService {
 
 
-    @Resource
     private MtConfirmLogMapper mtConfirmLogMapper;
     private MtConfirmLogMapper mtConfirmLogMapper;
 
 
-    @Autowired
+    /**
+     * 卡券服务接口
+     * */
     private CouponService couponService;
     private CouponService couponService;
 
 
-    @Autowired
+    /**
+     * 会员服务接口
+     * */
     private MemberService memberService;
     private MemberService memberService;
 
 
-    @Autowired
+    /**
+     * 店铺服务接口
+     * */
     private StoreService storeService;
     private StoreService storeService;
 
 
     /**
     /**

+ 20 - 12
fuint-application/src/main/java/com/fuint/common/service/impl/CouponGroupServiceImpl.java

@@ -24,10 +24,10 @@ import com.fuint.repository.model.*;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
+import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.Environment;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
@@ -36,8 +36,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.Model;
 import org.springframework.ui.Model;
 import org.springframework.util.ResourceUtils;
 import org.springframework.util.ResourceUtils;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.io.File;
 import java.io.IOException;
 import java.io.IOException;
@@ -53,35 +51,45 @@ import java.util.regex.Pattern;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class CouponGroupServiceImpl extends ServiceImpl<MtCouponGroupMapper, MtCouponGroup> implements CouponGroupService {
 public class CouponGroupServiceImpl extends ServiceImpl<MtCouponGroupMapper, MtCouponGroup> implements CouponGroupService {
 
 
     private static final Logger log = LoggerFactory.getLogger(CouponGroupServiceImpl.class);
     private static final Logger log = LoggerFactory.getLogger(CouponGroupServiceImpl.class);
 
 
-    @Resource
     private MtCouponGroupMapper mtCouponGroupMapper;
     private MtCouponGroupMapper mtCouponGroupMapper;
 
 
-    @Resource
     private MtCouponMapper mtCouponMapper;
     private MtCouponMapper mtCouponMapper;
 
 
-    @Resource
     private MtUserCouponMapper mtUserCouponMapper;
     private MtUserCouponMapper mtUserCouponMapper;
 
 
-    @Resource
+    /**
+     * 卡券服务接口
+     * */
     private CouponService couponService;
     private CouponService couponService;
 
 
-    @Resource
+    /**
+     * 会员卡券服务接口
+     * */
     private UserCouponService userCouponService;
     private UserCouponService userCouponService;
 
 
-    @Resource
+    /**
+     * 会员服务接口
+     * */
     private MemberService memberService;
     private MemberService memberService;
 
 
-    @Resource
+    /**
+     * 卡券发放记录服务接口
+     * */
     private SendLogService sendLogService;
     private SendLogService sendLogService;
 
 
-    @Resource
+    /**
+     * 短信发送服务接口
+     * */
     private SendSmsService sendSmsService;
     private SendSmsService sendSmsService;
 
 
-    @Autowired
+    /**
+     * 系统环境变量
+     * */
     private Environment env;
     private Environment env;
 
 
     /**
     /**

+ 21 - 13
fuint-application/src/main/java/com/fuint/common/service/impl/CouponServiceImpl.java

@@ -23,14 +23,15 @@ import com.fuint.repository.model.*;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
+import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.text.SimpleDateFormat;
@@ -43,42 +44,49 @@ import java.util.*;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor(onConstructor_= {@Lazy})
 public class CouponServiceImpl extends ServiceImpl<MtCouponMapper, MtCoupon> implements CouponService {
 public class CouponServiceImpl extends ServiceImpl<MtCouponMapper, MtCoupon> implements CouponService {
 
 
-    @Resource
     private MtCouponMapper mtCouponMapper;
     private MtCouponMapper mtCouponMapper;
 
 
-    @Resource
     private MtUserCouponMapper mtUserCouponMapper;
     private MtUserCouponMapper mtUserCouponMapper;
 
 
-    @Resource
     private MtConfirmLogMapper mtConfirmLogMapper;
     private MtConfirmLogMapper mtConfirmLogMapper;
 
 
-    @Resource
     private MtSendLogMapper mtSendLogMapper;
     private MtSendLogMapper mtSendLogMapper;
 
 
-    @Resource
     private MtStoreMapper mtStoreMapper;
     private MtStoreMapper mtStoreMapper;
 
 
-    @Resource
     private MtCouponGoodsMapper mtCouponGoodsMapper;
     private MtCouponGoodsMapper mtCouponGoodsMapper;
 
 
-    @Autowired
+    /**
+     * 会员卡券服务接口
+     * */
     private UserCouponService userCouponService;
     private UserCouponService userCouponService;
 
 
-    @Autowired
+    /**
+     * 会员服务接口
+     * */
     private MemberService memberService;
     private MemberService memberService;
 
 
-    @Autowired
+    /**
+     * 短信发送服务接口
+     * */
     private SendSmsService sendSmsService;
     private SendSmsService sendSmsService;
 
 
-    @Autowired
+    /**
+     * 核销记录服务接口
+     * */
     private ConfirmLogService confirmLogService;
     private ConfirmLogService confirmLogService;
 
 
-    @Autowired
+    /**
+     * 系统配置服务接口
+     * */
     private SettingService settingService;
     private SettingService settingService;
 
 
-    @Autowired
+    /**
+     * 微信相关服务接口
+     * */
     private WeixinService weixinService;
     private WeixinService weixinService;
 
 
     /**
     /**

+ 2 - 3
fuint-application/src/main/java/com/fuint/common/service/impl/DutyServiceImpl.java

@@ -21,12 +21,12 @@ import com.fuint.utils.ArrayUtil;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
+import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
@@ -37,12 +37,11 @@ import java.util.List;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class DutyServiceImpl extends ServiceImpl<TDutyMapper, TDuty> implements DutyService {
 public class DutyServiceImpl extends ServiceImpl<TDutyMapper, TDuty> implements DutyService {
 
 
-    @Resource
     private TDutyMapper tDutyMapper;
     private TDutyMapper tDutyMapper;
 
 
-    @Resource
     private TDutySourceMapper tDutySourceMapper;
     private TDutySourceMapper tDutySourceMapper;
 
 
     @Override
     @Override

+ 21 - 15
fuint-application/src/main/java/com/fuint/common/service/impl/GiveServiceImpl.java

@@ -19,15 +19,13 @@ import com.fuint.repository.model.*;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
+import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.*;
 
 
@@ -38,30 +36,38 @@ import java.util.*;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class GiveServiceImpl extends ServiceImpl<MtGiveMapper, MtGive> implements GiveService {
 public class GiveServiceImpl extends ServiceImpl<MtGiveMapper, MtGive> implements GiveService {
 
 
-    @Resource
     private MtGiveMapper mtGiveMapper;
     private MtGiveMapper mtGiveMapper;
 
 
-    @Autowired
+    private MtUserCouponMapper mtUserCouponMapper;
+
+    private MtGiveItemMapper mtGiveItemMapper;
+
+    /**
+     * 会员服务接口
+     * */
     private MemberService memberService;
     private MemberService memberService;
 
 
-    @Autowired
+    /**
+     * 会员等级服务接口
+     * */
     private UserGradeService userGradeService;
     private UserGradeService userGradeService;
 
 
-    @Autowired
+    /**
+     * 短信发送服务接口
+     * */
     private SendSmsService sendSmsService;
     private SendSmsService sendSmsService;
 
 
-    @Resource
-    private MtUserCouponMapper mtUserCouponMapper;
-
-    @Resource
-    private MtGiveItemMapper mtGiveItemMapper;
-
-    @Autowired
+    /**
+     * 卡券服务接口
+     * */
     private CouponService couponService;
     private CouponService couponService;
 
 
-    @Autowired
+    /**
+     * 卡券分组服务接口
+     * */
     private CouponGroupService couponGroupService;
     private CouponGroupService couponGroupService;
 
 
     /**
     /**

+ 11 - 9
fuint-application/src/main/java/com/fuint/common/service/impl/GoodsServiceImpl.java

@@ -27,15 +27,13 @@ import com.fuint.repository.model.*;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
+import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.*;
 
 
@@ -46,24 +44,28 @@ import java.util.*;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class GoodsServiceImpl extends ServiceImpl<MtGoodsMapper, MtGoods> implements GoodsService {
 public class GoodsServiceImpl extends ServiceImpl<MtGoodsMapper, MtGoods> implements GoodsService {
 
 
-    @Resource
     private MtGoodsMapper mtGoodsMapper;
     private MtGoodsMapper mtGoodsMapper;
 
 
-    @Resource
     private MtGoodsSpecMapper mtGoodsSpecMapper;
     private MtGoodsSpecMapper mtGoodsSpecMapper;
 
 
-    @Resource
     private MtGoodsSkuMapper mtGoodsSkuMapper;
     private MtGoodsSkuMapper mtGoodsSkuMapper;
 
 
-    @Autowired
+    /**
+     * 系统设置服务接口
+     * */
     private SettingService settingService;
     private SettingService settingService;
 
 
-    @Autowired
+    /**
+     * 商品分类服务接口
+     * */
     private CateService cateService;
     private CateService cateService;
 
 
-    @Autowired
+    /**
+     * 店铺服务接口
+     * */
     private StoreService storeService;
     private StoreService storeService;
 
 
     /**
     /**

+ 4 - 4
fuint-application/src/main/java/com/fuint/common/service/impl/MemberGroupServiceImpl.java

@@ -16,6 +16,7 @@ import com.fuint.repository.mapper.MtUserGroupMapper;
 import com.fuint.repository.model.*;
 import com.fuint.repository.model.*;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
+import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
@@ -24,7 +25,6 @@ import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
 import java.lang.String;
 import java.lang.String;
 import java.util.*;
 import java.util.*;
 
 
@@ -35,11 +35,11 @@ import java.util.*;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class MemberGroupServiceImpl extends ServiceImpl<MtUserGroupMapper, MtUserGroup> implements MemberGroupService {
 public class MemberGroupServiceImpl extends ServiceImpl<MtUserGroupMapper, MtUserGroup> implements MemberGroupService {
 
 
-    private static final Logger log = LoggerFactory.getLogger(CouponGroupServiceImpl.class);
+    private static final Logger logger = LoggerFactory.getLogger(CouponGroupServiceImpl.class);
 
 
-    @Resource
     private MtUserGroupMapper mtUserGroupMapper;
     private MtUserGroupMapper mtUserGroupMapper;
 
 
     /**
     /**
@@ -166,7 +166,7 @@ public class MemberGroupServiceImpl extends ServiceImpl<MtUserGroupMapper, MtUse
     public MtUserGroup updateMemberGroup(MemberGroupDto memberGroupDto) throws BusinessCheckException {
     public MtUserGroup updateMemberGroup(MemberGroupDto memberGroupDto) throws BusinessCheckException {
         MtUserGroup userGroup = queryMemberGroupById(memberGroupDto.getId());
         MtUserGroup userGroup = queryMemberGroupById(memberGroupDto.getId());
         if (null == userGroup || StatusEnum.DISABLE.getKey().equalsIgnoreCase(userGroup.getStatus())) {
         if (null == userGroup || StatusEnum.DISABLE.getKey().equalsIgnoreCase(userGroup.getStatus())) {
-            log.error("该分组不存在或已被删除");
+            logger.error("该分组不存在或已被删除");
             throw new BusinessCheckException("该分组不存在或已被删除");
             throw new BusinessCheckException("该分组不存在或已被删除");
         }
         }
         if (memberGroupDto.getName() != null) {
         if (memberGroupDto.getName() != null) {

+ 3 - 11
fuint-application/src/main/java/com/fuint/common/service/impl/MemberServiceImpl.java

@@ -26,13 +26,14 @@ import com.fuint.repository.model.*;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
+import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.*;
@@ -44,57 +45,48 @@ import java.util.*;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor(onConstructor_= {@Lazy})
 public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> implements MemberService {
 public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> implements MemberService {
 
 
-    @Resource
     private MtUserMapper mtUserMapper;
     private MtUserMapper mtUserMapper;
 
 
-    @Resource
     private MtUserGradeMapper mtUserGradeMapper;
     private MtUserGradeMapper mtUserGradeMapper;
 
 
-    @Resource
     private MtUserActionMapper mtUserActionMapper;
     private MtUserActionMapper mtUserActionMapper;
 
 
     /**
     /**
      * 短信发送接口
      * 短信发送接口
      */
      */
-    @Resource
     private SendSmsService sendSmsService;
     private SendSmsService sendSmsService;
 
 
     /**
     /**
      * 会员等级接口
      * 会员等级接口
      * */
      * */
-    @Resource
     private UserGradeService userGradeService;
     private UserGradeService userGradeService;
 
 
     /**
     /**
      * 会员等级接口
      * 会员等级接口
      * */
      * */
-    @Resource
     private OpenGiftService openGiftService;
     private OpenGiftService openGiftService;
 
 
     /**
     /**
      * 后台账户服务接口
      * 后台账户服务接口
      */
      */
-    @Resource
     private AccountService accountService;
     private AccountService accountService;
 
 
     /**
     /**
      * 员工接口
      * 员工接口
      */
      */
-    @Resource
     private StaffService staffService;
     private StaffService staffService;
 
 
     /**
     /**
      * 店铺接口
      * 店铺接口
      */
      */
-    @Resource
     private StoreService storeService;
     private StoreService storeService;
 
 
     /**
     /**
      * 会员行为接口
      * 会员行为接口
      */
      */
-    @Resource
     private UserActionService userActionService;
     private UserActionService userActionService;
 
 
     /**
     /**

+ 2 - 3
fuint-application/src/main/java/com/fuint/common/service/impl/MerchantServiceImpl.java

@@ -17,12 +17,12 @@ import com.fuint.repository.model.MtStore;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
+import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
 import java.util.*;
 import java.util.*;
 
 
 /**
 /**
@@ -32,12 +32,11 @@ import java.util.*;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class MerchantServiceImpl extends ServiceImpl<MtMerchantMapper, MtMerchant> implements MerchantService {
 public class MerchantServiceImpl extends ServiceImpl<MtMerchantMapper, MtMerchant> implements MerchantService {
 
 
-    @Resource
     private MtMerchantMapper mtMerchantMapper;
     private MtMerchantMapper mtMerchantMapper;
 
 
-    @Resource
     private MtStoreMapper mtStoreMapper;
     private MtStoreMapper mtStoreMapper;
 
 
     /**
     /**

+ 2 - 3
fuint-application/src/main/java/com/fuint/common/service/impl/MessageServiceImpl.java

@@ -8,10 +8,9 @@ import com.fuint.common.service.MessageService;
 import com.fuint.repository.mapper.MtMessageMapper;
 import com.fuint.repository.mapper.MtMessageMapper;
 import com.fuint.repository.model.MtMessage;
 import com.fuint.repository.model.MtMessage;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
@@ -22,9 +21,9 @@ import java.util.List;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class MessageServiceImpl extends ServiceImpl<MtMessageMapper, MtMessage> implements MessageService {
 public class MessageServiceImpl extends ServiceImpl<MtMessageMapper, MtMessage> implements MessageService {
 
 
-    @Resource
     private MtMessageMapper messageRepository;
     private MtMessageMapper messageRepository;
 
 
     /**
     /**

+ 18 - 11
fuint-application/src/main/java/com/fuint/common/service/impl/OpenGiftServiceImpl.java

@@ -21,14 +21,12 @@ import com.fuint.repository.model.*;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
+import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.*;
 
 
@@ -39,32 +37,41 @@ import java.util.*;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class OpenGiftServiceImpl extends ServiceImpl<MtOpenGiftMapper, MtOpenGift> implements OpenGiftService {
 public class OpenGiftServiceImpl extends ServiceImpl<MtOpenGiftMapper, MtOpenGift> implements OpenGiftService {
 
 
-    @Resource
     private MtOpenGiftMapper mtOpenGiftMapper;
     private MtOpenGiftMapper mtOpenGiftMapper;
 
 
-    @Resource
     private MtUserMapper mtUserMapper;
     private MtUserMapper mtUserMapper;
 
 
-    @Autowired
+    /**
+     * 卡券服务接口
+     * */
     private CouponService couponService;
     private CouponService couponService;
 
 
-    @Autowired
+    /**
+     * 会员卡券服务接口
+     * */
     private UserCouponService userCouponService;
     private UserCouponService userCouponService;
 
 
-    @Autowired
+    /**
+     * 会员等级服务接口
+     * */
     private UserGradeService userGradeService;
     private UserGradeService userGradeService;
 
 
-    @Autowired
+    /**
+     * 会员积分服务接口
+     * */
     private PointService pointService;
     private PointService pointService;
 
 
-    @Autowired
+    /**
+     * 系统消息服务接口
+     * */
     private MessageService messageService;
     private MessageService messageService;
 
 
     /**
     /**
      * 获取开卡赠礼列表
      * 获取开卡赠礼列表
-     * @param paramMap
+     * @param  paramMap
      * @throws BusinessCheckException
      * @throws BusinessCheckException
      * */
      * */
     @Override
     @Override

+ 60 - 31
fuint-application/src/main/java/com/fuint/common/service/impl/OrderServiceImpl.java

@@ -24,16 +24,16 @@ import com.fuint.utils.PropertiesUtil;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
+import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.*;
@@ -45,95 +45,124 @@ import java.util.*;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor(onConstructor_= {@Lazy})
 public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implements OrderService {
 public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implements OrderService {
 
 
     private static final Logger logger = LoggerFactory.getLogger(OrderServiceImpl.class);
     private static final Logger logger = LoggerFactory.getLogger(OrderServiceImpl.class);
 
 
-    @Resource
     private MtOrderMapper mtOrderMapper;
     private MtOrderMapper mtOrderMapper;
 
 
-    @Resource
     private MtGoodsMapper mtGoodsMapper;
     private MtGoodsMapper mtGoodsMapper;
 
 
-    @Resource
     private MtOrderGoodsMapper mtOrderGoodsMapper;
     private MtOrderGoodsMapper mtOrderGoodsMapper;
 
 
-    @Resource
     private MtCartMapper mtCartMapper;
     private MtCartMapper mtCartMapper;
 
 
-    @Resource
     private MtOrderAddressMapper mtOrderAddressMapper;
     private MtOrderAddressMapper mtOrderAddressMapper;
 
 
-    @Resource
     private MtConfirmLogMapper mtConfirmLogMapper;
     private MtConfirmLogMapper mtConfirmLogMapper;
 
 
-    @Resource
     private MtUserCouponMapper mtUserCouponMapper;
     private MtUserCouponMapper mtUserCouponMapper;
 
 
-    @Resource
     private MtGoodsSkuMapper mtGoodsSkuMapper;
     private MtGoodsSkuMapper mtGoodsSkuMapper;
 
 
-    @Resource
     private MtRegionMapper mtRegionMapper;
     private MtRegionMapper mtRegionMapper;
 
 
-    @Resource
     private MtUserGradeMapper mtUserGradeMapper;
     private MtUserGradeMapper mtUserGradeMapper;
 
 
-    @Autowired
+    /**
+     * 系统设置服务接口
+     * */
     private SettingService settingService;
     private SettingService settingService;
 
 
-    @Autowired
+    /**
+     * 卡券服务接口
+     * */
     private CouponService couponService;
     private CouponService couponService;
 
 
-    @Autowired
+    /**
+     * 会员卡券服务接口
+     * */
     private UserCouponService userCouponService;
     private UserCouponService userCouponService;
 
 
-    @Autowired
+    /**
+     * 收货地址服务接口
+     * */
     private AddressService addressService;
     private AddressService addressService;
 
 
-    @Autowired
+    /**
+     * 会员服务接口
+     * */
     private MemberService memberService;
     private MemberService memberService;
 
 
-    @Autowired
+    /**
+     * 积分服务接口
+     * */
     private PointService pointService;
     private PointService pointService;
 
 
-    @Autowired
+    /**
+     * 购物车服务接口
+     * */
     private CartService cartService;
     private CartService cartService;
 
 
-    @Autowired
+    /**
+     * 商品服务接口
+     * */
     private GoodsService goodsService;
     private GoodsService goodsService;
 
 
-    @Autowired
+    /**
+     * 店铺服务接口
+     * */
     private StoreService storeService;
     private StoreService storeService;
 
 
-    @Autowired
+    /**
+     * 会员等级服务接口
+     * */
     UserGradeService userGradeService;
     UserGradeService userGradeService;
 
 
-    @Autowired
+    /**
+     * 售后服务接口
+     * */
     private RefundService refundService;
     private RefundService refundService;
 
 
-    @Autowired
+    /**
+     * 余额服务接口
+     * */
     private BalanceService balanceService;
     private BalanceService balanceService;
 
 
-    @Autowired
+    /**
+     * 微信相关服务接口
+     * */
     private WeixinService weixinService;
     private WeixinService weixinService;
 
 
-    @Autowired
+    /**
+     * 支付宝服务接口
+     * */
     private AlipayService alipayService;
     private AlipayService alipayService;
 
 
-    @Autowired
+    /**
+     * 短信发送服务接口
+     * */
     private SendSmsService sendSmsService;
     private SendSmsService sendSmsService;
 
 
-    @Autowired
+    /**
+     * 开卡赠礼服务接口
+     * */
     private OpenGiftService openGiftService;
     private OpenGiftService openGiftService;
 
 
-    @Autowired
+    /**
+     * 商户服务接口
+     * */
     private MerchantService merchantService;
     private MerchantService merchantService;
 
 
-    @Autowired
+    /**
+     * 店铺员工服务接口
+     * */
     private StaffService staffService;
     private StaffService staffService;
 
 
-    @Autowired
+    /**
+     * 支付服务接口
+     * */
     private PaymentService paymentService;
     private PaymentService paymentService;
 
 
     /**
     /**

+ 3 - 10
fuint-application/src/main/java/com/fuint/common/service/impl/PaymentServiceImpl.java

@@ -10,12 +10,12 @@ import com.fuint.framework.web.ResponseObject;
 import com.fuint.repository.mapper.MtOrderMapper;
 import com.fuint.repository.mapper.MtOrderMapper;
 import com.fuint.repository.model.*;
 import com.fuint.repository.model.*;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
+import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.Date;
@@ -29,53 +29,46 @@ import java.util.Map;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor(onConstructor_= {@Lazy})
 public class PaymentServiceImpl implements PaymentService {
 public class PaymentServiceImpl implements PaymentService {
 
 
     private static final Logger logger = LoggerFactory.getLogger(PaymentServiceImpl.class);
     private static final Logger logger = LoggerFactory.getLogger(PaymentServiceImpl.class);
 
 
-    @Resource
     private MtOrderMapper mtOrderMapper;
     private MtOrderMapper mtOrderMapper;
 
 
     /**
     /**
      * 微信服务接口
      * 微信服务接口
      * */
      * */
-    @Autowired
     private WeixinService weixinService;
     private WeixinService weixinService;
 
 
     /**
     /**
      * 支付宝服务接口
      * 支付宝服务接口
      * */
      * */
-    @Autowired
     private AlipayService alipayService;
     private AlipayService alipayService;
 
 
     /**
     /**
      * 会员服务接口
      * 会员服务接口
      * */
      * */
-    @Autowired
     private MemberService memberService;
     private MemberService memberService;
 
 
     /**
     /**
      * 订单服务接口
      * 订单服务接口
      * */
      * */
-    @Autowired
     private OrderService orderService;
     private OrderService orderService;
 
 
     /**
     /**
      * 余额服务接口
      * 余额服务接口
      * */
      * */
-    @Autowired
     private BalanceService balanceService;
     private BalanceService balanceService;
 
 
     /**
     /**
      * 会员卡券服务接口
      * 会员卡券服务接口
      * */
      * */
-    @Autowired
     private UserCouponService userCouponService;
     private UserCouponService userCouponService;
 
 
     /**
     /**
      * 开卡赠礼服务接口
      * 开卡赠礼服务接口
      * */
      * */
-    @Autowired
     private OpenGiftService openGiftService;
     private OpenGiftService openGiftService;
 
 
     /**
     /**

+ 8 - 7
fuint-application/src/main/java/com/fuint/common/service/impl/PointServiceImpl.java

@@ -20,15 +20,13 @@ import com.fuint.repository.model.MtPoint;
 import com.fuint.repository.model.MtUser;
 import com.fuint.repository.model.MtUser;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
+import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
 import java.util.*;
 import java.util.*;
 
 
 /**
 /**
@@ -38,18 +36,21 @@ import java.util.*;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class PointServiceImpl extends ServiceImpl<MtPointMapper, MtPoint> implements PointService {
 public class PointServiceImpl extends ServiceImpl<MtPointMapper, MtPoint> implements PointService {
 
 
-    @Resource
     private MtPointMapper mtPointMapper;
     private MtPointMapper mtPointMapper;
 
 
-    @Resource
     private MtUserMapper mtUserMapper;
     private MtUserMapper mtUserMapper;
 
 
-    @Autowired
+    /**
+     * 会员服务接口
+     * */
     private MemberService memberService;
     private MemberService memberService;
 
 
-    @Autowired
+    /**
+     * 微信相关服务接口
+     * */
     private WeixinService weixinService;
     private WeixinService weixinService;
 
 
     /**
     /**

+ 2 - 15
fuint-application/src/main/java/com/fuint/common/service/impl/RefundServiceImpl.java

@@ -18,16 +18,15 @@ import com.fuint.repository.model.*;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
+import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.*;
 
 
@@ -38,65 +37,53 @@ import java.util.*;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class RefundServiceImpl extends ServiceImpl<MtRefundMapper, MtRefund> implements RefundService {
 public class RefundServiceImpl extends ServiceImpl<MtRefundMapper, MtRefund> implements RefundService {
 
 
     private static final Logger logger = LoggerFactory.getLogger(RefundServiceImpl.class);
     private static final Logger logger = LoggerFactory.getLogger(RefundServiceImpl.class);
 
 
-    @Resource
     private MtPointMapper mtPointMapper;
     private MtPointMapper mtPointMapper;
 
 
-    @Resource
     private MtRefundMapper mtRefundMapper;
     private MtRefundMapper mtRefundMapper;
 
 
-    @Resource
     private MtConfirmLogMapper mtConfirmLogMapper;
     private MtConfirmLogMapper mtConfirmLogMapper;
 
 
-    @Resource
     private MtUserCouponMapper mtUserCouponMapper;
     private MtUserCouponMapper mtUserCouponMapper;
 
 
-    @Resource
     private MtGoodsSkuMapper mtGoodsSkuMapper;
     private MtGoodsSkuMapper mtGoodsSkuMapper;
 
 
-    @Resource
     private MtGoodsMapper mtGoodsMapper;
     private MtGoodsMapper mtGoodsMapper;
 
 
-    @Resource
     private MtOrderGoodsMapper mtOrderGoodsMapper;
     private MtOrderGoodsMapper mtOrderGoodsMapper;
 
 
     /**
     /**
      * 卡券接口
      * 卡券接口
      * */
      * */
-    @Autowired
     private CouponService couponService;
     private CouponService couponService;
 
 
     /**
     /**
      * 积分相关接口
      * 积分相关接口
      * */
      * */
-    @Autowired
     private PointService pointService;
     private PointService pointService;
 
 
     /**
     /**
      * 订单服务接口
      * 订单服务接口
      * */
      * */
-    @Autowired
     private OrderService orderService;
     private OrderService orderService;
 
 
     /**
     /**
      * 余额服务接口
      * 余额服务接口
      * */
      * */
-    @Autowired
     private BalanceService balanceService;
     private BalanceService balanceService;
 
 
     /**
     /**
      * 微信服务接口
      * 微信服务接口
      * */
      * */
-    @Autowired
     private WeixinService weixinService;
     private WeixinService weixinService;
 
 
     /**
     /**
      * 支付宝服务接口
      * 支付宝服务接口
      * */
      * */
-    @Autowired
     private AlipayService alipayService;
     private AlipayService alipayService;
 
 
     /**
     /**

+ 2 - 3
fuint-application/src/main/java/com/fuint/common/service/impl/SendLogServiceImpl.java

@@ -13,12 +13,11 @@ import com.fuint.repository.mapper.MtSendLogMapper;
 import com.fuint.repository.model.MtSendLog;
 import com.fuint.repository.model.MtSendLog;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
+import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
@@ -29,9 +28,9 @@ import java.util.List;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class SendLogServiceImpl extends ServiceImpl<MtSendLogMapper, MtSendLog> implements SendLogService {
 public class SendLogServiceImpl extends ServiceImpl<MtSendLogMapper, MtSendLog> implements SendLogService {
 
 
-    @Resource
     private MtSendLogMapper mtSendLogMapper;
     private MtSendLogMapper mtSendLogMapper;
 
 
     /**
     /**

+ 8 - 6
fuint-application/src/main/java/com/fuint/common/service/impl/SendSmsServiceImpl.java

@@ -16,10 +16,10 @@ import com.fuint.repository.model.MtSmsTemplate;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
+import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.Environment;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
@@ -34,8 +34,6 @@ import com.aliyuncs.http.MethodType;
 import com.aliyuncs.profile.DefaultProfile;
 import com.aliyuncs.profile.DefaultProfile;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.CollectionUtils;
-
-import javax.annotation.Resource;
 import java.util.*;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
@@ -46,17 +44,21 @@ import java.util.stream.Collectors;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class SendSmsServiceImpl implements SendSmsService {
 public class SendSmsServiceImpl implements SendSmsService {
 
 
      private static final Logger logger = LoggerFactory.getLogger(SendSmsServiceImpl.class);
      private static final Logger logger = LoggerFactory.getLogger(SendSmsServiceImpl.class);
 
 
-     @Autowired
+     /**
+      * 系统环境变量
+      * */
      private Environment env;
      private Environment env;
 
 
-     @Resource
      private MtSmsSendedLogMapper mtSmsSendedLogMapper;
      private MtSmsSendedLogMapper mtSmsSendedLogMapper;
 
 
-     @Autowired
+     /**
+      * 短信模板服务接口
+      * */
      private SmsTemplateService smsTemplateService;
      private SmsTemplateService smsTemplateService;
 
 
     @Override
     @Override

+ 5 - 5
fuint-application/src/main/java/com/fuint/common/service/impl/SettingServiceImpl.java

@@ -11,12 +11,10 @@ import com.fuint.common.enums.StatusEnum;
 import com.fuint.common.service.SettingService;
 import com.fuint.common.service.SettingService;
 import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;
@@ -28,12 +26,14 @@ import java.util.List;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class SettingServiceImpl extends ServiceImpl<MtSettingMapper, MtSetting> implements SettingService {
 public class SettingServiceImpl extends ServiceImpl<MtSettingMapper, MtSetting> implements SettingService {
 
 
-    @Autowired
+    /**
+     * 系统环境变量
+     * */
     private Environment env;
     private Environment env;
 
 
-    @Resource
     private MtSettingMapper mtSettingMapper;
     private MtSettingMapper mtSettingMapper;
 
 
     /**
     /**

+ 8 - 6
fuint-application/src/main/java/com/fuint/common/service/impl/SettlementServiceImpl.java

@@ -25,14 +25,13 @@ import com.fuint.repository.model.MtSettlement;
 import com.fuint.repository.model.MtSettlementOrder;
 import com.fuint.repository.model.MtSettlementOrder;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
+import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.*;
 
 
@@ -43,18 +42,16 @@ import java.util.*;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class SettlementServiceImpl implements SettlementService {
 public class SettlementServiceImpl implements SettlementService {
 
 
-    @Resource
     private MtSettlementMapper mtSettlementMapper;
     private MtSettlementMapper mtSettlementMapper;
 
 
-    @Resource
     private MtSettlementOrderMapper mtSettlementOrderMapper;
     private MtSettlementOrderMapper mtSettlementOrderMapper;
 
 
     /**
     /**
      * 订单服务接口
      * 订单服务接口
      * */
      * */
-    @Autowired
     private OrderService orderService;
     private OrderService orderService;
 
 
     /**
     /**
@@ -111,14 +108,19 @@ public class SettlementServiceImpl implements SettlementService {
         OrderListParam orderParam = new OrderListParam();
         OrderListParam orderParam = new OrderListParam();
         orderParam.setMerchantId(requestParam.getMerchantId());
         orderParam.setMerchantId(requestParam.getMerchantId());
         orderParam.setStoreId(requestParam.getStoreId());
         orderParam.setStoreId(requestParam.getStoreId());
-        orderParam.setPayStatus(PayStatusEnum.SUCCESS.getKey());
+        orderParam.setDataType("paid");
         orderParam.setStartTime(requestParam.getStartTime());
         orderParam.setStartTime(requestParam.getStartTime());
         orderParam.setEndTime(requestParam.getEndTime());
         orderParam.setEndTime(requestParam.getEndTime());
+        orderParam.setSettleStatus(SettleStatusEnum.WAIT.getKey());
         orderParam.setPage(1);
         orderParam.setPage(1);
         orderParam.setPageSize(100000);
         orderParam.setPageSize(100000);
 
 
         PaginationResponse response = orderService.getUserOrderList(orderParam);
         PaginationResponse response = orderService.getUserOrderList(orderParam);
         List<UserOrderDto> orderList = response.getContent();
         List<UserOrderDto> orderList = response.getContent();
+        if (orderList == null || orderList.size() < 1) {
+            throw new BusinessCheckException("暂无符合结算条件的订单");
+        }
+
         BigDecimal amount = new BigDecimal("0");
         BigDecimal amount = new BigDecimal("0");
         BigDecimal totalOrderAmount = new BigDecimal("0");
         BigDecimal totalOrderAmount = new BigDecimal("0");
         if (orderList != null && orderList.size() > 0) {
         if (orderList != null && orderList.size() > 0) {

+ 4 - 4
fuint-application/src/main/java/com/fuint/common/service/impl/SmsTemplateServiceImpl.java

@@ -14,13 +14,12 @@ import com.fuint.repository.mapper.MtSmsTemplateMapper;
 import com.fuint.repository.model.MtSmsTemplate;
 import com.fuint.repository.model.MtSmsTemplate;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
+import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
 import java.util.Date;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
@@ -33,9 +32,9 @@ import java.util.Map;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class SmsTemplateServiceImpl extends ServiceImpl<MtSmsTemplateMapper, MtSmsTemplate> implements SmsTemplateService {
 public class SmsTemplateServiceImpl extends ServiceImpl<MtSmsTemplateMapper, MtSmsTemplate> implements SmsTemplateService {
 
 
-    @Resource
     private MtSmsTemplateMapper mtSmsTemplateMapper;
     private MtSmsTemplateMapper mtSmsTemplateMapper;
 
 
     /**
     /**
@@ -88,6 +87,7 @@ public class SmsTemplateServiceImpl extends ServiceImpl<MtSmsTemplateMapper, MtS
      * 保存模板信息
      * 保存模板信息
      *
      *
      * @param mtSmsTemplateDto
      * @param mtSmsTemplateDto
+     * @return
      */
      */
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
@@ -123,7 +123,7 @@ public class SmsTemplateServiceImpl extends ServiceImpl<MtSmsTemplateMapper, MtS
     /**
     /**
      * 根据ID删除数据
      * 根据ID删除数据
      *
      *
-     * @param id       模板ID
+     * @param id 模板ID
      * @param operator 操作人
      * @param operator 操作人
      */
      */
     @Override
     @Override

+ 2 - 2
fuint-application/src/main/java/com/fuint/common/service/impl/SourceServiceImpl.java

@@ -13,9 +13,9 @@ import com.fuint.common.domain.TreeNode;
 import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.utils.ArrayUtil;
 import com.fuint.utils.ArrayUtil;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
 import java.util.*;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
@@ -26,9 +26,9 @@ import java.util.stream.Collectors;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class SourceServiceImpl extends ServiceImpl<TSourceMapper, TSource> implements SourceService {
 public class SourceServiceImpl extends ServiceImpl<TSourceMapper, TSource> implements SourceService {
 
 
-    @Resource
     private TSourceMapper tSourceMapper;
     private TSourceMapper tSourceMapper;
 
 
     /**
     /**

+ 2 - 8
fuint-application/src/main/java/com/fuint/common/service/impl/StaffServiceImpl.java

@@ -19,14 +19,11 @@ import com.fuint.repository.model.MtUser;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
+import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
 import java.util.*;
 import java.util.*;
 
 
 /**
 /**
@@ -36,27 +33,24 @@ import java.util.*;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class StaffServiceImpl extends ServiceImpl<MtStaffMapper, MtStaff> implements StaffService {
 public class StaffServiceImpl extends ServiceImpl<MtStaffMapper, MtStaff> implements StaffService {
 
 
-    @Resource
     private MtStaffMapper mtStaffMapper;
     private MtStaffMapper mtStaffMapper;
 
 
     /**
     /**
      * 会员服务接口
      * 会员服务接口
      */
      */
-    @Autowired
     private MemberService memberService;
     private MemberService memberService;
 
 
     /**
     /**
      * 短信发送接口
      * 短信发送接口
      */
      */
-    @Autowired
     private SendSmsService sendSmsService;
     private SendSmsService sendSmsService;
 
 
     /**
     /**
      * 店铺接口
      * 店铺接口
      */
      */
-    @Autowired
     private StoreService storeService;
     private StoreService storeService;
 
 
     /**
     /**

+ 2 - 5
fuint-application/src/main/java/com/fuint/common/service/impl/StockServiceImpl.java

@@ -16,12 +16,12 @@ import com.fuint.repository.model.*;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
+import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
 import java.util.*;
 import java.util.*;
 
 
 /**
 /**
@@ -31,18 +31,15 @@ import java.util.*;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class StockServiceImpl extends ServiceImpl<MtStockMapper, MtStock> implements StockService {
 public class StockServiceImpl extends ServiceImpl<MtStockMapper, MtStock> implements StockService {
 
 
-    @Resource
     private MtStockMapper mtStockMapper;
     private MtStockMapper mtStockMapper;
 
 
-    @Resource
     private MtStockItemMapper mtStockItemMapper;
     private MtStockItemMapper mtStockItemMapper;
 
 
-    @Resource
     private MtGoodsMapper mtGoodsMapper;
     private MtGoodsMapper mtGoodsMapper;
 
 
-    @Resource
     private MtGoodsSkuMapper mtGoodsSkuMapper;
     private MtGoodsSkuMapper mtGoodsSkuMapper;
 
 
     /**
     /**

+ 2 - 6
fuint-application/src/main/java/com/fuint/common/service/impl/StoreServiceImpl.java

@@ -21,14 +21,13 @@ import com.fuint.repository.model.MtStore;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
+import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.*;
 
 
@@ -39,24 +38,21 @@ import java.util.*;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class StoreServiceImpl extends ServiceImpl<MtStoreMapper, MtStore> implements StoreService {
 public class StoreServiceImpl extends ServiceImpl<MtStoreMapper, MtStore> implements StoreService {
 
 
-    @Resource
     private MtStoreMapper mtStoreMapper;
     private MtStoreMapper mtStoreMapper;
 
 
-    @Resource
     private MtMerchantMapper mtMerchantMapper;
     private MtMerchantMapper mtMerchantMapper;
 
 
     /**
     /**
      * 商户接口
      * 商户接口
      */
      */
-    @Autowired
     private MerchantService merchantService;
     private MerchantService merchantService;
 
 
     /**
     /**
      * 微信服务接口
      * 微信服务接口
      * */
      * */
-    @Autowired
     private WeixinService weixinService;
     private WeixinService weixinService;
 
 
     /**
     /**

+ 2 - 3
fuint-application/src/main/java/com/fuint/common/service/impl/UserActionServiceImpl.java

@@ -11,12 +11,11 @@ import com.fuint.repository.mapper.MtUserActionMapper;
 import com.fuint.repository.model.MtUserAction;
 import com.fuint.repository.model.MtUserAction;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
+import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
 import java.util.Date;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
@@ -29,9 +28,9 @@ import java.util.Map;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class UserActionServiceImpl extends ServiceImpl<MtUserActionMapper, MtUserAction> implements UserActionService {
 public class UserActionServiceImpl extends ServiceImpl<MtUserActionMapper, MtUserAction> implements UserActionService {
 
 
-    @Resource
     private MtUserActionMapper mtUserActionMapper;
     private MtUserActionMapper mtUserActionMapper;
 
 
     /**
     /**

+ 27 - 11
fuint-application/src/main/java/com/fuint/common/service/impl/UserCouponServiceImpl.java

@@ -21,14 +21,14 @@ import com.fuint.repository.model.*;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
+import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.*;
 
 
@@ -39,33 +39,49 @@ import java.util.*;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor(onConstructor_= {@Lazy})
 public class UserCouponServiceImpl extends ServiceImpl<MtUserCouponMapper, MtUserCoupon> implements UserCouponService {
 public class UserCouponServiceImpl extends ServiceImpl<MtUserCouponMapper, MtUserCoupon> implements UserCouponService {
 
 
-    @Resource
     private MtUserCouponMapper mtUserCouponMapper;
     private MtUserCouponMapper mtUserCouponMapper;
 
 
-    @Autowired
+    /**
+     * 卡券服务接口
+     * */
     private CouponService couponService;
     private CouponService couponService;
 
 
-    @Autowired
+    /**
+     * 卡券分组服务接口
+     * */
     private CouponGroupService couponGroupService;
     private CouponGroupService couponGroupService;
 
 
-    @Autowired
+    /**
+     * 会员服务接口
+     * */
     private MemberService memberService;
     private MemberService memberService;
 
 
-    @Autowired
+    /**
+     * 积分服务接口
+     * */
     private PointService pointService;
     private PointService pointService;
 
 
-    @Autowired
+    /**
+     * 卡券核销记录服务接口
+     * */
     private ConfirmLogService confirmLogService;
     private ConfirmLogService confirmLogService;
 
 
-    @Autowired
+    /**
+     * 店铺服务接口
+     * */
     private StoreService storeService;
     private StoreService storeService;
 
 
-    @Autowired
+    /**
+     * 系统设置服务接口
+     * */
     private SettingService settingService;
     private SettingService settingService;
 
 
-    @Autowired
+    /**
+     * 订单服务接口
+     * */
     private OrderService orderService;
     private OrderService orderService;
 
 
     /**
     /**

+ 2 - 7
fuint-application/src/main/java/com/fuint/common/service/impl/UserGradeServiceImpl.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fuint.common.enums.StatusEnum;
 import com.fuint.common.enums.StatusEnum;
 import com.fuint.common.enums.UserGradeCatchTypeEnum;
 import com.fuint.common.enums.UserGradeCatchTypeEnum;
-import com.fuint.common.service.MemberService;
 import com.fuint.common.service.UserGradeService;
 import com.fuint.common.service.UserGradeService;
 import com.fuint.framework.annoation.OperationServiceLog;
 import com.fuint.framework.annoation.OperationServiceLog;
 import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.framework.exception.BusinessCheckException;
@@ -19,12 +18,12 @@ import com.fuint.repository.model.MtUser;
 import com.fuint.repository.model.MtUserGrade;
 import com.fuint.repository.model.MtUserGrade;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
+import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
@@ -37,17 +36,13 @@ import java.util.Map;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class UserGradeServiceImpl extends ServiceImpl<MtUserGradeMapper, MtUserGrade> implements UserGradeService {
 public class UserGradeServiceImpl extends ServiceImpl<MtUserGradeMapper, MtUserGrade> implements UserGradeService {
 
 
-    @Resource
     private MtUserGradeMapper mtUserGradeMapper;
     private MtUserGradeMapper mtUserGradeMapper;
 
 
-    @Resource
     private MtStaffMapper mtStaffMapper;
     private MtStaffMapper mtStaffMapper;
 
 
-    @Resource
-    private MemberService memberService;
-
     /**
     /**
      * 分页查询会员等级列表
      * 分页查询会员等级列表
      *
      *

+ 2 - 3
fuint-application/src/main/java/com/fuint/common/service/impl/VerifyCodeServiceImpl.java

@@ -6,9 +6,8 @@ import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.framework.exception.BusinessRuntimeException;
 import com.fuint.framework.exception.BusinessRuntimeException;
 import com.fuint.repository.mapper.MtVerifyCodeMapper;
 import com.fuint.repository.mapper.MtVerifyCodeMapper;
 import com.fuint.repository.model.MtVerifyCode;
 import com.fuint.repository.model.MtVerifyCode;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
 import java.text.ParseException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Date;
@@ -21,9 +20,9 @@ import java.util.List;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class VerifyCodeServiceImpl extends ServiceImpl<MtVerifyCodeMapper, MtVerifyCode> implements VerifyCodeService {
 public class VerifyCodeServiceImpl extends ServiceImpl<MtVerifyCodeMapper, MtVerifyCode> implements VerifyCodeService {
 
 
-    @Resource
     private MtVerifyCodeMapper mtVerifyCodeMapper;
     private MtVerifyCodeMapper mtVerifyCodeMapper;
 
 
     /**
     /**

+ 21 - 17
fuint-application/src/main/java/com/fuint/common/service/impl/WeixinServiceImpl.java

@@ -27,21 +27,14 @@ import com.ijpay.wxpay.model.MicroPayModel;
 import com.ijpay.wxpay.model.OrderQueryModel;
 import com.ijpay.wxpay.model.OrderQueryModel;
 import com.ijpay.wxpay.model.RefundModel;
 import com.ijpay.wxpay.model.RefundModel;
 import com.ijpay.wxpay.model.UnifiedOrderModel;
 import com.ijpay.wxpay.model.UnifiedOrderModel;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.message.BasicHeader;
-import org.apache.http.protocol.HTTP;
+import lombok.AllArgsConstructor;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.Environment;
-import org.springframework.util.ResourceUtils;
 import weixin.popular.util.JsonUtil;
 import weixin.popular.util.JsonUtil;
 
 
 import javax.crypto.Cipher;
 import javax.crypto.Cipher;
@@ -62,32 +55,43 @@ import java.util.*;
  * CopyRight https://www.fuint.cn
  * CopyRight https://www.fuint.cn
  */
  */
 @Service
 @Service
+@AllArgsConstructor(onConstructor_= {@Lazy})
 public class WeixinServiceImpl implements WeixinService {
 public class WeixinServiceImpl implements WeixinService {
 
 
     private static final Logger logger = LoggerFactory.getLogger(WeixinServiceImpl.class);
     private static final Logger logger = LoggerFactory.getLogger(WeixinServiceImpl.class);
 
 
-    @Autowired
+    /**
+     * 订单服务接口
+     * */
     private OrderService orderService;
     private OrderService orderService;
 
 
-    @Autowired
+    /**
+     * 系统设置服务接口
+     * */
     private SettingService settingService;
     private SettingService settingService;
 
 
-    @Autowired
+    /**
+     * 系统消息服务接口
+     * */
     private MessageService messageService;
     private MessageService messageService;
 
 
-    @Autowired
+    /**
+     * 店铺服务接口
+     * */
     private StoreService storeService;
     private StoreService storeService;
 
 
-    @Autowired
+    /**
+     * 支付服务接口
+     * */
     private PaymentService paymentService;
     private PaymentService paymentService;
 
 
-    @Autowired
+    /**
+     * 商户服务接口
+     * */
     private MerchantService merchantService;
     private MerchantService merchantService;
 
 
-    @Autowired
     private Environment env;
     private Environment env;
 
 
-    @Autowired
     WxPayBean wxPayBean;
     WxPayBean wxPayBean;
 
 
     private static final String CALL_BACK_URL = "/clientApi/pay/weixinCallback";
     private static final String CALL_BACK_URL = "/clientApi/pay/weixinCallback";

+ 2 - 5
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendAccountController.java

@@ -23,7 +23,7 @@ import com.fuint.repository.model.TDuty;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
@@ -40,31 +40,28 @@ import java.util.Map;
  */
  */
 @Api(tags="管理端-管理员相关接口")
 @Api(tags="管理端-管理员相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/account")
 @RequestMapping(value = "/backendApi/account")
 public class BackendAccountController extends BaseController {
 public class BackendAccountController extends BaseController {
 
 
     /**
     /**
      * 账户接口
      * 账户接口
      */
      */
-    @Autowired
     private AccountService tAccountService;
     private AccountService tAccountService;
 
 
     /**
     /**
      * 角色接口
      * 角色接口
      */
      */
-    @Autowired
     private DutyService tDutyService;
     private DutyService tDutyService;
 
 
     /**
     /**
      * 店铺接口
      * 店铺接口
      */
      */
-    @Autowired
     private StoreService storeService;
     private StoreService storeService;
 
 
     /**
     /**
      * 商户服务接口
      * 商户服务接口
      */
      */
-    @Autowired
     private MerchantService merchantService;
     private MerchantService merchantService;
 
 
     /**
     /**

+ 2 - 3
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendActionLogController.java

@@ -12,11 +12,10 @@ import com.fuint.repository.model.TActionLog;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map;
@@ -29,10 +28,10 @@ import java.util.Map;
  */
  */
 @Api(tags="管理端-日志相关接口")
 @Api(tags="管理端-日志相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/actlog")
 @RequestMapping(value = "/backendApi/actlog")
 public class BackendActionLogController extends BaseController {
 public class BackendActionLogController extends BaseController {
 
 
-    @Autowired
     private ActionLogService tActionLogService;
     private ActionLogService tActionLogService;
 
 
     /**
     /**

+ 2 - 4
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendArticleController.java

@@ -18,7 +18,7 @@ import com.fuint.repository.model.MtStore;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
@@ -34,25 +34,23 @@ import java.util.Map;
  */
  */
 @Api(tags="管理端-文章相关接口")
 @Api(tags="管理端-文章相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/article")
 @RequestMapping(value = "/backendApi/article")
 public class BackendArticleController extends BaseController {
 public class BackendArticleController extends BaseController {
 
 
     /**
     /**
      * 文章服务接口
      * 文章服务接口
      */
      */
-    @Autowired
     private ArticleService articleService;
     private ArticleService articleService;
 
 
     /**
     /**
      * 系统设置服务接口
      * 系统设置服务接口
      * */
      * */
-    @Autowired
     private SettingService settingService;
     private SettingService settingService;
 
 
     /**
     /**
      * 店铺服务接口
      * 店铺服务接口
      */
      */
-    @Autowired
     private StoreService storeService;
     private StoreService storeService;
 
 
     /**
     /**

+ 2 - 4
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendBalanceController.java

@@ -23,7 +23,7 @@ import com.fuint.repository.model.MtUser;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
@@ -38,25 +38,23 @@ import java.util.*;
  */
  */
 @Api(tags="管理端-余额相关接口")
 @Api(tags="管理端-余额相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/balance")
 @RequestMapping(value = "/backendApi/balance")
 public class BackendBalanceController extends BaseController {
 public class BackendBalanceController extends BaseController {
 
 
     /**
     /**
      * 配置服务接口
      * 配置服务接口
      * */
      * */
-    @Autowired
     private SettingService settingService;
     private SettingService settingService;
 
 
     /**
     /**
      * 余额服务接口
      * 余额服务接口
      * */
      * */
-    @Autowired
     private BalanceService balanceService;
     private BalanceService balanceService;
 
 
     /**
     /**
      * 会员服务接口
      * 会员服务接口
      * */
      * */
-    @Autowired
     private MemberService memberService;
     private MemberService memberService;
 
 
     /**
     /**

+ 2 - 4
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendBannerController.java

@@ -18,7 +18,7 @@ import com.fuint.repository.model.MtStore;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
@@ -34,25 +34,23 @@ import java.util.Map;
  */
  */
 @Api(tags="管理端-焦点图相关接口")
 @Api(tags="管理端-焦点图相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/banner")
 @RequestMapping(value = "/backendApi/banner")
 public class BackendBannerController extends BaseController {
 public class BackendBannerController extends BaseController {
 
 
     /**
     /**
      * 焦点图服务接口
      * 焦点图服务接口
      */
      */
-    @Autowired
     private BannerService bannerService;
     private BannerService bannerService;
 
 
     /**
     /**
      * 系统设置服务接口
      * 系统设置服务接口
      * */
      * */
-    @Autowired
     private SettingService settingService;
     private SettingService settingService;
 
 
     /**
     /**
      * 店铺服务接口
      * 店铺服务接口
      */
      */
-    @Autowired
     private StoreService storeService;
     private StoreService storeService;
 
 
     /**
     /**

+ 3 - 3
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCaptchaController.java

@@ -2,12 +2,12 @@ package com.fuint.module.backendApi.controller;
 
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseBody;
-import javax.annotation.Resource;
 import javax.imageio.ImageIO;
 import javax.imageio.ImageIO;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
@@ -27,17 +27,17 @@ import com.fuint.common.service.CaptchaService;
  */
  */
 @Api(tags="管理端-图形验证码相关接口")
 @Api(tags="管理端-图形验证码相关接口")
 @Controller
 @Controller
+@AllArgsConstructor
 @RequestMapping("/backendApi/captcha")
 @RequestMapping("/backendApi/captcha")
 public class BackendCaptchaController {
 public class BackendCaptchaController {
 
 
     private static final Logger logger = LoggerFactory.getLogger(BackendCaptchaController.class);
     private static final Logger logger = LoggerFactory.getLogger(BackendCaptchaController.class);
 
 
-    @Resource
     private CaptchaService captchaService;
     private CaptchaService captchaService;
 
 
     @ApiOperation(value = "获取图形验证码")
     @ApiOperation(value = "获取图形验证码")
     @RequestMapping(value="/getCode", method = RequestMethod.GET)
     @RequestMapping(value="/getCode", method = RequestMethod.GET)
-    public void getCode(HttpServletResponse response) {
+    public void getCode(HttpServletResponse response) throws Exception {
         // 生成验证码
         // 生成验证码
         String uuid = UUID.randomUUID().toString().replaceAll("-", "");
         String uuid = UUID.randomUUID().toString().replaceAll("-", "");
         BufferedImage codeImage = captchaService.getCodeByUuid(uuid);
         BufferedImage codeImage = captchaService.getCodeByUuid(uuid);

+ 2 - 10
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCashierController.java

@@ -17,8 +17,8 @@ import com.fuint.repository.model.*;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
@@ -37,61 +37,53 @@ import java.util.Map;
  */
  */
 @Api(tags="管理端-收银台相关接口")
 @Api(tags="管理端-收银台相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/cashier")
 @RequestMapping(value = "/backendApi/cashier")
 public class BackendCashierController extends BaseController {
 public class BackendCashierController extends BaseController {
 
 
     /**
     /**
      * 后台账户服务接口
      * 后台账户服务接口
      */
      */
-    @Autowired
     private AccountService accountService;
     private AccountService accountService;
 
 
     /**
     /**
      * 商品类别服务接口
      * 商品类别服务接口
      */
      */
-    @Autowired
     private CateService cateService;
     private CateService cateService;
 
 
     /**
     /**
      * 购物车服务接口
      * 购物车服务接口
      * */
      * */
-    @Autowired
     private CartService cartService;
     private CartService cartService;
 
 
     /**
     /**
      * 订单服务接口
      * 订单服务接口
      * */
      * */
-    @Autowired
     private OrderService orderService;
     private OrderService orderService;
 
 
     /**
     /**
      * 商品服务接口
      * 商品服务接口
      */
      */
-    @Autowired
     private GoodsService goodsService;
     private GoodsService goodsService;
 
 
     /**
     /**
      * 店铺服务接口
      * 店铺服务接口
      */
      */
-    @Autowired
     private StoreService storeService;
     private StoreService storeService;
 
 
     /**
     /**
      * 系统设置服务接口
      * 系统设置服务接口
      */
      */
-    @Autowired
     private SettingService settingService;
     private SettingService settingService;
 
 
     /**
     /**
      * 会员服务接口
      * 会员服务接口
      */
      */
-    @Autowired
     private MemberService memberService;
     private MemberService memberService;
 
 
     /**
     /**
      * 商户接口
      * 商户接口
      */
      */
-    @Autowired
     private MerchantService merchantService;
     private MerchantService merchantService;
 
 
     /**
     /**

+ 2 - 5
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCateController.java

@@ -21,7 +21,7 @@ import com.fuint.repository.model.TAccount;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
@@ -38,31 +38,28 @@ import java.util.Map;
  */
  */
 @Api(tags="管理端-商品分类相关接口")
 @Api(tags="管理端-商品分类相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/goods/cate")
 @RequestMapping(value = "/backendApi/goods/cate")
 public class BackendCateController extends BaseController {
 public class BackendCateController extends BaseController {
 
 
     /**
     /**
      * 商品分类服务接口
      * 商品分类服务接口
      */
      */
-    @Autowired
     private CateService cateService;
     private CateService cateService;
 
 
     /**
     /**
      * 配置服务接口
      * 配置服务接口
      * */
      * */
-    @Autowired
     private SettingService settingService;
     private SettingService settingService;
 
 
     /**
     /**
      * 后台账户服务接口
      * 后台账户服务接口
      */
      */
-    @Autowired
     private AccountService accountService;
     private AccountService accountService;
 
 
     /**
     /**
      * 店铺服务接口
      * 店铺服务接口
      */
      */
-    @Autowired
     private StoreService storeService;
     private StoreService storeService;
 
 
     /**
     /**

+ 2 - 3
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCommissionLogController.java

@@ -16,7 +16,7 @@ import com.fuint.repository.model.MtStore;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.HashMap;
@@ -31,19 +31,18 @@ import java.util.Map;
  */
  */
 @Api(tags="管理端-销提成记录相关接口")
 @Api(tags="管理端-销提成记录相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/commissionLog")
 @RequestMapping(value = "/backendApi/commissionLog")
 public class BackendCommissionLogController extends BaseController {
 public class BackendCommissionLogController extends BaseController {
 
 
     /**
     /**
      * 分销提成规则服务接口
      * 分销提成规则服务接口
      */
      */
-    @Autowired
     private CommissionRuleService commissionRuleService;
     private CommissionRuleService commissionRuleService;
 
 
     /**
     /**
      * 店铺服务接口
      * 店铺服务接口
      */
      */
-    @Autowired
     private StoreService storeService;
     private StoreService storeService;
 
 
     /**
     /**

+ 2 - 3
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCommissionRuleController.java

@@ -16,7 +16,7 @@ import com.fuint.repository.model.MtStore;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.HashMap;
@@ -31,19 +31,18 @@ import java.util.Map;
  */
  */
 @Api(tags="管理端-分销提成规则相关接口")
 @Api(tags="管理端-分销提成规则相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/commissionRule")
 @RequestMapping(value = "/backendApi/commissionRule")
 public class BackendCommissionRuleController extends BaseController {
 public class BackendCommissionRuleController extends BaseController {
 
 
     /**
     /**
      * 分销提成规则服务接口
      * 分销提成规则服务接口
      */
      */
-    @Autowired
     private CommissionRuleService commissionRuleService;
     private CommissionRuleService commissionRuleService;
 
 
     /**
     /**
      * 店铺服务接口
      * 店铺服务接口
      */
      */
-    @Autowired
     private StoreService storeService;
     private StoreService storeService;
 
 
     /**
     /**

+ 3 - 6
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendConfirmLogController.java

@@ -20,7 +20,7 @@ import com.fuint.repository.model.TAccount;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
@@ -38,37 +38,34 @@ import java.util.Map;
  */
  */
 @Api(tags="管理端-券核销流水相关接口")
 @Api(tags="管理端-券核销流水相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/confirmLog")
 @RequestMapping(value = "/backendApi/confirmLog")
 public class BackendConfirmLogController extends BaseController {
 public class BackendConfirmLogController extends BaseController {
 
 
     /**
     /**
      * 卡券核销流水接口
      * 卡券核销流水接口
      */
      */
-    @Autowired
     private ConfirmLogService confirmLogService;
     private ConfirmLogService confirmLogService;
 
 
     /**
     /**
      * 卡券服务接口
      * 卡券服务接口
      */
      */
-    @Autowired
     private CouponService couponService;
     private CouponService couponService;
 
 
     /**
     /**
      * 会员接口服务
      * 会员接口服务
      * */
      * */
-    @Autowired
     private MemberService memberService;
     private MemberService memberService;
 
 
     /**
     /**
      * 后台账户服务接口
      * 后台账户服务接口
      */
      */
-    @Autowired
     private AccountService tAccountService;
     private AccountService tAccountService;
 
 
     /**
     /**
      * 获取会员卡券核销记录列表
      * 获取会员卡券核销记录列表
      *
      *
-     * @param request  HttpServletRequest对象
+     * @param request HttpServletRequest对象
      * @return
      * @return
      */
      */
     @ApiOperation(value = "获取会员卡券核销记录列表")
     @ApiOperation(value = "获取会员卡券核销记录列表")

+ 17 - 13
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCouponController.java

@@ -19,10 +19,9 @@ import com.fuint.repository.model.*;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.ParseException;
@@ -37,52 +36,57 @@ import java.util.regex.Pattern;
  */
  */
 @Api(tags="管理端-卡券管理相关接口")
 @Api(tags="管理端-卡券管理相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/coupon")
 @RequestMapping(value = "/backendApi/coupon")
 public class BackendCouponController extends BaseController {
 public class BackendCouponController extends BaseController {
 
 
-    @Resource
     private MtCouponGroupMapper mtCouponGroupMapper;
     private MtCouponGroupMapper mtCouponGroupMapper;
 
 
-    @Resource
     private MtCouponGoodsMapper mtCouponGoodsMapper;
     private MtCouponGoodsMapper mtCouponGoodsMapper;
 
 
     /**
     /**
      * 卡券服务接口
      * 卡券服务接口
      */
      */
-    @Autowired
     private CouponService couponService;
     private CouponService couponService;
 
 
     /**
     /**
      * 卡券分组服务接口
      * 卡券分组服务接口
      * */
      * */
-    @Autowired
     private CouponGroupService couponGroupService;
     private CouponGroupService couponGroupService;
 
 
     /**
     /**
      * 店铺服务接口
      * 店铺服务接口
      */
      */
-    @Autowired
     private StoreService storeService;
     private StoreService storeService;
 
 
     /**
     /**
      * 商品服务接口
      * 商品服务接口
      * */
      * */
-    @Autowired
     private GoodsService goodsService;
     private GoodsService goodsService;
 
 
-    @Autowired
+    /**
+     * 卡券发放记录服务接口
+     * */
     private SendLogService sendLogService;
     private SendLogService sendLogService;
 
 
-    @Autowired
+    /**
+     * 会员服务接口
+     * */
     private MemberService memberService;
     private MemberService memberService;
 
 
-    @Autowired
+    /**
+     * 短信服务接口
+     * */
     private SendSmsService sendSmsService;
     private SendSmsService sendSmsService;
 
 
-    @Autowired
+    /**
+     * 后台账户服务接口
+     * */
     private AccountService accountService;
     private AccountService accountService;
 
 
-    @Autowired
+    /**
+     * 系统配置服务接口
+     * */
     private SettingService settingService;
     private SettingService settingService;
 
 
     /**
     /**

+ 3 - 8
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCouponGroupController.java

@@ -20,14 +20,12 @@ import com.fuint.repository.model.MtCouponGroup;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartFile;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
-
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.File;
@@ -46,30 +44,27 @@ import java.util.Map;
  */
  */
 @Api(tags="管理端-卡券分组相关接口")
 @Api(tags="管理端-卡券分组相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/couponGroup")
 @RequestMapping(value = "/backendApi/couponGroup")
 public class BackendCouponGroupController extends BaseController {
 public class BackendCouponGroupController extends BaseController {
 
 
     private static final Logger logger = LoggerFactory.getLogger(BackendCouponGroupController.class);
     private static final Logger logger = LoggerFactory.getLogger(BackendCouponGroupController.class);
 
 
-    @Resource
     private MtCouponMapper mtCouponMapper;
     private MtCouponMapper mtCouponMapper;
 
 
     /**
     /**
      * 卡券分组服务接口
      * 卡券分组服务接口
      */
      */
-    @Autowired
     private CouponGroupService couponGroupService;
     private CouponGroupService couponGroupService;
 
 
     /**
     /**
      * 卡券服务接口
      * 卡券服务接口
      * */
      * */
-    @Autowired
-    CouponService couponService;
+    private CouponService couponService;
 
 
     /**
     /**
      * 导出服务接口
      * 导出服务接口
      * */
      * */
-    @Autowired
     private ExportService exportService;
     private ExportService exportService;
 
 
     /**
     /**

+ 4 - 10
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendDoConfirmController.java

@@ -22,11 +22,9 @@ import com.fuint.repository.model.TAccount;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.ArrayList;
@@ -42,36 +40,32 @@ import java.util.Map;
  */
  */
 @Api(tags="管理端-卡券核销相关接口")
 @Api(tags="管理端-卡券核销相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/doConfirm")
 @RequestMapping(value = "/backendApi/doConfirm")
 public class BackendDoConfirmController extends BaseController {
 public class BackendDoConfirmController extends BaseController {
 
 
+    private MtUserCouponMapper mtUserCouponMapper;
+
     /**
     /**
      * 会员服务接口
      * 会员服务接口
      * */
      * */
-    @Autowired
     private MemberService memberService;
     private MemberService memberService;
 
 
     /**
     /**
      * 卡券服务接口
      * 卡券服务接口
      */
      */
-    @Autowired
     private CouponService couponService;
     private CouponService couponService;
 
 
     /**
     /**
      * 账户服务接口
      * 账户服务接口
      */
      */
-    @Autowired
     private AccountService accountService;
     private AccountService accountService;
 
 
     /**
     /**
      * 核销记录服务接口
      * 核销记录服务接口
      * */
      * */
-    @Autowired
     private ConfirmLogService confirmLogService;
     private ConfirmLogService confirmLogService;
 
 
-    @Resource
-    private MtUserCouponMapper mtUserCouponMapper;
-
     /**
     /**
      * 核销详情
      * 核销详情
      *
      *

+ 8 - 3
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendDutyController.java

@@ -19,7 +19,7 @@ import com.fuint.repository.model.TSource;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
@@ -40,13 +40,18 @@ import java.util.Map;
  */
  */
 @Api(tags="管理端-后台角色相关接口")
 @Api(tags="管理端-后台角色相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/duty")
 @RequestMapping(value = "/backendApi/duty")
 public class BackendDutyController extends BaseController {
 public class BackendDutyController extends BaseController {
 
 
-    @Autowired
+    /**
+     * 角色服务接口
+     * */
     private DutyService tDutyService;
     private DutyService tDutyService;
 
 
-    @Autowired
+    /**
+     * 菜单服务接口
+     * */
     private SourceService tSourceService;
     private SourceService tSourceService;
 
 
     /**
     /**

+ 8 - 3
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendFileController.java

@@ -12,7 +12,7 @@ import com.fuint.framework.web.ResponseObject;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.util.ResourceUtils;
 import org.springframework.util.ResourceUtils;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -38,15 +38,20 @@ import java.util.UUID;
  */
  */
 @Api(tags="管理端-文件上传相关接口")
 @Api(tags="管理端-文件上传相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/file")
 @RequestMapping(value = "/backendApi/file")
 public class BackendFileController extends BaseController {
 public class BackendFileController extends BaseController {
 
 
     private static final Logger logger = LoggerFactory.getLogger(BackendFileController.class);
     private static final Logger logger = LoggerFactory.getLogger(BackendFileController.class);
 
 
-    @Autowired
+    /**
+     * 环境变量
+     * */
     private Environment env;
     private Environment env;
 
 
-    @Autowired
+    /**
+     * 系统设置服务接口
+     * */
     private SettingService settingService;
     private SettingService settingService;
 
 
     /**
     /**

+ 2 - 7
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendGiveLogController.java

@@ -24,10 +24,9 @@ import static com.fuint.common.util.XlsUtil.objectConvertToString;
 
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import java.io.OutputStream;
 import java.io.OutputStream;
@@ -44,28 +43,24 @@ import java.util.Map;
  */
  */
 @Api(tags="管理端-转赠相关接口")
 @Api(tags="管理端-转赠相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/give")
 @RequestMapping(value = "/backendApi/give")
 public class BackendGiveLogController extends BaseController {
 public class BackendGiveLogController extends BaseController {
 
 
-    @Resource
     private MtUserCouponMapper mtUserCouponMapper;
     private MtUserCouponMapper mtUserCouponMapper;
 
 
-    @Resource
     private MtCouponGroupMapper mtCouponGroupMapper;
     private MtCouponGroupMapper mtCouponGroupMapper;
 
 
-    @Resource
     private MtCouponMapper mtCouponMapper;
     private MtCouponMapper mtCouponMapper;
 
 
     /**
     /**
      * 转赠服务接口
      * 转赠服务接口
      */
      */
-    @Autowired
     private GiveService giveService;
     private GiveService giveService;
 
 
     /**
     /**
      * 后台账户服务接口
      * 后台账户服务接口
      */
      */
-    @Autowired
     private AccountService accountService;
     private AccountService accountService;
 
 
     /**
     /**

+ 2 - 10
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendGoodsController.java

@@ -21,12 +21,10 @@ import com.fuint.repository.model.*;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
@@ -40,43 +38,37 @@ import java.util.*;
  */
  */
 @Api(tags="管理端-商品相关接口")
 @Api(tags="管理端-商品相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/goods/goods")
 @RequestMapping(value = "/backendApi/goods/goods")
 public class BackendGoodsController extends BaseController {
 public class BackendGoodsController extends BaseController {
 
 
-    @Resource
     private MtGoodsSpecMapper mtGoodsSpecMapper;
     private MtGoodsSpecMapper mtGoodsSpecMapper;
 
 
-    @Resource
     private MtGoodsSkuMapper mtGoodsSkuMapper;
     private MtGoodsSkuMapper mtGoodsSkuMapper;
 
 
     /**
     /**
      * 商品服务接口
      * 商品服务接口
      */
      */
-    @Autowired
     private GoodsService goodsService;
     private GoodsService goodsService;
 
 
     /**
     /**
      * 商品分类服务接口
      * 商品分类服务接口
      */
      */
-    @Autowired
     private CateService cateService;
     private CateService cateService;
 
 
     /**
     /**
      * 店铺服务接口
      * 店铺服务接口
      */
      */
-    @Autowired
     private StoreService storeService;
     private StoreService storeService;
 
 
     /**
     /**
      * 后台账户服务接口
      * 后台账户服务接口
      */
      */
-    @Autowired
     private AccountService accountService;
     private AccountService accountService;
 
 
     /**
     /**
      * 系统设置服务接口
      * 系统设置服务接口
      * */
      * */
-    @Autowired
     private SettingService settingService;
     private SettingService settingService;
 
 
     /**
     /**

+ 11 - 4
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendHomeController.java

@@ -14,9 +14,9 @@ import com.fuint.framework.web.ResponseObject;
 import com.fuint.repository.model.TAccount;
 import com.fuint.repository.model.TAccount;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
-import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Date;
@@ -31,16 +31,23 @@ import java.util.Map;
  */
  */
 @Api(tags="管理端-首页相关接口")
 @Api(tags="管理端-首页相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/home")
 @RequestMapping(value = "/backendApi/home")
 public class BackendHomeController extends BaseController {
 public class BackendHomeController extends BaseController {
 
 
-    @Resource
+    /**
+     * 会员服务接口
+     * */
     private MemberService memberService;
     private MemberService memberService;
 
 
-    @Resource
+    /**
+     * 订单服务接口
+     * */
     private OrderService orderService;
     private OrderService orderService;
 
 
-    @Resource
+    /**
+     * 后台账号服务接口
+     * */
     private AccountService accountService;
     private AccountService accountService;
 
 
     /**
     /**

+ 9 - 12
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendLoginController.java

@@ -19,9 +19,9 @@ import com.fuint.repository.model.TSource;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import com.fuint.common.domain.TreeNode;
 import com.fuint.common.domain.TreeNode;
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 import java.util.*;
 
 
@@ -33,31 +33,28 @@ import java.util.*;
  */
  */
 @Api(tags="管理端-后台登录相关接口")
 @Api(tags="管理端-后台登录相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping("/backendApi/login")
 @RequestMapping("/backendApi/login")
 public class BackendLoginController extends BaseController {
 public class BackendLoginController extends BaseController {
 
 
     /**
     /**
-     * 后台账号接口
+     * 后台账号服务接口
      * */
      * */
-    @Resource
-    AccountService accountService;
+    private AccountService accountService;
 
 
     /**
     /**
-     * 后台菜单接口
+     * 后台菜单服务接口
      * */
      * */
-    @Resource
-    SourceService sourceService;
+    private SourceService sourceService;
 
 
     /**
     /**
-     * 后台角色接口
+     * 后台角色服务接口
      * */
      * */
-    @Resource
-    DutyService dutyService;
+    private DutyService dutyService;
 
 
     /**
     /**
-     * 验证码接口
+     * 验证码服务接口
      * */
      * */
-    @Resource
     private CaptchaService captchaService;
     private CaptchaService captchaService;
 
 
     /**
     /**

+ 2 - 6
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendMemberController.java

@@ -21,8 +21,8 @@ import com.fuint.repository.model.*;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
@@ -37,37 +37,33 @@ import java.util.*;
  */
  */
 @Api(tags="管理端-会员相关接口")
 @Api(tags="管理端-会员相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/member")
 @RequestMapping(value = "/backendApi/member")
 public class BackendMemberController extends BaseController {
 public class BackendMemberController extends BaseController {
 
 
     /**
     /**
      * 会员服务接口
      * 会员服务接口
      */
      */
-    @Autowired
     private MemberService memberService;
     private MemberService memberService;
 
 
     /**
     /**
      * 配置服务接口
      * 配置服务接口
      * */
      * */
-    @Autowired
     private SettingService settingService;
     private SettingService settingService;
 
 
     /**
     /**
      * 后台账户服务接口
      * 后台账户服务接口
      */
      */
-    @Autowired
     private AccountService accountService;
     private AccountService accountService;
 
 
     /**
     /**
      * 店铺服务接口
      * 店铺服务接口
      */
      */
-    @Autowired
     private StoreService storeService;
     private StoreService storeService;
 
 
     /**
     /**
      * 会员分组服务接口
      * 会员分组服务接口
      */
      */
-    @Autowired
     private MemberGroupService memberGroupService;
     private MemberGroupService memberGroupService;
 
 
     /**
     /**

+ 2 - 4
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendMemberGroupController.java

@@ -18,10 +18,9 @@ import com.fuint.repository.model.MtUserGroup;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
@@ -35,16 +34,15 @@ import java.util.Map;
  */
  */
 @Api(tags="管理端-会员分组相关接口")
 @Api(tags="管理端-会员分组相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/memberGroup")
 @RequestMapping(value = "/backendApi/memberGroup")
 public class BackendMemberGroupController extends BaseController {
 public class BackendMemberGroupController extends BaseController {
 
 
-    @Resource
     private MtUserMapper mtUserMapper;
     private MtUserMapper mtUserMapper;
 
 
     /**
     /**
      * 会员分组服务接口
      * 会员分组服务接口
      */
      */
-    @Autowired
     private MemberGroupService memberGroupService;
     private MemberGroupService memberGroupService;
 
 
     /**
     /**

+ 2 - 3
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendMerchantController.java

@@ -18,7 +18,7 @@ import com.fuint.repository.model.MtMerchant;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
@@ -35,19 +35,18 @@ import java.util.Map;
  */
  */
 @Api(tags="管理端-商户管理相关接口")
 @Api(tags="管理端-商户管理相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/merchant")
 @RequestMapping(value = "/backendApi/merchant")
 public class BackendMerchantController extends BaseController {
 public class BackendMerchantController extends BaseController {
 
 
     /**
     /**
      * 商户服务接口
      * 商户服务接口
      */
      */
-    @Autowired
     private MerchantService merchantService;
     private MerchantService merchantService;
 
 
     /**
     /**
      * 系统设置服务接口
      * 系统设置服务接口
      * */
      * */
-    @Autowired
     private SettingService settingService;
     private SettingService settingService;
 
 
     /**
     /**

+ 2 - 3
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendOpenGiftController.java

@@ -15,7 +15,7 @@ import com.fuint.repository.model.MtUserGrade;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
@@ -32,19 +32,18 @@ import java.util.Map;
  */
  */
 @Api(tags="管理端-开卡赠礼相关接口")
 @Api(tags="管理端-开卡赠礼相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/openGift")
 @RequestMapping(value = "/backendApi/openGift")
 public class BackendOpenGiftController extends BaseController {
 public class BackendOpenGiftController extends BaseController {
 
 
     /**
     /**
      * 会员服务接口
      * 会员服务接口
      */
      */
-    @Autowired
     private MemberService memberService;
     private MemberService memberService;
 
 
     /**
     /**
      * 开卡赠礼服务接口
      * 开卡赠礼服务接口
      */
      */
-    @Autowired
     private OpenGiftService openGiftService;
     private OpenGiftService openGiftService;
 
 
     /**
     /**

+ 2 - 8
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendOrderController.java

@@ -17,10 +17,9 @@ import com.fuint.utils.StringUtil;
 import com.fuint.utils.TimeUtils;
 import com.fuint.utils.TimeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.ArrayList;
@@ -37,43 +36,38 @@ import java.util.Date;
  */
  */
 @Api(tags="管理端-订单相关接口")
 @Api(tags="管理端-订单相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/order")
 @RequestMapping(value = "/backendApi/order")
 public class BackendOrderController extends BaseController {
 public class BackendOrderController extends BaseController {
 
 
     /**
     /**
      * 订单服务接口
      * 订单服务接口
      * */
      * */
-    @Autowired
     private OrderService orderService;
     private OrderService orderService;
 
 
     /**
     /**
      * 后台账户服务接口
      * 后台账户服务接口
      */
      */
-    @Autowired
     private AccountService accountService;
     private AccountService accountService;
 
 
     /**
     /**
      * 会员服务接口
      * 会员服务接口
      * */
      * */
-    @Autowired
     private MemberService memberService;
     private MemberService memberService;
 
 
     /**
     /**
      * 微信服务接口
      * 微信服务接口
      * */
      * */
-    @Autowired
     private WeixinService weixinService;
     private WeixinService weixinService;
 
 
     /**
     /**
      * 店铺服务接口
      * 店铺服务接口
      */
      */
-    @Autowired
     private StoreService storeService;
     private StoreService storeService;
 
 
     /**
     /**
      * 配置服务接口
      * 配置服务接口
      * */
      * */
-    @Autowired
     private SettingService settingService;
     private SettingService settingService;
 
 
     /**
     /**

+ 2 - 4
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendPointController.java

@@ -22,7 +22,7 @@ import com.fuint.repository.model.MtUser;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
@@ -40,25 +40,23 @@ import java.util.Map;
  */
  */
 @Api(tags="管理端-积分相关接口")
 @Api(tags="管理端-积分相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/point")
 @RequestMapping(value = "/backendApi/point")
 public class BackendPointController extends BaseController {
 public class BackendPointController extends BaseController {
 
 
     /**
     /**
      * 配置服务接口
      * 配置服务接口
      * */
      * */
-    @Autowired
     private SettingService settingService;
     private SettingService settingService;
 
 
     /**
     /**
      * 积分服务接口
      * 积分服务接口
      * */
      * */
-    @Autowired
     private PointService pointService;
     private PointService pointService;
 
 
     /**
     /**
      * 会员服务接口
      * 会员服务接口
      * */
      * */
-    @Autowired
     private MemberService memberService;
     private MemberService memberService;
 
 
     /**
     /**

+ 2 - 5
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendRefundController.java

@@ -20,7 +20,7 @@ import com.fuint.repository.model.TAccount;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
@@ -37,31 +37,28 @@ import java.util.Map;
  */
  */
 @Api(tags="管理端-售后订单相关接口")
 @Api(tags="管理端-售后订单相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/refund")
 @RequestMapping(value = "/backendApi/refund")
 public class BackendRefundController extends BaseController {
 public class BackendRefundController extends BaseController {
 
 
     /**
     /**
      * 售后服务接口
      * 售后服务接口
      * */
      * */
-    @Autowired
     private RefundService refundService;
     private RefundService refundService;
 
 
     /**
     /**
      * 订单服务接口
      * 订单服务接口
      * */
      * */
-    @Autowired
     private OrderService orderService;
     private OrderService orderService;
 
 
     /**
     /**
      * 后台账户服务接口
      * 后台账户服务接口
      */
      */
-    @Autowired
     private AccountService accountService;
     private AccountService accountService;
 
 
     /**
     /**
      * 会员接口服务
      * 会员接口服务
      * */
      * */
-    @Autowired
     private MemberService memberService;
     private MemberService memberService;
 
 
     /**
     /**

+ 3 - 5
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSendLogController.java

@@ -16,7 +16,7 @@ import com.fuint.repository.model.MtUser;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
@@ -31,26 +31,24 @@ import java.util.Map;
  */
  */
 @Api(tags="管理端-卡券发放相关接口")
 @Api(tags="管理端-卡券发放相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/sendLog")
 @RequestMapping(value = "/backendApi/sendLog")
 public class BackendSendLogController extends BaseController {
 public class BackendSendLogController extends BaseController {
 
 
     /**
     /**
      * 发送记录服务接口
      * 发送记录服务接口
      */
      */
-    @Autowired
     private SendLogService sendLogService;
     private SendLogService sendLogService;
 
 
     /**
     /**
      * 会员接口服务
      * 会员接口服务
      * */
      * */
-    @Autowired
     private MemberService memberService;
     private MemberService memberService;
 
 
     /**
     /**
      * 卡券服务接口
      * 卡券服务接口
      * */
      * */
-    @Autowired
-    CouponService couponService;
+    private CouponService couponService;
 
 
     /**
     /**
      * 查询发券记录列表
      * 查询发券记录列表

+ 2 - 4
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSettlementController.java

@@ -23,7 +23,7 @@ import com.fuint.repository.model.MtStore;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
@@ -37,25 +37,23 @@ import java.util.*;
  */
  */
 @Api(tags="管理端-商户结算相关接口")
 @Api(tags="管理端-商户结算相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/settlement")
 @RequestMapping(value = "/backendApi/settlement")
 public class BackendSettlementController extends BaseController {
 public class BackendSettlementController extends BaseController {
 
 
     /**
     /**
      * 结算服务接口
      * 结算服务接口
      * */
      * */
-    @Autowired
     private SettlementService settlementService;
     private SettlementService settlementService;
 
 
     /**
     /**
      * 店铺服务接口
      * 店铺服务接口
      */
      */
-    @Autowired
     private StoreService storeService;
     private StoreService storeService;
 
 
     /**
     /**
      * 商户服务接口
      * 商户服务接口
      */
      */
-    @Autowired
     private MerchantService merchantService;
     private MerchantService merchantService;
 
 
     /**
     /**

+ 2 - 2
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSmsController.java

@@ -13,7 +13,7 @@ import com.fuint.repository.model.MtSmsSendedLog;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -30,13 +30,13 @@ import java.util.Map;
  */
  */
 @Api(tags="管理端-短信相关接口")
 @Api(tags="管理端-短信相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/smsManager")
 @RequestMapping(value = "/backendApi/smsManager")
 public class BackendSmsController extends BaseController {
 public class BackendSmsController extends BaseController {
 
 
     /**
     /**
      * 短信发送接口
      * 短信发送接口
      */
      */
-    @Autowired
     private SendSmsService sendSmsService;
     private SendSmsService sendSmsService;
 
 
     /**
     /**

+ 2 - 2
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSmsTemplateController.java

@@ -14,7 +14,7 @@ import com.fuint.repository.model.MtSmsTemplate;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
@@ -30,13 +30,13 @@ import java.util.Map;
  */
  */
 @Api(tags="管理端-短信模板相关接口")
 @Api(tags="管理端-短信模板相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/smsTemplate")
 @RequestMapping(value = "/backendApi/smsTemplate")
 public class BackendSmsTemplateController extends BaseController {
 public class BackendSmsTemplateController extends BaseController {
 
 
     /**
     /**
      * 短信模板服务接口
      * 短信模板服务接口
      */
      */
-    @Autowired
     private SmsTemplateService smsTemplateService;
     private SmsTemplateService smsTemplateService;
 
 
     /**
     /**

+ 12 - 15
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSourceController.java

@@ -14,7 +14,7 @@ import com.fuint.repository.model.TSource;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
@@ -30,16 +30,13 @@ import java.util.Map;
  */
  */
 @Api(tags="管理端-后台菜单相关接口")
 @Api(tags="管理端-后台菜单相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/source")
 @RequestMapping(value = "/backendApi/source")
 public class BackendSourceController extends BaseController {
 public class BackendSourceController extends BaseController {
 
 
-    @Autowired
-    private SourceService sSourceService;
-
     /**
     /**
      * 菜单服务接口
      * 菜单服务接口
      * */
      * */
-    @Autowired
     private SourceService sourceService;
     private SourceService sourceService;
 
 
     /**
     /**
@@ -57,7 +54,7 @@ public class BackendSourceController extends BaseController {
             return getFailureResult(1001, "请先登录");
             return getFailureResult(1001, "请先登录");
         }
         }
 
 
-        List<TreeNode> sources = sSourceService.getSourceTree(accountInfo.getMerchantId());
+        List<TreeNode> sources = sourceService.getSourceTree(accountInfo.getMerchantId());
         return getSuccessResult(sources);
         return getSuccessResult(sources);
     }
     }
 
 
@@ -70,7 +67,7 @@ public class BackendSourceController extends BaseController {
     @ApiOperation(value = "获取菜单详情")
     @ApiOperation(value = "获取菜单详情")
     @RequestMapping(value = "/info/{sourceId}", method = RequestMethod.GET)
     @RequestMapping(value = "/info/{sourceId}", method = RequestMethod.GET)
     public ResponseObject info( @PathVariable("sourceId") Long sourceId) {
     public ResponseObject info( @PathVariable("sourceId") Long sourceId) {
-        TSource tSource = sSourceService.getById(sourceId);
+        TSource tSource = sourceService.getById(sourceId);
 
 
         SourceDto sourceDto = new SourceDto();
         SourceDto sourceDto = new SourceDto();
         sourceDto.setId(tSource.getSourceId());
         sourceDto.setId(tSource.getSourceId());
@@ -136,7 +133,7 @@ public class BackendSourceController extends BaseController {
 
 
         if (StringUtil.isNotBlank(parentId)) {
         if (StringUtil.isNotBlank(parentId)) {
             if (Integer.parseInt(parentId) > 0) {
             if (Integer.parseInt(parentId) > 0) {
-                TSource parentSource = sSourceService.getById(parentId);
+                TSource parentSource = sourceService.getById(parentId);
                 addSource.setParentId(parentSource.getSourceId());
                 addSource.setParentId(parentSource.getSourceId());
                 addSource.setSourceLevel(parentSource.getSourceLevel() + 1);
                 addSource.setSourceLevel(parentSource.getSourceLevel() + 1);
             } else {
             } else {
@@ -145,7 +142,7 @@ public class BackendSourceController extends BaseController {
         } else {
         } else {
             addSource.setSourceLevel(1);
             addSource.setSourceLevel(1);
         }
         }
-        sSourceService.addSource(addSource);
+        sourceService.addSource(addSource);
         return getSuccessResult(true);
         return getSuccessResult(true);
     }
     }
 
 
@@ -174,7 +171,7 @@ public class BackendSourceController extends BaseController {
         Integer isMenu = param.get("isMenu") == null ? 1 : Integer.parseInt(param.get("isMenu").toString());
         Integer isMenu = param.get("isMenu") == null ? 1 : Integer.parseInt(param.get("isMenu").toString());
         Long id = param.get("id") == null ? 0 : Long.parseLong(param.get("id").toString());
         Long id = param.get("id") == null ? 0 : Long.parseLong(param.get("id").toString());
 
 
-        TSource editSource = sSourceService.getById(id);
+        TSource editSource = sourceService.getById(id);
         if (!editSource.getMerchantId().equals(accountInfo.getMerchantId()) && accountInfo.getMerchantId() > 0) {
         if (!editSource.getMerchantId().equals(accountInfo.getMerchantId()) && accountInfo.getMerchantId() > 0) {
             return getFailureResult(201, "抱歉,您没有修改的权限");
             return getFailureResult(201, "抱歉,您没有修改的权限");
         }
         }
@@ -197,7 +194,7 @@ public class BackendSourceController extends BaseController {
         if (StringUtil.isNotBlank(parentId)) {
         if (StringUtil.isNotBlank(parentId)) {
             try {
             try {
                 if (Integer.parseInt(parentId) > 0) {
                 if (Integer.parseInt(parentId) > 0) {
-                    TSource parentSource = sSourceService.getById(Long.parseLong(parentId));
+                    TSource parentSource = sourceService.getById(Long.parseLong(parentId));
                     editSource.setParentId(parentSource.getSourceId());
                     editSource.setParentId(parentSource.getSourceId());
                     editSource.setSourceLevel(parentSource.getSourceLevel() + 1);
                     editSource.setSourceLevel(parentSource.getSourceLevel() + 1);
                 } else {
                 } else {
@@ -209,7 +206,7 @@ public class BackendSourceController extends BaseController {
         } else {
         } else {
             editSource.setSourceLevel(1);
             editSource.setSourceLevel(1);
         }
         }
-        sSourceService.editSource(editSource);
+        sourceService.editSource(editSource);
         return getSuccessResult(true);
         return getSuccessResult(true);
     }
     }
 
 
@@ -228,11 +225,11 @@ public class BackendSourceController extends BaseController {
         if (accountInfo == null) {
         if (accountInfo == null) {
             return getFailureResult(1001, "请先登录");
             return getFailureResult(1001, "请先登录");
         }
         }
-        TSource tSource = sSourceService.getById(sourceId);
+        TSource tSource = sourceService.getById(sourceId);
         if (!tSource.getMerchantId().equals(accountInfo.getMerchantId()) && accountInfo.getMerchantId() > 0) {
         if (!tSource.getMerchantId().equals(accountInfo.getMerchantId()) && accountInfo.getMerchantId() > 0) {
             return getFailureResult(201, "抱歉,您没有删除的权限");
             return getFailureResult(201, "抱歉,您没有删除的权限");
         }
         }
-        sSourceService.deleteSource(tSource);
+        sourceService.deleteSource(tSource);
         return getSuccessResult(true);
         return getSuccessResult(true);
     }
     }
 
 
@@ -248,7 +245,7 @@ public class BackendSourceController extends BaseController {
             return getFailureResult(1001, "请先登录");
             return getFailureResult(1001, "请先登录");
         }
         }
 
 
-        List<TreeNode> sources = sSourceService.getSourceTree(accountInfo.getMerchantId());
+        List<TreeNode> sources = sourceService.getSourceTree(accountInfo.getMerchantId());
         List<TreeSelect> data = sourceService.buildMenuTreeSelect(sources);
         List<TreeSelect> data = sourceService.buildMenuTreeSelect(sources);
 
 
         return getSuccessResult(data);
         return getSuccessResult(data);

+ 2 - 2
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendStaffController.java

@@ -18,7 +18,7 @@ import com.fuint.repository.model.MtStaff;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
@@ -36,13 +36,13 @@ import java.util.Map;
  */
  */
 @Api(tags="管理端-店铺员工相关接口")
 @Api(tags="管理端-店铺员工相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/staff")
 @RequestMapping(value = "/backendApi/staff")
 public class BackendStaffController extends BaseController {
 public class BackendStaffController extends BaseController {
 
 
     /**
     /**
      * 员工接口
      * 员工接口
      */
      */
-    @Autowired
     private StaffService staffService;
     private StaffService staffService;
 
 
     /**
     /**

+ 11 - 5
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendStatisticController.java

@@ -14,10 +14,9 @@ import com.fuint.framework.web.ResponseObject;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
-import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.ParseException;
 import java.util.*;
 import java.util.*;
@@ -30,16 +29,23 @@ import java.util.*;
  */
  */
 @Api(tags="管理端-数据统计相关接口")
 @Api(tags="管理端-数据统计相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/statistic")
 @RequestMapping(value = "/backendApi/statistic")
 public class BackendStatisticController extends BaseController {
 public class BackendStatisticController extends BaseController {
 
 
-    @Resource
+    /**
+     * 会员服务接口
+     * */
     private MemberService memberService;
     private MemberService memberService;
 
 
-    @Resource
+    /**
+     * 订单服务接口
+     * */
     private OrderService orderService;
     private OrderService orderService;
 
 
-    @Resource
+    /**
+     * 商品服务接口
+     * */
     private GoodsService goodsService;
     private GoodsService goodsService;
 
 
     /**
     /**

+ 2 - 9
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendStockController.java

@@ -18,11 +18,9 @@ import com.fuint.repository.model.*;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 import java.util.*;
 
 
@@ -34,37 +32,32 @@ import java.util.*;
  */
  */
 @Api(tags="管理端-商品库存管理相关接口")
 @Api(tags="管理端-商品库存管理相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/stock")
 @RequestMapping(value = "/backendApi/stock")
 public class BackendStockController extends BaseController {
 public class BackendStockController extends BaseController {
 
 
-    @Resource
     private MtGoodsMapper mtGoodsMapper;
     private MtGoodsMapper mtGoodsMapper;
 
 
-    @Resource
     private MtGoodsSkuMapper mtGoodsSkuMapper;
     private MtGoodsSkuMapper mtGoodsSkuMapper;
 
 
     /**
     /**
      * 商品分类服务接口
      * 商品分类服务接口
      */
      */
-    @Autowired
     private StockService stockService;
     private StockService stockService;
 
 
     /**
     /**
      * 配置服务接口
      * 配置服务接口
      * */
      * */
-    @Autowired
     private SettingService settingService;
     private SettingService settingService;
 
 
     /**
     /**
      * 后台账户服务接口
      * 后台账户服务接口
      */
      */
-    @Autowired
     private AccountService accountService;
     private AccountService accountService;
 
 
     /**
     /**
      * 店铺服务接口
      * 店铺服务接口
      */
      */
-    @Autowired
     private StoreService storeService;
     private StoreService storeService;
 
 
     /**
     /**

+ 2 - 4
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendStoreController.java

@@ -20,7 +20,7 @@ import com.fuint.repository.model.MtStore;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
@@ -36,25 +36,23 @@ import java.util.Map;
  */
  */
 @Api(tags="管理端-店铺相关接口")
 @Api(tags="管理端-店铺相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/store")
 @RequestMapping(value = "/backendApi/store")
 public class BackendStoreController extends BaseController {
 public class BackendStoreController extends BaseController {
 
 
     /**
     /**
      * 店铺服务接口
      * 店铺服务接口
      */
      */
-    @Autowired
     private StoreService storeService;
     private StoreService storeService;
 
 
     /**
     /**
      * 商户接口
      * 商户接口
      */
      */
-    @Autowired
     private MerchantService merchantService;
     private MerchantService merchantService;
 
 
     /**
     /**
      * 系统设置服务接口
      * 系统设置服务接口
      * */
      * */
-    @Autowired
     private SettingService settingService;
     private SettingService settingService;
 
 
     /**
     /**

+ 5 - 3
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSubMessageController.java

@@ -18,7 +18,7 @@ import com.fuint.repository.model.MtSetting;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.Environment;
@@ -33,16 +33,18 @@ import java.util.*;
  */
  */
 @Api(tags="管理端-小程序订阅消息相关接口")
 @Api(tags="管理端-小程序订阅消息相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/subMessage")
 @RequestMapping(value = "/backendApi/subMessage")
 public class BackendSubMessageController extends BaseController {
 public class BackendSubMessageController extends BaseController {
 
 
     /**
     /**
      * 配置服务接口
      * 配置服务接口
      * */
      * */
-    @Autowired
     private SettingService settingService;
     private SettingService settingService;
 
 
-    @Autowired
+    /**
+     * 系统环境变量
+     * */
     private Environment env;
     private Environment env;
 
 
     /**
     /**

+ 2 - 10
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendUserCouponController.java

@@ -22,14 +22,12 @@ import com.fuint.repository.model.*;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
@@ -43,45 +41,39 @@ import java.util.*;
  */
  */
 @Api(tags="管理端-会员卡券统计相关接口")
 @Api(tags="管理端-会员卡券统计相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/userCoupon")
 @RequestMapping(value = "/backendApi/userCoupon")
 public class BackendUserCouponController extends BaseController {
 public class BackendUserCouponController extends BaseController {
 
 
     private static final Logger logger = LoggerFactory.getLogger(BackendUserCouponController.class);
     private static final Logger logger = LoggerFactory.getLogger(BackendUserCouponController.class);
 
 
-    @Resource
     private MtUserCouponMapper mtUserCouponMapper;
     private MtUserCouponMapper mtUserCouponMapper;
 
 
-    @Resource
     private MtSendLogMapper mtSendLogMapper;
     private MtSendLogMapper mtSendLogMapper;
 
 
     /**
     /**
      * 卡券分组服务接口
      * 卡券分组服务接口
      */
      */
-    @Autowired
     private UserCouponService userCouponService;
     private UserCouponService userCouponService;
 
 
     /**
     /**
      * 卡券服务接口
      * 卡券服务接口
      */
      */
-    @Autowired
     private CouponService couponService;
     private CouponService couponService;
 
 
     /**
     /**
      * 店铺接口
      * 店铺接口
      */
      */
-    @Autowired
     private StoreService storeService;
     private StoreService storeService;
 
 
     /**
     /**
      * 后台用户接口
      * 后台用户接口
      * */
      * */
-    @Autowired
     private AccountService accountService;
     private AccountService accountService;
 
 
     /**
     /**
      * 卡券发放记录接口
      * 卡券发放记录接口
      * */
      * */
-    @Autowired
     private SendLogService sendLogService;
     private SendLogService sendLogService;
 
 
     /**
     /**

+ 2 - 2
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendUserGradeController.java

@@ -17,7 +17,7 @@ import com.fuint.repository.model.MtUserGrade;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
@@ -35,13 +35,13 @@ import java.util.Map;
  */
  */
 @Api(tags="管理端-会员等级相关接口")
 @Api(tags="管理端-会员等级相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/backendApi/userGrade")
 @RequestMapping(value = "/backendApi/userGrade")
 public class BackendUserGradeController extends BaseController {
 public class BackendUserGradeController extends BaseController {
 
 
     /**
     /**
      * 会员等级服务接口
      * 会员等级服务接口
      */
      */
-    @Autowired
     private UserGradeService userGradeService;
     private UserGradeService userGradeService;
 
 
     /**
     /**

+ 2 - 4
fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientAddressController.java

@@ -17,11 +17,10 @@ import com.fuint.repository.model.MtRegion;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.InvocationTargetException;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashMap;
@@ -36,16 +35,15 @@ import java.util.Map;
  */
  */
 @Api(tags="会员端-收货地址相关接口")
 @Api(tags="会员端-收货地址相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/clientApi/address")
 @RequestMapping(value = "/clientApi/address")
 public class ClientAddressController extends BaseController {
 public class ClientAddressController extends BaseController {
 
 
-    @Resource
     private MtRegionMapper mtRegionMapper;
     private MtRegionMapper mtRegionMapper;
 
 
     /**
     /**
      * 收货地址服务接口
      * 收货地址服务接口
      * */
      * */
-    @Autowired
     private AddressService addressService;
     private AddressService addressService;
 
 
     /**
     /**

+ 4 - 7
fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientArticleController.java

@@ -15,11 +15,9 @@ import com.fuint.repository.mapper.MtArticleMapper;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.InvocationTargetException;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map;
 
 
@@ -31,18 +29,17 @@ import java.util.Map;
  */
  */
 @Api(tags="会员端-文章相关接口")
 @Api(tags="会员端-文章相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/clientApi/article")
 @RequestMapping(value = "/clientApi/article")
 public class ClientArticleController extends BaseController {
 public class ClientArticleController extends BaseController {
 
 
+    private MtArticleMapper articleMapper;
+
     /**
     /**
      * 文章服务接口
      * 文章服务接口
      * */
      * */
-    @Autowired
     private ArticleService articleService;
     private ArticleService articleService;
 
 
-    @Resource
-    private MtArticleMapper articleMapper;
-
     /**
     /**
      * 获取文章列表
      * 获取文章列表
      */
      */

+ 2 - 7
fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientBalanceController.java

@@ -18,7 +18,7 @@ import com.fuint.repository.model.MtSetting;
 import com.fuint.repository.model.MtUser;
 import com.fuint.repository.model.MtUser;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
@@ -35,43 +35,38 @@ import java.util.Map;
  */
  */
 @Api(tags="会员端-余额相关接口")
 @Api(tags="会员端-余额相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/clientApi/balance")
 @RequestMapping(value = "/clientApi/balance")
 public class ClientBalanceController extends BaseController {
 public class ClientBalanceController extends BaseController {
 
 
     /**
     /**
      * 配置服务接口
      * 配置服务接口
      * */
      * */
-    @Autowired
     private SettingService settingService;
     private SettingService settingService;
 
 
     /**
     /**
      * 余额服务接口
      * 余额服务接口
      * */
      * */
-    @Autowired
     private BalanceService balanceService;
     private BalanceService balanceService;
 
 
     /**
     /**
      * 支付服务接口
      * 支付服务接口
      * */
      * */
-    @Autowired
     private PaymentService paymentService;
     private PaymentService paymentService;
 
 
     /**
     /**
      * 订单服务接口
      * 订单服务接口
      * */
      * */
-    @Autowired
     private OrderService orderService;
     private OrderService orderService;
 
 
     /**
     /**
      * 会员服务接口
      * 会员服务接口
      */
      */
-    @Autowired
     private MemberService memberService;
     private MemberService memberService;
 
 
     /**
     /**
      * 商户服务接口
      * 商户服务接口
      */
      */
-    @Autowired
     private MerchantService merchantService;
     private MerchantService merchantService;
 
 
     /**
     /**

+ 2 - 2
fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientCaptchaController.java

@@ -6,8 +6,8 @@ import com.fuint.framework.web.ResponseObject;
 import com.fuint.common.util.Base64Util;
 import com.fuint.common.util.Base64Util;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
 import javax.imageio.ImageIO;
 import javax.imageio.ImageIO;
 import java.io.ByteArrayOutputStream;
 import java.io.ByteArrayOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
@@ -26,13 +26,13 @@ import java.util.UUID;
  */
  */
 @Api(tags="会员端-图形验证码相关接口")
 @Api(tags="会员端-图形验证码相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping("/clientApi/captcha")
 @RequestMapping("/clientApi/captcha")
 public class ClientCaptchaController extends BaseController {
 public class ClientCaptchaController extends BaseController {
 
 
     /**
     /**
      * 图形验证码服务接口
      * 图形验证码服务接口
      * */
      * */
-    @Resource
     private CaptchaService captchaService;
     private CaptchaService captchaService;
 
 
     @ApiOperation(value = "获取图形验证码")
     @ApiOperation(value = "获取图形验证码")

+ 2 - 9
fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientCartController.java

@@ -20,10 +20,8 @@ import com.fuint.repository.model.MtUser;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashMap;
@@ -38,40 +36,35 @@ import java.util.Map;
  */
  */
 @Api(tags="会员端-购物车相关接口")
 @Api(tags="会员端-购物车相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/clientApi/cart")
 @RequestMapping(value = "/clientApi/cart")
 public class ClientCartController extends BaseController {
 public class ClientCartController extends BaseController {
 
 
-    @Resource
     private MtGoodsSkuMapper mtGoodsSkuMapper;
     private MtGoodsSkuMapper mtGoodsSkuMapper;
 
 
     /**
     /**
      * 购物车服务接口
      * 购物车服务接口
      * */
      * */
-    @Autowired
     private CartService cartService;
     private CartService cartService;
 
 
     /**
     /**
      * 订单服务接口
      * 订单服务接口
      * */
      * */
-    @Autowired
     private OrderService orderService;
     private OrderService orderService;
 
 
     /**
     /**
      * 商品服务接口
      * 商品服务接口
      * */
      * */
-    @Autowired
     private GoodsService goodsService;
     private GoodsService goodsService;
 
 
     /**
     /**
      * 会员接口
      * 会员接口
      * */
      * */
-    @Autowired
     private MemberService memberService;
     private MemberService memberService;
 
 
     /**
     /**
      * 商户服务接口
      * 商户服务接口
      */
      */
-    @Autowired
     private MerchantService merchantService;
     private MerchantService merchantService;
 
 
     /**
     /**

+ 2 - 4
fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientCashierController.java

@@ -10,9 +10,8 @@ import com.fuint.repository.model.MtUser;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map;
@@ -25,19 +24,18 @@ import java.util.Map;
  */
  */
 @Api(tags="会员端-收银台相关接口")
 @Api(tags="会员端-收银台相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/clientApi/cashier")
 @RequestMapping(value = "/clientApi/cashier")
 public class ClientCashierController extends BaseController {
 public class ClientCashierController extends BaseController {
 
 
     /**
     /**
      * 会员服务接口
      * 会员服务接口
      * */
      * */
-    @Autowired
     private MemberService memberService;
     private MemberService memberService;
 
 
     /**
     /**
      * 商户服务接口
      * 商户服务接口
      */
      */
-    @Autowired
     private MerchantService merchantService;
     private MerchantService merchantService;
 
 
     /**
     /**

+ 2 - 6
fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientConfirmController.java

@@ -18,9 +18,8 @@ import com.fuint.repository.model.MtUserCoupon;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.HashMap;
@@ -35,28 +34,25 @@ import java.util.List;
  */
  */
 @Api(tags="会员端-卡券核销相关接口")
 @Api(tags="会员端-卡券核销相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/clientApi/confirm")
 @RequestMapping(value = "/clientApi/confirm")
 public class ClientConfirmController extends BaseController {
 public class ClientConfirmController extends BaseController {
 
 
-    @Resource
     private MtUserCouponMapper mtUserCouponMapper;
     private MtUserCouponMapper mtUserCouponMapper;
 
 
     /**
     /**
      * 卡券服务接口
      * 卡券服务接口
      */
      */
-    @Autowired
     private CouponService couponService;
     private CouponService couponService;
 
 
     /**
     /**
      * 员工服务接口
      * 员工服务接口
      * */
      * */
-    @Autowired
     private StaffService staffService;
     private StaffService staffService;
 
 
     /**
     /**
      * 会员服务接口
      * 会员服务接口
      */
      */
-    @Autowired
     private MemberService memberService;
     private MemberService memberService;
 
 
     /**
     /**

+ 2 - 7
fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientCouponController.java

@@ -21,10 +21,9 @@ import com.fuint.repository.model.MtUserCoupon;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
 import java.util.HashMap;
@@ -39,34 +38,30 @@ import java.util.List;
  */
  */
 @Api(tags="会员端-卡券相关接口")
 @Api(tags="会员端-卡券相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/clientApi/coupon")
 @RequestMapping(value = "/clientApi/coupon")
 public class ClientCouponController extends BaseController {
 public class ClientCouponController extends BaseController {
 
 
-    @Resource
     private MtUserCouponMapper mtUserCouponMapper;
     private MtUserCouponMapper mtUserCouponMapper;
 
 
     /**
     /**
      * 卡券服务接口
      * 卡券服务接口
      */
      */
-    @Autowired
     private CouponService couponService;
     private CouponService couponService;
 
 
     /**
     /**
      * 会员卡券服务接口
      * 会员卡券服务接口
      * */
      * */
-    @Autowired
     private UserCouponService userCouponService;
     private UserCouponService userCouponService;
 
 
     /**
     /**
      * 系统设置服务接口
      * 系统设置服务接口
      * */
      * */
-    @Autowired
     private SettingService settingService;
     private SettingService settingService;
 
 
     /**
     /**
      * 商户服务接口
      * 商户服务接口
      */
      */
-    @Autowired
     private MerchantService merchantService;
     private MerchantService merchantService;
 
 
     /**
     /**

+ 5 - 3
fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientFileController.java

@@ -10,9 +10,9 @@ import com.fuint.utils.StringUtil;
 import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSS;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.Environment;
 import org.springframework.util.ResourceUtils;
 import org.springframework.util.ResourceUtils;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.CrossOrigin;
@@ -37,18 +37,20 @@ import java.util.UUID;
  */
  */
 @Api(tags="会员端-文件上传相关接口")
 @Api(tags="会员端-文件上传相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/clientApi/file")
 @RequestMapping(value = "/clientApi/file")
 public class ClientFileController extends BaseController {
 public class ClientFileController extends BaseController {
 
 
     private static final Logger logger = LoggerFactory.getLogger(ClientFileController.class);
     private static final Logger logger = LoggerFactory.getLogger(ClientFileController.class);
 
 
-    @Autowired
+    /**
+     * 系统环境变量
+     * */
     private Environment env;
     private Environment env;
 
 
     /**
     /**
      * 系统设置服务接口
      * 系统设置服务接口
      * */
      * */
-    @Autowired
     private SettingService settingService;
     private SettingService settingService;
 
 
     /**
     /**

+ 2 - 3
fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientGiveController.java

@@ -17,7 +17,7 @@ import com.fuint.repository.model.MtUser;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.HashMap;
@@ -31,19 +31,18 @@ import java.util.Map;
  */
  */
 @Api(tags="会员端-卡券转赠相关接口")
 @Api(tags="会员端-卡券转赠相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/clientApi/give")
 @RequestMapping(value = "/clientApi/give")
 public class ClientGiveController extends BaseController {
 public class ClientGiveController extends BaseController {
 
 
     /**
     /**
      * 转赠服务接口
      * 转赠服务接口
      */
      */
-    @Autowired
     private GiveService giveService;
     private GiveService giveService;
 
 
     /**
     /**
      * 会员服务接口
      * 会员服务接口
      * */
      * */
-    @Autowired
     private MemberService memberService;
     private MemberService memberService;
 
 
     /**
     /**

+ 2 - 5
fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientGoodsController.java

@@ -22,7 +22,7 @@ import com.fuint.repository.model.MtGoodsSpec;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.InvocationTargetException;
@@ -39,31 +39,28 @@ import java.util.Map;
  */
  */
 @Api(tags="会员端-商品相关接口")
 @Api(tags="会员端-商品相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/clientApi/goodsApi")
 @RequestMapping(value = "/clientApi/goodsApi")
 public class ClientGoodsController extends BaseController {
 public class ClientGoodsController extends BaseController {
 
 
     /**
     /**
      * 商品服务接口
      * 商品服务接口
      * */
      * */
-    @Autowired
     private GoodsService goodsService;
     private GoodsService goodsService;
 
 
     /**
     /**
      * 商品类别服务接口
      * 商品类别服务接口
      * */
      * */
-    @Autowired
     private CateService cateService;
     private CateService cateService;
 
 
     /**
     /**
      * 系统设置服务接口
      * 系统设置服务接口
      * */
      * */
-    @Autowired
     private SettingService settingService;
     private SettingService settingService;
 
 
     /**
     /**
      * 商户服务接口
      * 商户服务接口
      */
      */
-    @Autowired
     private MerchantService merchantService;
     private MerchantService merchantService;
 
 
     /**
     /**

+ 2 - 4
fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientMessageController.java

@@ -15,7 +15,7 @@ import com.fuint.repository.model.MtSetting;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 import java.util.*;
@@ -28,25 +28,23 @@ import java.util.*;
  */
  */
 @Api(tags="会员端-消息相关接口")
 @Api(tags="会员端-消息相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/clientApi/message")
 @RequestMapping(value = "/clientApi/message")
 public class ClientMessageController extends BaseController {
 public class ClientMessageController extends BaseController {
 
 
     /**
     /**
      * 消息服务接口
      * 消息服务接口
      */
      */
-    @Autowired
     private MessageService messageService;
     private MessageService messageService;
 
 
     /**
     /**
      * 配置服务接口
      * 配置服务接口
      * */
      * */
-    @Autowired
     private SettingService settingService;
     private SettingService settingService;
 
 
     /**
     /**
      * 商户服务接口
      * 商户服务接口
      */
      */
-    @Autowired
     private MerchantService merchantService;
     private MerchantService merchantService;
 
 
     /**
     /**

+ 2 - 3
fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientMyCouponController.java

@@ -12,7 +12,7 @@ import com.fuint.repository.model.MtUserCoupon;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.HashMap;
@@ -26,19 +26,18 @@ import java.util.Map;
  */
  */
 @Api(tags="会员端-我的卡券相关接口")
 @Api(tags="会员端-我的卡券相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/clientApi/myCoupon")
 @RequestMapping(value = "/clientApi/myCoupon")
 public class ClientMyCouponController extends BaseController {
 public class ClientMyCouponController extends BaseController {
 
 
     /**
     /**
      * 卡券服务接口
      * 卡券服务接口
      */
      */
-    @Autowired
     private CouponService couponService;
     private CouponService couponService;
 
 
     /**
     /**
      * 会员卡券服务接口
      * 会员卡券服务接口
      * */
      * */
-    @Autowired
     private UserCouponService userCouponService;
     private UserCouponService userCouponService;
 
 
     /**
     /**

+ 2 - 2
fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientOrderController.java

@@ -15,7 +15,7 @@ import com.fuint.repository.model.MtOrder;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.HashMap;
@@ -30,13 +30,13 @@ import java.util.Map;
  */
  */
 @Api(tags="会员端-订单相关接口")
 @Api(tags="会员端-订单相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/clientApi/order")
 @RequestMapping(value = "/clientApi/order")
 public class ClientOrderController extends BaseController {
 public class ClientOrderController extends BaseController {
 
 
     /**
     /**
      * 订单服务接口
      * 订单服务接口
      * */
      * */
-    @Autowired
     private OrderService orderService;
     private OrderService orderService;
 
 
     /**
     /**

+ 3 - 4
fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientPageController.java

@@ -9,7 +9,7 @@ import com.fuint.framework.web.ResponseObject;
 import com.fuint.repository.model.MtBanner;
 import com.fuint.repository.model.MtBanner;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.HashMap;
@@ -24,19 +24,18 @@ import java.util.Map;
  */
  */
 @Api(tags="会员端-页面相关接口")
 @Api(tags="会员端-页面相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/clientApi/page")
 @RequestMapping(value = "/clientApi/page")
 public class ClientPageController extends BaseController {
 public class ClientPageController extends BaseController {
 
 
     /**
     /**
-     * Banner服务接口
+     * 焦点图服务接口
      * */
      * */
-    @Autowired
     private BannerService bannerService;
     private BannerService bannerService;
 
 
     /**
     /**
      * 商户服务接口
      * 商户服务接口
      */
      */
-    @Autowired
     private MerchantService merchantService;
     private MerchantService merchantService;
 
 
     /**
     /**

+ 3 - 12
fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientPayController.java

@@ -18,7 +18,7 @@ import com.ijpay.core.kit.WxPayKit;
 import com.ijpay.wxpay.WxPayApiConfigKit;
 import com.ijpay.wxpay.WxPayApiConfigKit;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
@@ -38,66 +38,57 @@ import java.util.Map;
  */
  */
 @Api(tags="会员端-支付相关接口")
 @Api(tags="会员端-支付相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/clientApi/pay")
 @RequestMapping(value = "/clientApi/pay")
 public class ClientPayController extends BaseController {
 public class ClientPayController extends BaseController {
 
 
     private static final Logger logger = LoggerFactory.getLogger(ClientPayController.class);
     private static final Logger logger = LoggerFactory.getLogger(ClientPayController.class);
 
 
-    @Autowired
     WxPayBean wxPayBean;
     WxPayBean wxPayBean;
 
 
     /**
     /**
      * 微信服务接口
      * 微信服务接口
      * */
      * */
-    @Autowired
     private WeixinService weixinService;
     private WeixinService weixinService;
 
 
     /**
     /**
      * 支付宝服务接口
      * 支付宝服务接口
      * */
      * */
-    @Autowired
     private AlipayService alipayService;
     private AlipayService alipayService;
 
 
     /**
     /**
      * 支付服务接口
      * 支付服务接口
      * */
      * */
-    @Autowired
     private PaymentService paymentService;
     private PaymentService paymentService;
 
 
     /**
     /**
      * 订单服务接口
      * 订单服务接口
      * */
      * */
-    @Autowired
     private OrderService orderService;
     private OrderService orderService;
 
 
     /**
     /**
      * 会员服务接口
      * 会员服务接口
      * */
      * */
-    @Autowired
     private MemberService memberService;
     private MemberService memberService;
 
 
     /**
     /**
      * 系统设置接口
      * 系统设置接口
      * */
      * */
-    @Autowired
     private SettingService settingService;
     private SettingService settingService;
 
 
     /**
     /**
      * 会员卡券接口
      * 会员卡券接口
      * */
      * */
-    @Autowired
     private UserCouponService userCouponService;
     private UserCouponService userCouponService;
 
 
     /**
     /**
      * 会员等级接口
      * 会员等级接口
      * */
      * */
-    @Autowired
-    UserGradeService userGradeService;
+    private UserGradeService userGradeService;
 
 
     /**
     /**
      * 商户服务接口
      * 商户服务接口
      */
      */
-    @Autowired
     private MerchantService merchantService;
     private MerchantService merchantService;
 
 
     /**
     /**

+ 2 - 2
fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientPointsController.java

@@ -14,7 +14,7 @@ import com.fuint.framework.web.ResponseObject;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.HashMap;
@@ -28,13 +28,13 @@ import java.util.Map;
  */
  */
 @Api(tags="会员端-积分相关接口")
 @Api(tags="会员端-积分相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/clientApi/points")
 @RequestMapping(value = "/clientApi/points")
 public class ClientPointsController extends BaseController {
 public class ClientPointsController extends BaseController {
 
 
     /**
     /**
      * 积分服务接口
      * 积分服务接口
      */
      */
-    @Autowired
     private PointService pointService;
     private PointService pointService;
 
 
     /**
     /**

+ 2 - 3
fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientRefundController.java

@@ -14,7 +14,7 @@ import com.fuint.repository.model.MtRefund;
 import com.fuint.utils.StringUtil;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.HashMap;
@@ -28,19 +28,18 @@ import java.util.Map;
  */
  */
 @Api(tags="会员端-售后相关接口")
 @Api(tags="会员端-售后相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/clientApi/refund")
 @RequestMapping(value = "/clientApi/refund")
 public class ClientRefundController extends BaseController {
 public class ClientRefundController extends BaseController {
 
 
     /**
     /**
      * 售后服务接口
      * 售后服务接口
      * */
      * */
-    @Autowired
     private RefundService refundService;
     private RefundService refundService;
 
 
     /**
     /**
      * 订单服务接口
      * 订单服务接口
      * */
      * */
-    @Autowired
     private OrderService orderService;
     private OrderService orderService;
 
 
     /**
     /**

+ 2 - 3
fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientRegionController.java

@@ -9,9 +9,8 @@ import com.fuint.repository.mapper.MtRegionMapper;
 import com.fuint.repository.model.MtRegion;
 import com.fuint.repository.model.MtRegion;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashMap;
@@ -26,10 +25,10 @@ import java.util.Map;
  */
  */
 @Api(tags="会员端-省/市/区相关接口")
 @Api(tags="会员端-省/市/区相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/clientApi/region")
 @RequestMapping(value = "/clientApi/region")
 public class ClientRegionController extends BaseController {
 public class ClientRegionController extends BaseController {
 
 
-    @Resource
     private MtRegionMapper mtRegionMapper;
     private MtRegionMapper mtRegionMapper;
 
 
     /**
     /**

+ 2 - 2
fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientSettlementController.java

@@ -7,7 +7,7 @@ import com.fuint.framework.web.BaseController;
 import com.fuint.framework.web.ResponseObject;
 import com.fuint.framework.web.ResponseObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 import java.util.Map;
@@ -20,13 +20,13 @@ import java.util.Map;
  */
  */
 @Api(tags="会员端-订单结算相关接口")
 @Api(tags="会员端-订单结算相关接口")
 @RestController
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "/clientApi/settlement")
 @RequestMapping(value = "/clientApi/settlement")
 public class ClientSettlementController extends BaseController {
 public class ClientSettlementController extends BaseController {
 
 
     /**
     /**
      * 订单接口
      * 订单接口
      * */
      * */
-    @Autowired
     private OrderService orderService;
     private OrderService orderService;
 
 
     /**
     /**

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů