diff --git a/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionBuyerController.java index d434ef12..82cac667 100644 --- a/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionBuyerController.java @@ -27,17 +27,18 @@ import org.springframework.web.bind.annotation.*; @RestController @Api(tags = "买家端,分销员接口") @RequestMapping("/buyer/distribution") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class DistributionBuyerController { /** * 分销员 */ - private final DistributionService distributionService; + @Autowired + private DistributionService distributionService; /** * 分销员订单 */ - private final DistributionOrderService distributionOrderService; + @Autowired + private DistributionOrderService distributionOrderService; //申请分销员 @ApiOperation(value = "申请分销员") diff --git a/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionCashBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionCashBuyerController.java index d6038795..3801d30b 100644 --- a/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionCashBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionCashBuyerController.java @@ -10,7 +10,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -30,17 +29,18 @@ import javax.validation.constraints.NotNull; @RestController @Api(tags = "买家端,分销商品佣金提现接口") @RequestMapping("/buyer/distribution/cash") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class DistributionCashBuyerController { /** * 分销佣金 */ - private final DistributionCashService distributionCashService; + @Autowired + private DistributionCashService distributionCashService; /** * 分销员提现 */ - private final DistributionCashService distributorCashService; + @Autowired + private DistributionCashService distributorCashService; @ApiOperation(value = "分销员提现") diff --git a/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsBuyerController.java index b651ad41..811a4c0c 100644 --- a/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsBuyerController.java @@ -29,17 +29,18 @@ import javax.validation.constraints.NotNull; @RestController @Api(tags = "买家端,分销商品接口") @RequestMapping("/buyer/distributionGoods") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class DistributionGoodsBuyerController { /** * 分销商品 */ - private final DistributionGoodsService distributionGoodsService; + @Autowired + private DistributionGoodsService distributionGoodsService; /** * 选择分销商品 */ - private final DistributionSelectedGoodsService distributionSelectedGoodsService; + @Autowired + private DistributionSelectedGoodsService distributionSelectedGoodsService; @ApiOperation(value = "获取分销商商品列表") diff --git a/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionOrderBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionOrderBuyerController.java index 4f8585a5..f313316a 100644 --- a/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionOrderBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionOrderBuyerController.java @@ -25,17 +25,18 @@ import org.springframework.web.bind.annotation.RestController; @RestController @Api(tags = "买家端,分销订单接口") @RequestMapping("/buyer/distribution/order") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class DistributionOrderBuyerController { /** * 分销订单 */ - private final DistributionOrderService distributionOrderService; + @Autowired + private DistributionOrderService distributionOrderService; /** * 分销员 */ - private final DistributionService distributionService; + @Autowired + private DistributionService distributionService; @ApiOperation(value = "分销员订单") diff --git a/buyer-api/src/main/java/cn/lili/controller/goods/CategoryBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/goods/CategoryBuyerController.java index ced66375..e260756e 100644 --- a/buyer-api/src/main/java/cn/lili/controller/goods/CategoryBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/goods/CategoryBuyerController.java @@ -27,12 +27,12 @@ import java.util.List; @RestController @Api(tags = "买家端,商品分类接口") @RequestMapping("/buyer/category") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class CategoryBuyerController { /** * 商品分类 */ - private final CategoryService categoryService; + @Autowired + private CategoryService categoryService; @ApiOperation(value = "获取商品分类列表") @ApiImplicitParam(name = "parentId", value = "上级分类ID，全部分类为：0", required = true, dataType = "Long", paramType = "path") diff --git a/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java index 81d61d89..7bcf0eed 100644 --- a/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java @@ -42,25 +42,28 @@ import java.util.Map; @Api(tags = "买家端,商品接口") @RestController @RequestMapping("/buyer/goods") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class GoodsBuyerController { /** * 商品 */ - private final GoodsService goodsService; + @Autowired + private GoodsService goodsService; /** * 商品SKU */ - private final GoodsSkuService goodsSkuService; + @Autowired + private GoodsSkuService goodsSkuService; /** * ES商品搜索 */ - private final EsGoodsSearchService goodsSearchService; + @Autowired + private EsGoodsSearchService goodsSearchService; /** * 分销员 */ - private final DistributionService distributionService; + @Autowired + private DistributionService distributionService; @ApiOperation(value = "通过id获取商品信息") diff --git a/buyer-api/src/main/java/cn/lili/controller/member/CouponBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/CouponBuyerController.java index eb132dc4..a8fc69ac 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/CouponBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/CouponBuyerController.java @@ -33,18 +33,19 @@ import javax.validation.constraints.NotNull; @RestController @Api(tags = "买家端,买家优惠券接口") @RequestMapping("/buyer/promotion/coupon") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class CouponBuyerController { /** * 优惠券 */ - private final CouponService couponService; + @Autowired + private CouponService couponService; /** * 会员优惠券 */ - private final MemberCouponService memberCouponService; + @Autowired + private MemberCouponService memberCouponService; @GetMapping @ApiOperation(value = "获取可领取优惠券列表") diff --git a/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java b/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java index 1f42daa2..0fbc82b1 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java @@ -26,13 +26,13 @@ import java.util.List; @RestController @Api(tags = "买家端,浏览历史接口") @RequestMapping("/buyer/footprint") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class FootprintController { /** * 会员足迹 */ - private final FootprintService footprintService; + @Autowired + private FootprintService footprintService; @ApiOperation(value = "分页获取") @GetMapping diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java index c890b208..b9205af1 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java @@ -28,15 +28,16 @@ import javax.validation.Valid; @RestController @Api(tags = "买家端,会员地址接口") @RequestMapping("/buyer/memberAddress") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MemberAddressBuyerController { /** * 会员收件地址 */ - private final MemberAddressService memberAddressService; + @Autowired + private MemberAddressService memberAddressService; - private final RegionService regionService; + @Autowired + private RegionService regionService; @ApiOperation(value = "获取会员收件地址分页列表") @GetMapping diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberCollectionController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberCollectionController.java index 13065f9a..74198f4c 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberCollectionController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberCollectionController.java @@ -24,17 +24,18 @@ import javax.validation.constraints.NotNull; @RestController @Api(tags = "买家端,会员收藏接口") @RequestMapping("/buyer/member/collection") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MemberCollectionController { /** * 会员商品收藏 */ - private final GoodsCollectionService goodsCollectionService; + @Autowired + private GoodsCollectionService goodsCollectionService; /** * 会员店铺 */ - private final StoreCollectionService storeCollectionService; + @Autowired + private StoreCollectionService storeCollectionService; @ApiOperation(value = "查询会员收藏列表") @ApiImplicitParam(name = "type", value = "类型", dataType = "String", paramType = "path", example = "GOODS:商品,STORE:店铺") diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java index c30c6f63..771c0477 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java @@ -29,13 +29,13 @@ import javax.validation.constraints.NotNull; @RestController @Api(tags = "买家端,会员商品评价接口") @RequestMapping("/buyer/memberEvaluation") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MemberEvaluationBuyerController { /** * 会员商品评价 */ - private final MemberEvaluationService memberEvaluationService; + @Autowired + private MemberEvaluationService memberEvaluationService; @ApiOperation(value = "添加会员评价") @PostMapping diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberMessageBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberMessageBuyerController.java index 58b5c15f..5aedb6c3 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberMessageBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberMessageBuyerController.java @@ -24,13 +24,13 @@ import org.springframework.web.bind.annotation.*; @RestController @Api(tags = "买家端,会员站内消息接口") @RequestMapping("/buyer/member/message") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MemberMessageBuyerController { /** * 会员站内消息 */ - private final MemberMessageService memberMessageService; + @Autowired + private MemberMessageService memberMessageService; @ApiOperation(value = "分页获取会员站内消息") @GetMapping diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberReceiptController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberReceiptController.java index 6894b899..5d7d3b9c 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberReceiptController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberReceiptController.java @@ -25,10 +25,10 @@ import org.springframework.web.bind.annotation.*; @RestController @Api(tags = "买家端,会员发票接口") @RequestMapping("/buyer/member/receipt") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MemberReceiptController { - private final MemberReceiptService memberReceiptService; + @Autowired + private MemberReceiptService memberReceiptService; @ApiOperation(value = "查询会员发票列表") @GetMapping diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberSignBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberSignBuyerController.java index f6c091ae..828ff49e 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberSignBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberSignBuyerController.java @@ -24,10 +24,9 @@ import java.util.List; @RestController @Api(tags = "买家端，会员签到API") @RequestMapping("/buyer/members/sign") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MemberSignBuyerController { - - private final MemberSignService memberSignService; + @Autowired + private MemberSignService memberSignService; @PostMapping @ApiOperation(value = "会员签到") diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberWalletBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberWalletBuyerController.java index 10c21c7b..5427b389 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberWalletBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberWalletBuyerController.java @@ -36,21 +36,23 @@ import javax.validation.constraints.Pattern; @RestController @Api(tags = "买家端,会员余额接口") @RequestMapping("/buyer/members/wallet") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MemberWalletBuyerController { /** * 会员 */ - private final MemberService memberService; + @Autowired + private MemberService memberService; /** * 会员余额 */ - private final MemberWalletService memberWalletService; + @Autowired + private MemberWalletService memberWalletService; /** * 验证码 */ - private final VerificationService verificationService; + @Autowired + private VerificationService verificationService; @GetMapping @ApiOperation(value = "查询会员预存款余额") diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyBuyerController.java index 6ed9adec..34554935 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyBuyerController.java @@ -11,10 +11,11 @@ import cn.lili.modules.member.service.MemberWithdrawApplyService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** @@ -27,10 +28,9 @@ import org.springframework.web.bind.annotation.*; @Api(tags = "买家端,余额提现记录接口") @RequestMapping("/buyer/member/withdrawApply") @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MemberWithdrawApplyBuyerController { - - private final MemberWithdrawApplyService memberWithdrawApplyService; + @Autowired + private MemberWithdrawApplyService memberWithdrawApplyService; @ApiOperation(value = "分页获取提现记录") diff --git a/buyer-api/src/main/java/cn/lili/controller/member/PointsHistoryBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/PointsHistoryBuyerController.java index 505407b8..687aad7e 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/PointsHistoryBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/PointsHistoryBuyerController.java @@ -13,7 +13,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -28,10 +27,9 @@ import org.springframework.web.bind.annotation.RestController; @RestController @Api(tags = "买家端,会员积分历史接口") @RequestMapping("/buyer/member/memberPointsHistory") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class PointsHistoryBuyerController { - - private final MemberPointsHistoryService memberPointsHistoryService; + @Autowired + private MemberPointsHistoryService memberPointsHistoryService; @ApiOperation(value = "分页获取") @GetMapping(value = "/getByPage") diff --git a/buyer-api/src/main/java/cn/lili/controller/member/RechargeBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/RechargeBuyerController.java index dd7987ae..1d4d610b 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/RechargeBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/RechargeBuyerController.java @@ -27,7 +27,6 @@ import org.springframework.web.bind.annotation.RestController; @Api(tags = "买家端,预存款充值记录接口") @RequestMapping("/buyer/member/recharge") @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class RechargeBuyerController { @Autowired diff --git a/buyer-api/src/main/java/cn/lili/controller/member/ServiceNoticeBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/ServiceNoticeBuyerController.java index 66b7c54a..1089e903 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/ServiceNoticeBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/ServiceNoticeBuyerController.java @@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -27,13 +26,13 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/service/notice") @Api(tags = "买家端,会员站服务消息接口") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class ServiceNoticeBuyerController { /** * 服务消息 */ - private final ServiceNoticeService serviceNoticeService; + @Autowired + private ServiceNoticeService serviceNoticeService; @ApiOperation(value = "获取消息详情") @ApiImplicitParam(name = "id", value = "商品ID", required = true, dataType = "Long", paramType = "path") diff --git a/buyer-api/src/main/java/cn/lili/controller/other/ArticleBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/ArticleBuyerController.java index d3591e59..727021de 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/ArticleBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/ArticleBuyerController.java @@ -31,18 +31,19 @@ import java.util.List; @RestController @Api(tags = "买家端,文章接口") @RequestMapping("/buyer/article") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class ArticleBuyerController { /** * 文章 */ - private final ArticleService articleService; + @Autowired + private ArticleService articleService; /** * 文章分类 */ - private final ArticleCategoryService articleCategoryService; + @Autowired + private ArticleCategoryService articleCategoryService; @ApiOperation(value = "获取文章分类列表") @GetMapping(value = "/articleCategory/list") diff --git a/buyer-api/src/main/java/cn/lili/controller/other/FeedbackBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/FeedbackBuyerController.java index 9d1243ba..3e878b41 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/FeedbackBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/FeedbackBuyerController.java @@ -23,13 +23,13 @@ import org.springframework.web.bind.annotation.RestController; @RestController @Api(tags = "买家端,意见反馈接口") @RequestMapping("/buyer/feedback") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class FeedbackBuyerController { /** * 意见反馈 */ - private final FeedbackService feedbackService; + @Autowired + private FeedbackService feedbackService; @ApiOperation(value = "添加意见反馈") @PostMapping() diff --git a/buyer-api/src/main/java/cn/lili/controller/other/LogisticsBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/LogisticsBuyerController.java index 2e1c3010..c527e50a 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/LogisticsBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/LogisticsBuyerController.java @@ -23,10 +23,10 @@ import java.util.List; @RestController @Api(tags = "买家端,物流公司接口") @RequestMapping("/buyer/logistics") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class LogisticsBuyerController { - private final LogisticsService logisticsService; + @Autowired + private LogisticsService logisticsService; @ApiOperation(value = "分页获取物流公司") diff --git a/buyer-api/src/main/java/cn/lili/controller/other/PageBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/PageBuyerController.java index 0e424d96..1d7326de 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/PageBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/PageBuyerController.java @@ -24,13 +24,13 @@ import org.springframework.web.bind.annotation.RestController; @RestController @Api(tags = "买家端,页面接口") @RequestMapping("/buyer/pageData") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class PageBuyerController { /** * 页面管理 */ - private final PageDataService pageService; + @Autowired + private PageDataService pageService; @ApiOperation(value = "获取首页数据") @GetMapping("/getIndex") diff --git a/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java index ecee45fa..f990954a 100644 --- a/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java @@ -28,17 +28,14 @@ import javax.validation.constraints.NotNull; @RestController @Api(tags = "买家端,会员接口") @RequestMapping("/buyer/members") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MemberBuyerController { - /** - * 会员 - */ - private final MemberService memberService; - - private final SmsUtil smsUtil; - - private final VerificationService verificationService; + @Autowired + private MemberService memberService; + @Autowired + private SmsUtil smsUtil; + @Autowired + private VerificationService verificationService; @ApiOperation(value = "登录接口") diff --git a/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerBindController.java b/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerBindController.java index 4e357676..99cfb54a 100644 --- a/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerBindController.java +++ b/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerBindController.java @@ -23,10 +23,10 @@ import java.util.List; @RestController @Api(tags = "买家端,app/小程序 联合登录") @RequestMapping("/buyer/connect/bind") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class ConnectBuyerBindController { - private final ConnectService connectService; + @Autowired + private ConnectService connectService; @ApiOperation(value = "unionID 绑定") @ApiImplicitParams({ diff --git a/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java b/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java index 99588b3b..ab6c1f26 100644 --- a/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java +++ b/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java @@ -32,14 +32,16 @@ import java.io.IOException; @RestController @Api(tags = "买家端,web联合登录") @RequestMapping("/buyer/connect") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class ConnectBuyerWebController { - private final ConnectService connectService; + @Autowired + private ConnectService connectService; - private final MemberService memberService; + @Autowired + private MemberService memberService; - private final ConnectUtil connectUtil; + @Autowired + private ConnectUtil connectUtil; @GetMapping("/login/web/{type}") diff --git a/buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java index 2feadb82..0b996880 100644 --- a/buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java @@ -11,7 +11,6 @@ import cn.lili.modules.message.service.WechatMPMessageService; import cn.lili.modules.message.util.WechatMpCodeUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestHeader; @@ -29,14 +28,16 @@ import java.util.List; @RestController @RequestMapping("/buyer/mini-program") @Api(tags = "买家端,小程序登录接口") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MiniProgramBuyerController { - public final ConnectService connectService; - public final WechatMpCodeUtil wechatMpCodeUtil; - - public final WechatMPMessageService wechatMPMessageService; - public final ShortLinkService shortLinkService; + @Autowired + public ConnectService connectService; + @Autowired + public WechatMpCodeUtil wechatMpCodeUtil; + @Autowired + public WechatMPMessageService wechatMPMessageService; + @Autowired + public ShortLinkService shortLinkService; @GetMapping("/auto-login") @ApiOperation(value = "小程序自动登录") diff --git a/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java b/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java index 683b2c82..14da717c 100644 --- a/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java +++ b/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java @@ -13,7 +13,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -30,13 +29,12 @@ import javax.servlet.http.HttpServletResponse; @RestController @Api(tags = "买家端,收银台接口") @RequestMapping("/buyer/cashier") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class CashierController { - - private final CashierSupport cashierSupport; - - private final PaymentService paymentService; + @Autowired + private CashierSupport cashierSupport; + @Autowired + private PaymentService paymentService; @ApiImplicitParams({ diff --git a/buyer-api/src/main/java/cn/lili/controller/payment/CashierRefundController.java b/buyer-api/src/main/java/cn/lili/controller/payment/CashierRefundController.java index 3dbb41ff..1efa16a6 100644 --- a/buyer-api/src/main/java/cn/lili/controller/payment/CashierRefundController.java +++ b/buyer-api/src/main/java/cn/lili/controller/payment/CashierRefundController.java @@ -22,11 +22,10 @@ import javax.servlet.http.HttpServletRequest; @Api(tags = "买家端,退款回调") @RestController @RequestMapping("/buyer/cashier/refund") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class CashierRefundController { - - private final RefundSupport refundSupport; + @Autowired + private RefundSupport refundSupport; @ApiOperation(value = "退款通知") diff --git a/buyer-api/src/main/java/cn/lili/controller/promotion/PintuanBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/promotion/PintuanBuyerController.java index 9d8fb447..c9a65d03 100644 --- a/buyer-api/src/main/java/cn/lili/controller/promotion/PintuanBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/promotion/PintuanBuyerController.java @@ -33,12 +33,11 @@ import java.util.List; @Api(tags = "买家端,拼团接口") @RestController @RequestMapping("/buyer/promotion/pintuan") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class PintuanBuyerController { - - private final PromotionGoodsService promotionGoodsService; - - private final PintuanService pintuanService; + @Autowired + private PromotionGoodsService promotionGoodsService; + @Autowired + private PintuanService pintuanService; @ApiOperation(value = "获取拼团商品") @GetMapping diff --git a/buyer-api/src/main/java/cn/lili/controller/promotion/PointsGoodsBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/promotion/PointsGoodsBuyerController.java index f2ee1753..811c297f 100644 --- a/buyer-api/src/main/java/cn/lili/controller/promotion/PointsGoodsBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/promotion/PointsGoodsBuyerController.java @@ -11,7 +11,6 @@ import cn.lili.modules.promotion.service.PointsGoodsService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -26,12 +25,11 @@ import org.springframework.web.bind.annotation.RestController; @RestController @Api(tags = "买家端,积分商品接口") @RequestMapping("/buyer/promotion/pointsGoods") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class PointsGoodsBuyerController { - - private final PointsGoodsService pointsGoodsService; - - private final PointsGoodsCategoryService pointsGoodsCategoryService; + @Autowired + private PointsGoodsService pointsGoodsService; + @Autowired + private PointsGoodsCategoryService pointsGoodsCategoryService; @GetMapping @ApiOperation(value = "分页获取积分商品") diff --git a/buyer-api/src/main/java/cn/lili/controller/promotion/SeckillBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/promotion/SeckillBuyerController.java index 059c3514..7e9d47aa 100644 --- a/buyer-api/src/main/java/cn/lili/controller/promotion/SeckillBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/promotion/SeckillBuyerController.java @@ -7,7 +7,6 @@ import cn.lili.modules.promotion.entity.vos.SeckillTimelineVO; import cn.lili.modules.promotion.service.SeckillApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -26,13 +25,13 @@ import java.util.List; @Api(tags = "买家端,限时抢购接口") @RestController @RequestMapping("/buyer/promotion/seckill") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class SeckillBuyerController { /** * 限时抢购 */ - private final SeckillApplyService seckillApplyService; + @Autowired + private SeckillApplyService seckillApplyService; @ApiOperation(value = "获取当天限时抢购信息") @GetMapping diff --git a/buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseBuyerController.java index 05bea31a..f62b9756 100644 --- a/buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseBuyerController.java @@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -27,13 +26,13 @@ import javax.validation.constraints.NotNull; @Api(tags = "买家端,采购接口") @RestController @RequestMapping("/buyer/purchase") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class PurchaseBuyerController { /** * 采购单 */ - private final PurchaseOrderService purchaseOrderService; + @Autowired + private PurchaseOrderService purchaseOrderService; @ApiOperation(value = "添加采购单") @PostMapping diff --git a/buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseQuotedController.java b/buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseQuotedController.java index 3642a66f..b107faa9 100644 --- a/buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseQuotedController.java +++ b/buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseQuotedController.java @@ -8,7 +8,6 @@ import cn.lili.modules.purchase.service.PurchaseQuotedService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -24,13 +23,13 @@ import java.util.List; @Api(tags = "买家端,采购报价接口") @RestController @RequestMapping("/buyer/purchaseQuoted") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class PurchaseQuotedController { /** * 采购单报价 */ - private final PurchaseQuotedService purchaseQuotedService; + @Autowired + private PurchaseQuotedService purchaseQuotedService; @ApiOperation(value = "添加采购单报价") @PostMapping diff --git a/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java index 5289e4d5..01609e26 100644 --- a/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java @@ -19,7 +19,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -36,21 +35,23 @@ import java.util.List; @RestController @RequestMapping("/buyer/store") @Api(tags = "买家端,店铺接口") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class StoreBuyerController { /** * 店铺 */ - private final StoreService storeService; + @Autowired + private StoreService storeService; /** * 店铺商品分类 */ - private final StoreGoodsLabelService storeGoodsLabelService; + @Autowired + private StoreGoodsLabelService storeGoodsLabelService; /** * 店铺详情 */ - private final StoreDetailService storeDetailService; + @Autowired + private StoreDetailService storeDetailService; @ApiOperation(value = "获取店铺列表分页") @GetMapping diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/AfterSaleBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/trade/AfterSaleBuyerController.java index 6f913497..f6f89f7d 100644 --- a/buyer-api/src/main/java/cn/lili/controller/trade/AfterSaleBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/trade/AfterSaleBuyerController.java @@ -8,17 +8,16 @@ import cn.lili.modules.order.order.entity.dto.AfterSaleDTO; import cn.lili.modules.order.order.entity.vo.AfterSaleApplyVO; import cn.lili.modules.order.order.entity.vo.AfterSaleSearchParams; import cn.lili.modules.order.order.entity.vo.AfterSaleVO; +import cn.lili.modules.order.order.service.AfterSaleLogService; import cn.lili.modules.order.order.service.AfterSaleReasonService; import cn.lili.modules.order.order.service.AfterSaleService; -import cn.lili.modules.store.entity.dto.StoreAfterSaleAddressDTO; import cn.lili.modules.order.trade.entity.dos.AfterSaleLog; -import cn.lili.modules.order.order.service.AfterSaleLogService; +import cn.lili.modules.store.entity.dto.StoreAfterSaleAddressDTO; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.*; @@ -36,23 +35,23 @@ import java.util.List; @RestController @Api(tags = "买家端,售后管理接口") @RequestMapping("/buyer/afterSale") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class AfterSaleBuyerController { /** * 售后 */ - private final AfterSaleService afterSaleService; - + @Autowired + private AfterSaleService afterSaleService; /** * 售后原因 */ - private final AfterSaleReasonService afterSaleReasonService; - + @Autowired + private AfterSaleReasonService afterSaleReasonService; /** * 售后日志 */ - private final AfterSaleLogService afterSaleLogService; + @Autowired + private AfterSaleLogService afterSaleLogService; @ApiOperation(value = "查看售后服务详情") @ApiImplicitParam(name = "sn", value = "售后单号", required = true, paramType = "path") diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/CartController.java b/buyer-api/src/main/java/cn/lili/controller/trade/CartController.java index 22d2ea00..97b93cae 100644 --- a/buyer-api/src/main/java/cn/lili/controller/trade/CartController.java +++ b/buyer-api/src/main/java/cn/lili/controller/trade/CartController.java @@ -32,13 +32,13 @@ import javax.validation.constraints.NotNull; @RestController @Api(tags = "买家端，购物车接口") @RequestMapping("/buyer/trade/carts") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class CartController { /** * 购物车 */ - private final CartService cartService; + @Autowired + private CartService cartService; @ApiOperation(value = "向购物车中添加一个产品") diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/OrderBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/trade/OrderBuyerController.java index 77c3958a..8df051d6 100644 --- a/buyer-api/src/main/java/cn/lili/controller/trade/OrderBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/trade/OrderBuyerController.java @@ -33,13 +33,13 @@ import javax.validation.constraints.NotNull; @RestController @Api(tags = "买家端,订单接口") @RequestMapping("/buyer/orders") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class OrderBuyerController { /** * 订单 */ - private final OrderService orderService; + @Autowired + private OrderService orderService; @ApiOperation(value = "查询会员订单列表") @GetMapping diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/OrderComplaintBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/trade/OrderComplaintBuyerController.java index 482e7c89..ec696269 100644 --- a/buyer-api/src/main/java/cn/lili/controller/trade/OrderComplaintBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/trade/OrderComplaintBuyerController.java @@ -19,7 +19,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -34,18 +33,19 @@ import javax.validation.Valid; @RestController @Api(tags = "买家端,交易投诉接口") @RequestMapping("/buyer/complain") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class OrderComplaintBuyerController { /** * 交易投诉 */ - private final OrderComplaintService orderComplaintService; + @Autowired + private OrderComplaintService orderComplaintService; /** * 交易投诉沟通 */ - private final OrderComplaintCommunicationService orderComplaintCommunicationService; + @Autowired + private OrderComplaintCommunicationService orderComplaintCommunicationService; @ApiOperation(value = "通过id获取") diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/ReceiptBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/trade/ReceiptBuyerController.java index 000cf305..fddbfb6c 100644 --- a/buyer-api/src/main/java/cn/lili/controller/trade/ReceiptBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/trade/ReceiptBuyerController.java @@ -10,7 +10,6 @@ import cn.lili.modules.order.order.service.ReceiptService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,10 +24,10 @@ import javax.validation.Valid; @RestController @Api(tags = "买家端,发票接口") @RequestMapping("/buyer/trade/receipt") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class ReceiptBuyerController { - private final ReceiptService receiptService; + @Autowired + private ReceiptService receiptService; @ApiOperation(value = "获取发票详情") @GetMapping("/{id}") diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/RechargeTradeBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/trade/RechargeTradeBuyerController.java index cc98621c..ba06143c 100644 --- a/buyer-api/src/main/java/cn/lili/controller/trade/RechargeTradeBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/trade/RechargeTradeBuyerController.java @@ -8,7 +8,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.PostMapping; @@ -28,10 +27,10 @@ import javax.validation.constraints.Min; @Api(tags = "买家端,预存款充值记录接口") @RequestMapping("/buyer/trade/recharge") @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class RechargeTradeBuyerController { - private final RechargeService rechargeService; + @Autowired + private RechargeService rechargeService; @PostMapping @ApiOperation(value = "创建余额充值订单") diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/WalletLogBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/trade/WalletLogBuyerController.java index 0b7f7eca..5e4aa674 100644 --- a/buyer-api/src/main/java/cn/lili/controller/trade/WalletLogBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/trade/WalletLogBuyerController.java @@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -27,10 +26,10 @@ import org.springframework.web.bind.annotation.RestController; @RestController @Api(tags = "买家端,预存款变动日志记录接口") @RequestMapping("/buyer/wallet/log") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class WalletLogBuyerController { - private final WalletLogService walletLogService; + @Autowired + private WalletLogService walletLogService; @ApiOperation(value = "分页获取预存款变动日志") @GetMapping diff --git a/buyer-api/src/main/java/cn/lili/security/BuyerAuthenticationFilter.java b/buyer-api/src/main/java/cn/lili/security/BuyerAuthenticationFilter.java index 6aa98c77..71fddde1 100755 --- a/buyer-api/src/main/java/cn/lili/security/BuyerAuthenticationFilter.java +++ b/buyer-api/src/main/java/cn/lili/security/BuyerAuthenticationFilter.java @@ -13,6 +13,7 @@ import io.jsonwebtoken.Claims; import io.jsonwebtoken.ExpiredJwtException; import io.jsonwebtoken.Jwts; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.GrantedAuthority; @@ -45,7 +46,8 @@ public class BuyerAuthenticationFilter extends BasicAuthenticationFilter { /** * 缓存 */ - private final Cache cache; + @Autowired + private Cache cache; /** * 自定义构造器 diff --git a/buyer-api/src/main/java/cn/lili/security/BuyerSecurityConfig.java b/buyer-api/src/main/java/cn/lili/security/BuyerSecurityConfig.java index eda49b97..81815fe9 100644 --- a/buyer-api/src/main/java/cn/lili/security/BuyerSecurityConfig.java +++ b/buyer-api/src/main/java/cn/lili/security/BuyerSecurityConfig.java @@ -4,7 +4,6 @@ import cn.lili.common.cache.Cache; import cn.lili.common.security.CustomAccessDeniedHandler; import cn.lili.common.utils.SpringContextUtil; import cn.lili.config.properties.IgnoredUrlsProperties; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; @@ -27,23 +26,22 @@ import org.springframework.web.cors.CorsConfigurationSource; @Slf4j @Configuration @EnableGlobalMethodSecurity(prePostEnabled = true) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class BuyerSecurityConfig extends WebSecurityConfigurerAdapter { /** * 忽略验权配置 */ - private final IgnoredUrlsProperties ignoredUrlsProperties; - - + @Autowired + private IgnoredUrlsProperties ignoredUrlsProperties; /** * spring security -》 权限不足处理 */ - private final CustomAccessDeniedHandler accessDeniedHandler; + @Autowired + private CustomAccessDeniedHandler accessDeniedHandler; - - private final Cache cache; + @Autowired + private Cache cache; @Override protected void configure(HttpSecurity http) throws Exception { diff --git a/common-api/src/main/java/cn/lili/controller/common/FileController.java b/common-api/src/main/java/cn/lili/controller/common/FileController.java index b2c5f162..60db9db9 100644 --- a/common-api/src/main/java/cn/lili/controller/common/FileController.java +++ b/common-api/src/main/java/cn/lili/controller/common/FileController.java @@ -17,7 +17,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -33,12 +32,13 @@ import java.util.List; @RestController @Api(tags = "文件管理管理接口") @RequestMapping("/common/file") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class FileController { - private final FileService fileService; + @Autowired + private FileService fileService; - private final Cache cache; + @Autowired + private Cache cache; @ApiOperation(value = "获取自己的图片资源") @GetMapping diff --git a/common-api/src/main/java/cn/lili/controller/common/LogoController.java b/common-api/src/main/java/cn/lili/controller/common/LogoController.java index 824bd48a..da256cc0 100644 --- a/common-api/src/main/java/cn/lili/controller/common/LogoController.java +++ b/common-api/src/main/java/cn/lili/controller/common/LogoController.java @@ -6,7 +6,6 @@ import cn.lili.modules.system.entity.enums.SettingEnum; import cn.lili.modules.system.service.SettingService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -22,7 +21,6 @@ import org.springframework.web.bind.annotation.RestController; @RestController @Api(tags = "文件管理管理接口") @RequestMapping("/common/logo") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class LogoController { @Autowired diff --git a/common-api/src/main/java/cn/lili/controller/common/RegionController.java b/common-api/src/main/java/cn/lili/controller/common/RegionController.java index a8d2d40d..60a94d1e 100644 --- a/common-api/src/main/java/cn/lili/controller/common/RegionController.java +++ b/common-api/src/main/java/cn/lili/controller/common/RegionController.java @@ -9,7 +9,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,11 +24,10 @@ import java.util.List; @RestController @Api(tags = "地址信息接口") @RequestMapping("/common/region") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class RegionController { - - private final RegionService regionService; + @Autowired + private RegionService regionService; @ApiOperation(value = "点地图获取地址信息") @ApiImplicitParams({ diff --git a/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java b/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java index a5bcfe3a..00a38ae5 100644 --- a/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java +++ b/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java @@ -8,7 +8,6 @@ import cn.lili.common.verification.service.VerificationService; import cn.lili.common.vo.ResultMessage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -21,11 +20,10 @@ import org.springframework.web.bind.annotation.*; @RequestMapping("/common/slider") @RestController @Api(tags = "滑块验证码接口") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class SliderImageController { - - private final VerificationService verificationService; + @Autowired + private VerificationService verificationService; //一分钟同一个ip请求10次 @LimitPoint(name = "slider_image", key = "verification") diff --git a/common-api/src/main/java/cn/lili/controller/common/SmsController.java b/common-api/src/main/java/cn/lili/controller/common/SmsController.java index 64e7e677..a25bd1fd 100644 --- a/common-api/src/main/java/cn/lili/controller/common/SmsController.java +++ b/common-api/src/main/java/cn/lili/controller/common/SmsController.java @@ -11,7 +11,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -24,12 +23,12 @@ import org.springframework.web.bind.annotation.*; @RestController @Api(tags = "短信验证码接口") @RequestMapping("/common/sms") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class SmsController { - private final SmsUtil smsUtil; - - private final VerificationService verificationService; + @Autowired + private SmsUtil smsUtil; + @Autowired + private VerificationService verificationService; //一分钟同一个ip请求1次 @LimitPoint(name = "sms_send", key = "sms") diff --git a/common-api/src/main/java/cn/lili/controller/common/UploadController.java b/common-api/src/main/java/cn/lili/controller/common/UploadController.java index 3f6d5cfd..3d6e572c 100644 --- a/common-api/src/main/java/cn/lili/controller/common/UploadController.java +++ b/common-api/src/main/java/cn/lili/controller/common/UploadController.java @@ -20,7 +20,6 @@ import cn.lili.modules.system.entity.enums.SettingEnum; import cn.lili.modules.system.service.SettingService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -41,16 +40,16 @@ import java.io.InputStream; @RestController @Api(tags = "文件上传接口") @RequestMapping("/common/upload") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class UploadController { - private final FileService fileService; - - private final SettingService settingService; - - private final FileManagerPlugin fileManagerPlugin; - - private final Cache cache; + @Autowired + private FileService fileService; + @Autowired + private SettingService settingService; + @Autowired + private FileManagerPlugin fileManagerPlugin; + @Autowired + private Cache cache; @ApiOperation(value = "文件上传") @PostMapping(value = "/file") diff --git a/common-api/src/main/java/cn/lili/controller/security/CommonSecurityConfig.java b/common-api/src/main/java/cn/lili/controller/security/CommonSecurityConfig.java index c86b787f..15ba8a7c 100644 --- a/common-api/src/main/java/cn/lili/controller/security/CommonSecurityConfig.java +++ b/common-api/src/main/java/cn/lili/controller/security/CommonSecurityConfig.java @@ -3,7 +3,6 @@ package cn.lili.controller.security; import cn.lili.common.cache.Cache; import cn.lili.common.security.CustomAccessDeniedHandler; import cn.lili.config.properties.IgnoredUrlsProperties; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; @@ -24,24 +23,23 @@ import org.springframework.web.cors.CorsConfigurationSource; @Slf4j @Configuration @EnableGlobalMethodSecurity(prePostEnabled = true) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class CommonSecurityConfig extends WebSecurityConfigurerAdapter { /** * 忽略验权配置 */ - private final IgnoredUrlsProperties ignoredUrlsProperties; - + @Autowired + private IgnoredUrlsProperties ignoredUrlsProperties; /** * spring security -》 权限不足处理 */ - private final CustomAccessDeniedHandler accessDeniedHandler; - - - private final Cache cache; - - private final CorsConfigurationSource corsConfigurationSource; + @Autowired + private CustomAccessDeniedHandler accessDeniedHandler; + @Autowired + private Cache cache; + @Autowired + private CorsConfigurationSource corsConfigurationSource; @Override protected void configure(HttpSecurity http) throws Exception { diff --git a/consumer/src/main/java/cn/lili/event/impl/DistributionOrderExecute.java b/consumer/src/main/java/cn/lili/event/impl/DistributionOrderExecute.java index b4eb9341..34220a05 100644 --- a/consumer/src/main/java/cn/lili/event/impl/DistributionOrderExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/DistributionOrderExecute.java @@ -12,7 +12,6 @@ import cn.lili.modules.order.order.entity.dto.OrderMessage; import cn.lili.modules.order.trade.entity.enums.AfterSaleStatusEnum; import cn.lili.timetask.handler.EveryDayExecute; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -23,13 +22,14 @@ import org.springframework.stereotype.Service; * @date 2020-07-03 11:20 */ @Service -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class DistributionOrderExecute implements OrderStatusChangeEvent, EveryDayExecute, AfterSaleStatusChangeEvent { //分销订单 - private final DistributionOrderService distributionOrderService; + @Autowired + private DistributionOrderService distributionOrderService; //分销订单持久层 - private final DistributionOrderMapper distributionOrderMapper; + @Autowired + private DistributionOrderMapper distributionOrderMapper; @Override diff --git a/consumer/src/main/java/cn/lili/event/impl/GoodsSkuExecute.java b/consumer/src/main/java/cn/lili/event/impl/GoodsSkuExecute.java index 6d31a2d0..224f1f52 100644 --- a/consumer/src/main/java/cn/lili/event/impl/GoodsSkuExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/GoodsSkuExecute.java @@ -4,8 +4,6 @@ package cn.lili.event.impl; import cn.lili.event.GoodsCommentCompleteEvent; import cn.lili.modules.goods.service.GoodsSkuService; import cn.lili.modules.member.entity.dos.MemberEvaluation; - -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -16,11 +14,11 @@ import org.springframework.stereotype.Service; * @date 2020-07-03 11:20 */ @Service -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class GoodsSkuExecute implements GoodsCommentCompleteEvent { //商品 - private final GoodsSkuService goodsSkuService; + @Autowired + private GoodsSkuService goodsSkuService; @Override diff --git a/consumer/src/main/java/cn/lili/event/impl/MemberPointExecute.java b/consumer/src/main/java/cn/lili/event/impl/MemberPointExecute.java index a563978c..237c3339 100644 --- a/consumer/src/main/java/cn/lili/event/impl/MemberPointExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/MemberPointExecute.java @@ -23,13 +23,15 @@ import org.springframework.stereotype.Service; * @date 2020-07-03 11:20 */ @Service -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) + public class MemberPointExecute implements MemberRegisterEvent, GoodsCommentCompleteEvent { //配置 - private final SettingService settingService; + @Autowired + private SettingService settingService; //会员 - private final MemberService memberService; + @Autowired + private MemberService memberService; @Override public void memberRegister(Member member) { diff --git a/consumer/src/main/java/cn/lili/event/impl/MemberWalletExecute.java b/consumer/src/main/java/cn/lili/event/impl/MemberWalletExecute.java index e2499f9d..d4c8fa3b 100644 --- a/consumer/src/main/java/cn/lili/event/impl/MemberWalletExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/MemberWalletExecute.java @@ -15,10 +15,10 @@ import org.springframework.stereotype.Service; * @date 2020-07-03 11:20 */ @Service -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MemberWalletExecute implements MemberRegisterEvent { - private final MemberWalletService memberWalletService; + @Autowired + private MemberWalletService memberWalletService; @Override public void memberRegister(Member member) { diff --git a/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java b/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java index e0ab8288..7a23048a 100644 --- a/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java @@ -31,12 +31,12 @@ import java.util.Map; * @date 2020-07-03 11:20 **/ @Service -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class NoticeMessageExecute implements TradeEvent, OrderStatusChangeEvent, AfterSaleStatusChangeEvent, MemberPointChangeEvent, MemberWithdrawalEvent { - private final NoticeMessageService noticeMessageService; - - private final OrderService orderService; + @Autowired + private NoticeMessageService noticeMessageService; + @Autowired + private OrderService orderService; @Override diff --git a/consumer/src/main/java/cn/lili/event/impl/OrderCreateReceiptExecute.java b/consumer/src/main/java/cn/lili/event/impl/OrderCreateReceiptExecute.java index 138c217a..ca5ced61 100644 --- a/consumer/src/main/java/cn/lili/event/impl/OrderCreateReceiptExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/OrderCreateReceiptExecute.java @@ -22,10 +22,10 @@ import java.util.List; * @date 2020-07-03 11:20 **/ @Service -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class OrderCreateReceiptExecute implements TradeEvent { - private final ReceiptService receiptService; + @Autowired + private ReceiptService receiptService; @Override public void orderCreate(TradeDTO tradeDTO) { diff --git a/consumer/src/main/java/cn/lili/event/impl/PaymentExecute.java b/consumer/src/main/java/cn/lili/event/impl/PaymentExecute.java index 2c4cd46d..0fe830b7 100644 --- a/consumer/src/main/java/cn/lili/event/impl/PaymentExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/PaymentExecute.java @@ -22,13 +22,14 @@ import org.springframework.stereotype.Service; * @date 2021-03-13 16:58 */ @Service -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class PaymentExecute implements OrderStatusChangeEvent { //支付日志 - private final PaymentService paymentService; + @Autowired + private PaymentService paymentService; //订单 - private final OrderService orderService; + @Autowired + private OrderService orderService; @Override public void orderChange(OrderMessage orderMessage) { diff --git a/consumer/src/main/java/cn/lili/event/impl/StockUpdateExecute.java b/consumer/src/main/java/cn/lili/event/impl/StockUpdateExecute.java index 0a1e7359..aa226c27 100644 --- a/consumer/src/main/java/cn/lili/event/impl/StockUpdateExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/StockUpdateExecute.java @@ -12,7 +12,6 @@ import cn.lili.modules.order.order.service.OrderService; import cn.lili.modules.promotion.entity.dos.PromotionGoods; import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum; import cn.lili.modules.promotion.service.PromotionGoodsService; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.script.DefaultRedisScript; @@ -28,20 +27,25 @@ import java.util.List; * @date 2020-07-03 11:20 */ @Service -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class StockUpdateExecute implements OrderStatusChangeEvent { //Redis - private final StringRedisTemplate stringRedisTemplate; - private final DefaultRedisScript quantityScript; + @Autowired + private StringRedisTemplate stringRedisTemplate; + @Autowired + private DefaultRedisScript quantityScript; //订单 - private final OrderService orderService; + @Autowired + private OrderService orderService; //规格商品 - private final GoodsSkuService goodsSkuService; + @Autowired + private GoodsSkuService goodsSkuService; //促销商品 - private final PromotionGoodsService promotionGoodsService; + @Autowired + private PromotionGoodsService promotionGoodsService; //缓存 - private final Cache cache; + @Autowired + private Cache cache; @Override public void orderChange(OrderMessage orderMessage) { diff --git a/consumer/src/main/java/cn/lili/event/impl/WechatMessageExecute.java b/consumer/src/main/java/cn/lili/event/impl/WechatMessageExecute.java index 79e58f45..38bf1f39 100644 --- a/consumer/src/main/java/cn/lili/event/impl/WechatMessageExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/WechatMessageExecute.java @@ -6,7 +6,6 @@ import cn.lili.modules.message.util.WechatMessageUtil; import cn.lili.modules.order.cart.entity.dto.TradeDTO; import cn.lili.modules.order.order.entity.dto.OrderMessage; import cn.lili.modules.order.order.entity.vo.OrderVO; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -20,7 +19,6 @@ import org.springframework.stereotype.Service; */ @Slf4j @Service -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class WechatMessageExecute implements OrderStatusChangeEvent, TradeEvent { @Autowired diff --git a/consumer/src/main/java/cn/lili/listener/AfterSaleMessageListener.java b/consumer/src/main/java/cn/lili/listener/AfterSaleMessageListener.java index 59d7f71c..2db77d04 100644 --- a/consumer/src/main/java/cn/lili/listener/AfterSaleMessageListener.java +++ b/consumer/src/main/java/cn/lili/listener/AfterSaleMessageListener.java @@ -4,7 +4,6 @@ import cn.hutool.json.JSONUtil; import cn.lili.common.rocketmq.tags.AfterSaleTagsEnum; import cn.lili.event.AfterSaleStatusChangeEvent; import cn.lili.modules.order.order.entity.dos.AfterSale; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.common.message.MessageExt; import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; @@ -22,12 +21,12 @@ import java.util.List; */ @Slf4j @Component -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) @RocketMQMessageListener(topic = "${lili.data.rocketmq.after-sale-topic}", consumerGroup = "${lili.data.rocketmq.after-sale-group}") public class AfterSaleMessageListener implements RocketMQListener { //售后订单状态 - private final List afterSaleStatusChangeEvents; + @Autowired + private List afterSaleStatusChangeEvents; @Override public void onMessage(MessageExt messageExt) { diff --git a/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java b/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java index 44f58e89..7391dede 100644 --- a/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java +++ b/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java @@ -36,24 +36,30 @@ import java.util.List; **/ @Component @Slf4j -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) @RocketMQMessageListener(topic = "${lili.data.rocketmq.goods-topic}", consumerGroup = "${lili.data.rocketmq.goods-group}") public class GoodsMessageListener implements RocketMQListener { //ES商品 - private final EsGoodsIndexService goodsIndexService; + @Autowired + private EsGoodsIndexService goodsIndexService; //店铺 - private final StoreService storeService; + @Autowired + private StoreService storeService; //商品 - private final GoodsService goodsService; + @Autowired + private GoodsService goodsService; //商品 - private final GoodsSkuService goodsSkuService; + @Autowired + private GoodsSkuService goodsSkuService; //用户足迹 - private final FootprintService footprintService; + @Autowired + private FootprintService footprintService; //商品收藏 - private final GoodsCollectionService goodsCollectionService; + @Autowired + private GoodsCollectionService goodsCollectionService; //商品评价 - private final List goodsCommentCompleteEvents; + @Autowired + private List goodsCommentCompleteEvents; @Override public void onMessage(MessageExt messageExt) { diff --git a/consumer/src/main/java/cn/lili/listener/MemberMessageListener.java b/consumer/src/main/java/cn/lili/listener/MemberMessageListener.java index a32489d6..d0e19760 100644 --- a/consumer/src/main/java/cn/lili/listener/MemberMessageListener.java +++ b/consumer/src/main/java/cn/lili/listener/MemberMessageListener.java @@ -10,7 +10,6 @@ import cn.lili.modules.member.entity.dos.MemberSign; import cn.lili.modules.member.entity.dto.MemberPointMessage; import cn.lili.modules.member.entity.dto.MemberWithdrawalMessage; import cn.lili.modules.member.service.MemberSignService; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.common.message.MessageExt; import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; @@ -28,18 +27,21 @@ import java.util.List; **/ @Component @Slf4j -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) @RocketMQMessageListener(topic = "${lili.data.rocketmq.member-topic}", consumerGroup = "${lili.data.rocketmq.member-group}") public class MemberMessageListener implements RocketMQListener { //会员签到 - private final MemberSignService memberSignService; + @Autowired + private MemberSignService memberSignService; //会员积分变化 - private final List memberPointChangeEvents; + @Autowired + private List memberPointChangeEvents; //会员提现 - private final List memberWithdrawalEvents; + @Autowired + private List memberWithdrawalEvents; //会员注册 - private final List memberSignEvents; + @Autowired + private List memberSignEvents; @Override diff --git a/consumer/src/main/java/cn/lili/listener/NoticeMessageListener.java b/consumer/src/main/java/cn/lili/listener/NoticeMessageListener.java index eb3499c9..940eced2 100644 --- a/consumer/src/main/java/cn/lili/listener/NoticeMessageListener.java +++ b/consumer/src/main/java/cn/lili/listener/NoticeMessageListener.java @@ -17,12 +17,12 @@ import org.springframework.stereotype.Component; * @since 2020/12/9 */ @Component -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) @RocketMQMessageListener(topic = "${lili.data.rocketmq.notice-topic}", consumerGroup = "${lili.data.rocketmq.notice-group}") public class NoticeMessageListener implements RocketMQListener { //站内信 - private final NoticeMessageService noticeMessageService; + @Autowired + private NoticeMessageService noticeMessageService; @Override public void onMessage(MessageExt messageExt) { diff --git a/consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java b/consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java index d241ce7c..b9f98991 100644 --- a/consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java +++ b/consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java @@ -30,18 +30,21 @@ import java.util.List; * @since 2020/12/9 */ @Component -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) @RocketMQMessageListener(topic = "${lili.data.rocketmq.notice-send-topic}", consumerGroup = "${lili.data.rocketmq.notice-send-group}") public class NoticeSendMessageListener implements RocketMQListener { //会员 - private final MemberMapper memberMapper; + @Autowired + private MemberMapper memberMapper; //短信 - private final SmsUtil smsUtil; + @Autowired + private SmsUtil smsUtil; //店铺消息 - private final StoreMessageService storeMessageService; + @Autowired + private StoreMessageService storeMessageService; //店铺 - private final StoreService storeService; + @Autowired + private StoreService storeService; @Override public void onMessage(MessageExt messageExt) { diff --git a/consumer/src/main/java/cn/lili/listener/OrderMessageListener.java b/consumer/src/main/java/cn/lili/listener/OrderMessageListener.java index 8244554f..02371a0d 100644 --- a/consumer/src/main/java/cn/lili/listener/OrderMessageListener.java +++ b/consumer/src/main/java/cn/lili/listener/OrderMessageListener.java @@ -7,7 +7,6 @@ import cn.lili.event.OrderStatusChangeEvent; import cn.lili.event.TradeEvent; import cn.lili.modules.order.cart.entity.dto.TradeDTO; import cn.lili.modules.order.order.entity.dto.OrderMessage; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.common.message.MessageExt; import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; @@ -25,16 +24,18 @@ import java.util.List; **/ @Component @Slf4j -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) @RocketMQMessageListener(topic = "${lili.data.rocketmq.order-topic}", consumerGroup = "${lili.data.rocketmq.order-group}") public class OrderMessageListener implements RocketMQListener { //交易 - private final List tradeEvent; + @Autowired + private List tradeEvent; //订单状态 - private final List orderStatusChangeEvents; + @Autowired + private List orderStatusChangeEvents; //缓存 - private final Cache cache; + @Autowired + private Cache cache; @Override public void onMessage(MessageExt messageExt) { diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/bill/BillExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/bill/BillExecute.java index 14a98d78..5905e279 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/bill/BillExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/bill/BillExecute.java @@ -19,13 +19,14 @@ import java.util.List; * @date 2021/2/18 3:45 下午 */ @Component -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class BillExecute implements EveryDayExecute { //结算单 - private final BillService billService; + @Autowired + private BillService billService; //店铺详情 - private final StoreDetailMapper storeDetailMapper; + @Autowired + private StoreDetailMapper storeDetailMapper; /** * 1.查询今日待结算的商家 diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/goods/GoodsExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/goods/GoodsExecute.java index f5ae0203..d431d869 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/goods/GoodsExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/goods/GoodsExecute.java @@ -7,7 +7,6 @@ import cn.lili.modules.member.entity.dos.MemberEvaluation; import cn.lili.modules.member.mapper.MemberEvaluationMapper; import cn.lili.timetask.handler.EveryDayExecute; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -21,12 +20,13 @@ import java.util.Map; * @date 2021/3/18 3:23 下午 */ @Component -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class GoodsExecute implements EveryDayExecute { //会员评价 - private final MemberEvaluationMapper memberEvaluationMapper; + @Autowired + private MemberEvaluationMapper memberEvaluationMapper; //商品 - private final GoodsMapper goodsMapper; + @Autowired + private GoodsMapper goodsMapper; /** * 查询已上架的商品的评价数量并赋值 diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/order/CancelOrderTaskExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/order/CancelOrderTaskExecute.java index 6e10e4a2..82e5262a 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/order/CancelOrderTaskExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/order/CancelOrderTaskExecute.java @@ -28,12 +28,14 @@ import java.util.stream.Collectors; **/ @Slf4j @Component -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) + public class CancelOrderTaskExecute implements EveryMinuteExecute { //订单 - private final OrderService orderService; + @Autowired + private OrderService orderService; //设置 - private final SettingService settingService; + @Autowired + private SettingService settingService; @Override diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/order/OrderEveryDayTaskExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/order/OrderEveryDayTaskExecute.java index 13a3d372..784dee61 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/order/OrderEveryDayTaskExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/order/OrderEveryDayTaskExecute.java @@ -19,7 +19,6 @@ import cn.lili.modules.system.service.SettingService; import cn.lili.timetask.handler.EveryDayExecute; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -34,17 +33,21 @@ import java.util.stream.Collectors; **/ @Slf4j @Component -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) + public class OrderEveryDayTaskExecute implements EveryDayExecute { //订单 - private final OrderService orderService; + @Autowired + private OrderService orderService; //订单货物 - private final OrderItemService orderItemService; + @Autowired + private OrderItemService orderItemService; //设置 - private final SettingService settingService; + @Autowired + private SettingService settingService; //会员评价 - private final MemberEvaluationService memberEvaluationService; + @Autowired + private MemberEvaluationService memberEvaluationService; /** * 执行每日任务 diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java index d83ef5ad..8a504ab7 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java @@ -29,21 +29,27 @@ import java.util.List; * @date 2021/3/18 3:23 下午 */ @Component -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) + public class PromotionEverydayExecute implements EveryDayExecute { //Mongo - private final MongoTemplate mongoTemplate; + @Autowired + private MongoTemplate mongoTemplate; //满额活动 - private final FullDiscountService fullDiscountService; + @Autowired + private FullDiscountService fullDiscountService; //拼团 - private final PintuanService pintuanService; + @Autowired + private PintuanService pintuanService; //优惠券 - private final CouponService couponService; + @Autowired + private CouponService couponService; //会员优惠券 - private final MemberCouponService memberCouponService; + @Autowired + private MemberCouponService memberCouponService; //促销商品 - private final PromotionGoodsService promotionGoodsService; + @Autowired + private PromotionGoodsService promotionGoodsService; /** diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/MemberStatisticsExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/MemberStatisticsExecute.java index 257033b9..73a3c940 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/MemberStatisticsExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/MemberStatisticsExecute.java @@ -3,7 +3,6 @@ package cn.lili.timetask.handler.impl.statistics; import cn.lili.modules.statistics.model.dos.MemberStatisticsData; import cn.lili.modules.statistics.service.MemberStatisticsDataService; import cn.lili.timetask.handler.EveryDayExecute; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -19,11 +18,11 @@ import java.util.Date; */ @Slf4j @Component -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MemberStatisticsExecute implements EveryDayExecute { //会员统计 - private final MemberStatisticsDataService memberStatisticsDataService; + @Autowired + private MemberStatisticsDataService memberStatisticsDataService; @Override public void execute() { diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/OnlineMemberStatistics.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/OnlineMemberStatistics.java index 0dfa4f15..73979b97 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/OnlineMemberStatistics.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/OnlineMemberStatistics.java @@ -6,7 +6,6 @@ import cn.lili.common.security.enums.UserEnums; import cn.lili.config.properties.StatisticsProperties; import cn.lili.modules.statistics.model.vo.OnlineMemberVO; import cn.lili.timetask.handler.EveryHourExecute; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -23,13 +22,14 @@ import java.util.stream.Collectors; * @date 2021-02-21 09:47 */ @Component -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class OnlineMemberStatistics implements EveryHourExecute { //缓存 - private final Cache cache; + @Autowired + private Cache cache; //统计小时 - private final StatisticsProperties statisticsProperties; + @Autowired + private StatisticsProperties statisticsProperties; @Override diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/storeRating/StoreRatingExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/storeRating/StoreRatingExecute.java index 73a6fa26..d6bfc93b 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/storeRating/StoreRatingExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/storeRating/StoreRatingExecute.java @@ -24,12 +24,13 @@ import java.util.List; * @date 2021/3/15 5:30 下午 */ @Component -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class StoreRatingExecute implements EveryDayExecute { //店铺 - private final StoreService storeService; + @Autowired + private StoreService storeService; //会员评价 - private final MemberEvaluationMapper memberEvaluationMapper; + @Autowired + private MemberEvaluationMapper memberEvaluationMapper; @Override diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/view/PageViewStatisticsExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/view/PageViewStatisticsExecute.java index 91f75d15..74972785 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/view/PageViewStatisticsExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/view/PageViewStatisticsExecute.java @@ -8,7 +8,6 @@ import cn.lili.modules.statistics.model.dos.PlatformViewData; import cn.lili.modules.statistics.service.PlatformViewDataService; import cn.lili.timetask.handler.EveryDayExecute; import lombok.Data; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -28,12 +27,13 @@ import java.util.List; */ @Slf4j @Component -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class PageViewStatisticsExecute implements EveryDayExecute { //缓存 - private final Cache cache; + @Autowired + private Cache cache; //平台PV统计 - private final PlatformViewDataService platformViewDataService; + @Autowired + private PlatformViewDataService platformViewDataService; @Override public void execute() { diff --git a/consumer/src/main/java/cn/lili/trigger/TimeTriggerConsumer.java b/consumer/src/main/java/cn/lili/trigger/TimeTriggerConsumer.java index 54efb65b..32e816a5 100644 --- a/consumer/src/main/java/cn/lili/trigger/TimeTriggerConsumer.java +++ b/consumer/src/main/java/cn/lili/trigger/TimeTriggerConsumer.java @@ -6,7 +6,6 @@ import cn.lili.common.trigger.interfaces.TimeTriggerExecutor; import cn.lili.common.trigger.model.TimeTriggerMsg; import cn.lili.common.trigger.util.TimeTriggerUtil; import cn.lili.common.utils.SpringContextUtil; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; import org.apache.rocketmq.spring.core.RocketMQListener; @@ -21,11 +20,10 @@ import org.springframework.stereotype.Component; */ @Component @Slf4j -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) @RocketMQMessageListener(topic = "${lili.data.rocketmq.promotion-topic}", consumerGroup = "${lili.data.rocketmq.promotion-group}") public class TimeTriggerConsumer implements RocketMQListener { - - private final Cache cache; + @Autowired + private Cache cache; @Override public void onMessage(TimeTriggerMsg timeTriggerMsg) { diff --git a/consumer/src/main/java/cn/lili/trigger/executor/PromotionTimeTriggerExecutor.java b/consumer/src/main/java/cn/lili/trigger/executor/PromotionTimeTriggerExecutor.java index b0a44642..d3daf329 100644 --- a/consumer/src/main/java/cn/lili/trigger/executor/PromotionTimeTriggerExecutor.java +++ b/consumer/src/main/java/cn/lili/trigger/executor/PromotionTimeTriggerExecutor.java @@ -26,16 +26,19 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component(TimeExecuteConstant.PROMOTION_EXECUTOR) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class PromotionTimeTriggerExecutor implements TimeTriggerExecutor { //促销 - private final PromotionService promotionService; + @Autowired + private PromotionService promotionService; //Rocketmq - private final RocketmqCustomProperties rocketmqCustomProperties; + @Autowired + private RocketmqCustomProperties rocketmqCustomProperties; //延时任务 - private final TimeTrigger timeTrigger; + @Autowired + private TimeTrigger timeTrigger; //订单 - private final OrderService orderService; + @Autowired + private OrderService orderService; @Override diff --git a/framework/src/main/java/cn/lili/common/aop/syslog/interceptor/SystemLogAspect.java b/framework/src/main/java/cn/lili/common/aop/syslog/interceptor/SystemLogAspect.java index e5b7f90d..1009fa09 100644 --- a/framework/src/main/java/cn/lili/common/aop/syslog/interceptor/SystemLogAspect.java +++ b/framework/src/main/java/cn/lili/common/aop/syslog/interceptor/SystemLogAspect.java @@ -10,7 +10,6 @@ import cn.lili.common.utils.ThreadPoolUtil; import cn.lili.modules.base.entity.systemlog.SystemLogVO; import cn.lili.modules.connect.util.IpUtils; import cn.lili.modules.permission.service.SystemLogService; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterReturning; @@ -35,7 +34,6 @@ import java.util.Map; @Aspect @Component @Slf4j -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class SystemLogAspect { /** @@ -43,12 +41,12 @@ public class SystemLogAspect { */ private static final ThreadLocal beginTimeThreadLocal = new NamedThreadLocal<>("SYSTEM-LOG"); - - private final SystemLogService systemLogService; - - private final HttpServletRequest request; - - private final IpHelper ipHelper; + @Autowired + private SystemLogService systemLogService; + @Autowired + private HttpServletRequest request; + @Autowired + private IpHelper ipHelper; /** * Controller层切点,注解方式 @@ -129,9 +127,10 @@ public class SystemLogAspect { * 保存日志 */ private static class SaveSystemLogThread implements Runnable { - - private final SystemLogVO systemLogVO; - private final SystemLogService systemLogService; + @Autowired + private SystemLogVO systemLogVO; + @Autowired + private SystemLogService systemLogService; public SaveSystemLogThread(SystemLogVO systemLogVO, SystemLogService systemLogService) { this.systemLogVO = systemLogVO; diff --git a/framework/src/main/java/cn/lili/common/security/context/UserContextInit.java b/framework/src/main/java/cn/lili/common/security/context/UserContextInit.java index eb9ff50e..a214eb60 100644 --- a/framework/src/main/java/cn/lili/common/security/context/UserContextInit.java +++ b/framework/src/main/java/cn/lili/common/security/context/UserContextInit.java @@ -1,6 +1,5 @@ package cn.lili.common.security.context; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; @@ -15,13 +14,13 @@ import org.springframework.stereotype.Component; * @since 2020/11/14 20:30 */ @Component -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class UserContextInit implements ApplicationRunner { /** * 用户信息holder，认证信息的获取者 */ - private final AuthenticationHandler authenticationHandler; + @Autowired + private AuthenticationHandler authenticationHandler; /** * 在项目加载时指定认证信息获取者 diff --git a/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java b/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java index 19394748..2e2ec190 100644 --- a/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java +++ b/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java @@ -10,11 +10,11 @@ import cn.lili.common.sms.AliSmsUtil; import cn.lili.common.sms.SmsUtil; import cn.lili.common.utils.CommonUtil; import cn.lili.common.verification.enums.VerificationEnums; -import cn.lili.modules.message.entity.dos.SmsSign; -import cn.lili.modules.message.entity.dos.SmsTemplate; import cn.lili.modules.connect.util.Base64Utils; import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.service.MemberService; +import cn.lili.modules.message.entity.dos.SmsSign; +import cn.lili.modules.message.entity.dos.SmsTemplate; import cn.lili.modules.system.entity.dos.Setting; import cn.lili.modules.system.entity.dto.SmsSetting; import cn.lili.modules.system.entity.enums.SettingEnum; @@ -23,7 +23,6 @@ import com.aliyun.dysmsapi20170525.models.*; import com.aliyun.teaopenapi.models.Config; import com.google.gson.Gson; import com.xkcoding.http.util.StringUtil; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -43,14 +42,14 @@ import java.util.Map; */ @Component @Slf4j -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil { - private final Cache cache; - - private final SettingService settingService; - - private final MemberService memberService; + @Autowired + private Cache cache; + @Autowired + private SettingService settingService; + @Autowired + private MemberService memberService; @Override public void sendSmsCode(String mobile, VerificationEnums verificationEnums, String uuid) { diff --git a/framework/src/main/java/cn/lili/common/token/TokenUtil.java b/framework/src/main/java/cn/lili/common/token/TokenUtil.java index a0a2830c..3a2420f0 100644 --- a/framework/src/main/java/cn/lili/common/token/TokenUtil.java +++ b/framework/src/main/java/cn/lili/common/token/TokenUtil.java @@ -11,7 +11,6 @@ import cn.lili.config.properties.JWTTokenProperties; import com.google.gson.Gson; import io.jsonwebtoken.*; import io.jsonwebtoken.security.SignatureException; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -26,12 +25,11 @@ import java.util.concurrent.TimeUnit; * 2020-11-12 18:44 */ @Component -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class TokenUtil { - - private final JWTTokenProperties tokenProperties; - - private final Cache cache; + @Autowired + private JWTTokenProperties tokenProperties; + @Autowired + private Cache cache; /** * 构建token diff --git a/framework/src/main/java/cn/lili/common/token/base/generate/ManagerTokenGenerate.java b/framework/src/main/java/cn/lili/common/token/base/generate/ManagerTokenGenerate.java index 509cc135..aa99c836 100644 --- a/framework/src/main/java/cn/lili/common/token/base/generate/ManagerTokenGenerate.java +++ b/framework/src/main/java/cn/lili/common/token/base/generate/ManagerTokenGenerate.java @@ -12,7 +12,6 @@ import cn.lili.modules.permission.entity.dos.AdminUser; import cn.lili.modules.permission.entity.vo.UserMenuVO; import cn.lili.modules.permission.service.AdminUserService; import cn.lili.modules.permission.service.RoleMenuService; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -30,21 +29,17 @@ import java.util.Map; * @since 2020/11/16 10:51 */ @Component -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class ManagerTokenGenerate extends AbstractTokenGenerate { - private AdminUserService adminUserService; - - private final TokenUtil tokenUtil; - - private final RoleMenuService roleMenuService; - - private final Cache cache; - @Autowired - public void setAdminUserService(AdminUserService adminUserService) { - this.adminUserService = adminUserService; - } + private AdminUserService adminUserService; + @Autowired + private TokenUtil tokenUtil; + @Autowired + private RoleMenuService roleMenuService; + @Autowired + private Cache cache; + @Override public Token createToken(String username, Boolean longTerm) { diff --git a/framework/src/main/java/cn/lili/common/token/base/generate/MemberTokenGenerate.java b/framework/src/main/java/cn/lili/common/token/base/generate/MemberTokenGenerate.java index 91bf6e50..6ae2c48a 100644 --- a/framework/src/main/java/cn/lili/common/token/base/generate/MemberTokenGenerate.java +++ b/framework/src/main/java/cn/lili/common/token/base/generate/MemberTokenGenerate.java @@ -9,7 +9,6 @@ import cn.lili.config.context.ThreadContextHolder; import cn.lili.modules.base.entity.enums.ClientTypeEnum; import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.service.MemberService; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -23,15 +22,13 @@ import java.util.Date; * @Description: * @since 2020/11/16 10:50 */ - @Component -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MemberTokenGenerate extends AbstractTokenGenerate { - + @Autowired private MemberService memberService; - - private final TokenUtil tokenUtil; + @Autowired + private TokenUtil tokenUtil; @Override public Token createToken(String username, Boolean longTerm) { @@ -66,9 +63,4 @@ public class MemberTokenGenerate extends AbstractTokenGenerate { return tokenUtil.refreshToken(refreshToken, UserEnums.MEMBER); } - - @Autowired - public void setMemberService(MemberService memberService) { - this.memberService = memberService; - } } diff --git a/framework/src/main/java/cn/lili/common/token/base/generate/StoreTokenGenerate.java b/framework/src/main/java/cn/lili/common/token/base/generate/StoreTokenGenerate.java index b31b0871..963eeb49 100644 --- a/framework/src/main/java/cn/lili/common/token/base/generate/StoreTokenGenerate.java +++ b/framework/src/main/java/cn/lili/common/token/base/generate/StoreTokenGenerate.java @@ -25,24 +25,13 @@ import org.springframework.stereotype.Component; * @since 2020/11/16 10:51 */ @Component -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class StoreTokenGenerate extends AbstractTokenGenerate { - + @Autowired private MemberService memberService; - + @Autowired private StoreService storeService; - - private final TokenUtil tokenUtil; - @Autowired - public void setMemberService(MemberService memberService) { - this.memberService = memberService; - } - - @Autowired - public void setStoreService(StoreService storeService) { - this.storeService = storeService; - } + private TokenUtil tokenUtil; @Override public Token createToken(String username, Boolean longTerm) { diff --git a/framework/src/main/java/cn/lili/common/trigger/RocketmqTimerTrigger.java b/framework/src/main/java/cn/lili/common/trigger/RocketmqTimerTrigger.java index ed35e667..5a78666e 100644 --- a/framework/src/main/java/cn/lili/common/trigger/RocketmqTimerTrigger.java +++ b/framework/src/main/java/cn/lili/common/trigger/RocketmqTimerTrigger.java @@ -9,7 +9,6 @@ import cn.lili.common.trigger.model.TimeTriggerMsg; import cn.lili.common.trigger.util.TimeTriggerUtil; import cn.lili.common.utils.DateUtil; import cn.lili.common.utils.StringUtils; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.springframework.beans.factory.annotation.Autowired; @@ -23,19 +22,14 @@ import org.springframework.stereotype.Component; **/ @Component @Slf4j -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class RocketmqTimerTrigger implements TimeTrigger { - - private final RocketMQTemplate rocketMQTemplate; - - private final Cache cache; - + @Autowired + private RocketMQTemplate rocketMQTemplate; + @Autowired + private Cache cache; + @Autowired private PromotionDelayQueue promotionDelayQueue; - @Autowired - public void setPromotionDelayQueue(PromotionDelayQueue promotionDelayQueue) { - this.promotionDelayQueue = promotionDelayQueue; - } @Override public void add(String executorName, Object param, Long triggerTime, String uniqueKey, String topic) { diff --git a/framework/src/main/java/cn/lili/common/trigger/delay/PromotionDelayQueue.java b/framework/src/main/java/cn/lili/common/trigger/delay/PromotionDelayQueue.java index 724af151..2f7735f7 100644 --- a/framework/src/main/java/cn/lili/common/trigger/delay/PromotionDelayQueue.java +++ b/framework/src/main/java/cn/lili/common/trigger/delay/PromotionDelayQueue.java @@ -4,8 +4,6 @@ import cn.hutool.json.JSONUtil; import cn.lili.common.delayqueue.AbstractDelayQueueMachineFactory; import cn.lili.common.trigger.interfaces.TimeTrigger; import cn.lili.common.trigger.model.TimeTriggerMsg; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; /** @@ -18,10 +16,9 @@ import org.springframework.stereotype.Component; * @since 1 */ @Component -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class PromotionDelayQueue extends AbstractDelayQueueMachineFactory { - private final TimeTrigger timeTrigger; + private TimeTrigger timeTrigger; @Override public void invoke(String jobId) { diff --git a/framework/src/main/java/cn/lili/common/utils/RedisUtil.java b/framework/src/main/java/cn/lili/common/utils/RedisUtil.java index 26266c28..959ad346 100644 --- a/framework/src/main/java/cn/lili/common/utils/RedisUtil.java +++ b/framework/src/main/java/cn/lili/common/utils/RedisUtil.java @@ -1,6 +1,5 @@ package cn.lili.common.utils; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.DefaultTypedTuple; import org.springframework.data.redis.core.RedisTemplate; @@ -19,10 +18,9 @@ import java.util.concurrent.TimeUnit; * @since 2020/11/7 **/ @Component -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class RedisUtil { - - private final RedisTemplate redisTemplate; + @Autowired + private RedisTemplate redisTemplate; //=============================common============================ diff --git a/framework/src/main/java/cn/lili/common/verification/VerificationSDK.java b/framework/src/main/java/cn/lili/common/verification/VerificationSDK.java index 16591687..4508033a 100644 --- a/framework/src/main/java/cn/lili/common/verification/VerificationSDK.java +++ b/framework/src/main/java/cn/lili/common/verification/VerificationSDK.java @@ -2,7 +2,6 @@ package cn.lili.common.verification; import cn.lili.common.cache.Cache; import cn.lili.common.cache.CachePrefix; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -15,10 +14,10 @@ import org.springframework.stereotype.Component; * @since 2020/11/17 15:43 */ @Component -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class VerificationSDK { - private final Cache cache; + @Autowired + private Cache cache; /** * 生成一个token 用于获取校验中心的验证码逻辑 diff --git a/framework/src/main/java/cn/lili/common/verification/aop/VerificationInterceptor.java b/framework/src/main/java/cn/lili/common/verification/aop/VerificationInterceptor.java index df20b738..8bb64702 100644 --- a/framework/src/main/java/cn/lili/common/verification/aop/VerificationInterceptor.java +++ b/framework/src/main/java/cn/lili/common/verification/aop/VerificationInterceptor.java @@ -24,11 +24,10 @@ import java.lang.reflect.Method; @Aspect @Configuration @Slf4j -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class VerificationInterceptor { - - private final VerificationService verificationService; + @Autowired + private VerificationService verificationService; @Before("@annotation(cn.lili.common.verification.aop.annotation.Verification)") public void interceptor(JoinPoint pjp) { diff --git a/framework/src/main/java/cn/lili/common/verification/service/impl/VerificationServiceImpl.java b/framework/src/main/java/cn/lili/common/verification/service/impl/VerificationServiceImpl.java index 469bbaa5..acf28828 100644 --- a/framework/src/main/java/cn/lili/common/verification/service/impl/VerificationServiceImpl.java +++ b/framework/src/main/java/cn/lili/common/verification/service/impl/VerificationServiceImpl.java @@ -11,7 +11,6 @@ import cn.lili.common.vo.SerializableStream; import cn.lili.modules.base.entity.dos.VerificationSource; import cn.lili.modules.base.entity.vo.VerificationVO; import cn.lili.modules.base.service.VerificationSourceService; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -32,13 +31,12 @@ import java.util.Random; */ @Slf4j @Component -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class VerificationServiceImpl implements VerificationService { - - private final VerificationSourceService verificationSourceService; - - private final Cache cache; + @Autowired + private VerificationSourceService verificationSourceService; + @Autowired + private Cache cache; /** * 创建校验 diff --git a/framework/src/main/java/cn/lili/config/interceptor/UrlConfiguration.java b/framework/src/main/java/cn/lili/config/interceptor/UrlConfiguration.java index 5de9cb8e..ddae3ed6 100644 --- a/framework/src/main/java/cn/lili/config/interceptor/UrlConfiguration.java +++ b/framework/src/main/java/cn/lili/config/interceptor/UrlConfiguration.java @@ -15,12 +15,11 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; * @author Chopper */ @Configuration -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class UrlConfiguration implements WebMvcConfigurer { - - private final IgnoredUrlsProperties ignoredUrlsProperties; - - private final RequestInterceptorAdapter requestInterceptorAdapter; + @Autowired + private IgnoredUrlsProperties ignoredUrlsProperties; + @Autowired + private RequestInterceptorAdapter requestInterceptorAdapter; @Override public void addInterceptors(InterceptorRegistry registry) { diff --git a/framework/src/main/java/cn/lili/modules/base/serviceimpl/RegionServiceImpl.java b/framework/src/main/java/cn/lili/modules/base/serviceimpl/RegionServiceImpl.java index 98331398..fc9c4441 100644 --- a/framework/src/main/java/cn/lili/modules/base/serviceimpl/RegionServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/base/serviceimpl/RegionServiceImpl.java @@ -27,13 +27,12 @@ import java.util.*; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class RegionServiceImpl extends ServiceImpl implements RegionService { /** * 同步请求地址 */ - private final String syncUrl = "https://restapi.amap.com/v3/config/district?subdistrict=4&key=e456d77800e2084a326f7b777278f89d"; + private String syncUrl = "https://restapi.amap.com/v3/config/district?subdistrict=4&key=e456d77800e2084a326f7b777278f89d"; @Override public void synchronizationData(String url) { diff --git a/framework/src/main/java/cn/lili/modules/base/serviceimpl/VerificationSourceServiceImpl.java b/framework/src/main/java/cn/lili/modules/base/serviceimpl/VerificationSourceServiceImpl.java index f2637674..9a595b11 100644 --- a/framework/src/main/java/cn/lili/modules/base/serviceimpl/VerificationSourceServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/base/serviceimpl/VerificationSourceServiceImpl.java @@ -23,10 +23,10 @@ import java.util.List; */ @Service @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class VerificationSourceServiceImpl extends ServiceImpl implements VerificationSourceService { - private final Cache cache; + @Autowired + private Cache cache; @Override public VerificationVO initCache() { diff --git a/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectConfigServiceImpl.java b/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectConfigServiceImpl.java index fa81bd46..15a4e232 100644 --- a/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectConfigServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectConfigServiceImpl.java @@ -22,10 +22,9 @@ import java.util.List; */ @Service @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class ConnectConfigServiceImpl extends ServiceImpl implements ConnectConfigService { - - private final ConnectConfigMapper connectConfigMapper; + @Autowired + private ConnectConfigMapper connectConfigMapper; @Override public List listForms() { diff --git a/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java b/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java index 4d8f6fd3..8a270bd0 100644 --- a/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java @@ -30,7 +30,6 @@ import cn.lili.modules.system.service.SettingService; import cn.lili.modules.system.utils.HttpUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.springframework.beans.factory.annotation.Autowired; @@ -53,26 +52,20 @@ import java.util.concurrent.TimeUnit; */ @Slf4j @Service -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class ConnectServiceImpl extends ServiceImpl implements ConnectService { @Autowired private SettingService settingService; - @Autowired private MemberService memberService; - + @Autowired private MemberTokenGenerate memberTokenGenerate; - - private final Cache cache; + @Autowired + private Cache cache; static boolean AUTO_REGION = true; - @Autowired - public void setMemberTokenGenerate(MemberTokenGenerate memberTokenGenerate) { - this.memberTokenGenerate = memberTokenGenerate; - } @Override public Token unionLoginCallback(String type, String unionid, String uuid, boolean longTerm) throws NoPermissionException { diff --git a/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java b/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java index 4df6953b..820cf256 100644 --- a/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java +++ b/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java @@ -42,19 +42,18 @@ import java.io.IOException; * 2020-11-25 21:16 */ @Component -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class ConnectUtil { - - private final Cache cache; - - private final ConnectService connectService; - - private final SettingService settingService; - - private final ApiProperties apiProperties; - - private final DomainProperties domainProperties; + @Autowired + private Cache cache; + @Autowired + private ConnectService connectService; + @Autowired + private SettingService settingService; + @Autowired + private ApiProperties apiProperties; + @Autowired + private DomainProperties domainProperties; static String prefix = "/buyer/connect/callback/"; diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java index bdde5e00..078e5a34 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java @@ -43,16 +43,17 @@ import java.util.Date; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class DistributionCashServiceImpl extends ServiceImpl implements DistributionCashService { //分销员 - private final DistributionService distributionService; + @Autowired + private DistributionService distributionService; //会员余额 - private final MemberWalletService memberWalletService; - - private final RocketMQTemplate rocketMQTemplate; - - private final RocketmqCustomProperties rocketmqCustomProperties; + @Autowired + private MemberWalletService memberWalletService; + @Autowired + private RocketMQTemplate rocketMQTemplate; + @Autowired + private RocketmqCustomProperties rocketmqCustomProperties; @Override public Boolean cash(Double applyMoney) { diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionGoodsServiceImpl.java index 2ccee635..b3cacfc7 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionGoodsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionGoodsServiceImpl.java @@ -19,7 +19,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -33,11 +32,11 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class DistributionGoodsServiceImpl extends ServiceImpl implements DistributionGoodsService { //分销商品 - private final DistributionGoodsMapper distributionGoodsMapper; + @Autowired + private DistributionGoodsMapper distributionGoodsMapper; //分销员 @Autowired private DistributionService distributionService; diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java index aebcf034..e60aedac 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java @@ -40,17 +40,20 @@ import java.util.List; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class DistributionOrderServiceImpl extends ServiceImpl implements DistributionOrderService { //订单 - private final OrderService orderService; + @Autowired + private OrderService orderService; //店铺流水 - private final StoreFlowService storeFlowService; + @Autowired + private StoreFlowService storeFlowService; //分销员 - private final DistributionService distributionService; + @Autowired + private DistributionService distributionService; //系统设置 - private final SettingService settingService; + @Autowired + private SettingService settingService; @Override public IPage getDistributionOrderPage(DistributionOrderSearchParams distributionOrderSearchParams) { diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionSelectedGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionSelectedGoodsServiceImpl.java index 4abafd47..b7cac66c 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionSelectedGoodsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionSelectedGoodsServiceImpl.java @@ -18,11 +18,11 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class DistributionSelectedGoodsServiceImpl extends ServiceImpl implements DistributionSelectedGoodsService { //分销员 - private final DistributionService distributionService; + @Autowired + private DistributionService distributionService; @Override public boolean add(String distributionGoodsId) { //检查分销功能开关 diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java index 37ecff55..170d1f62 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java @@ -22,7 +22,6 @@ import cn.lili.modules.system.service.SettingService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -38,18 +37,23 @@ import java.util.concurrent.TimeUnit; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class DistributionServiceImpl extends ServiceImpl implements DistributionService { //会员 @Autowired private MemberService memberService; + //分销员 - private final DistributionMapper distributionMapper; + @Autowired + private DistributionMapper distributionMapper; + //缓存 - private final Cache cache; + @Autowired + private Cache cache; + //设置 - private final SettingService settingService; + @Autowired + private SettingService settingService; @Override public IPage distributionPage(DistributionSearchParams distributionSearchParams, PageVO page) { diff --git a/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java b/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java index f56fb0e4..0c175697 100644 --- a/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java @@ -15,7 +15,6 @@ import cn.lili.modules.file.service.FileService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -31,10 +30,10 @@ import java.util.List; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class FileServiceImpl extends ServiceImpl implements FileService { - private final FileManagerPlugin fileManagerPlugin; + @Autowired + private FileManagerPlugin fileManagerPlugin; @Override public void batchDelete(List ids) { diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/BrandServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/BrandServiceImpl.java index 3d567979..ebff552a 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/BrandServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/BrandServiceImpl.java @@ -31,10 +31,11 @@ import java.util.stream.Collectors; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class BrandServiceImpl extends ServiceImpl implements BrandService { + //分类品牌绑定 - private final CategoryBrandService categoryBrandService; + @Autowired + private CategoryBrandService categoryBrandService; @Override public IPage getBrandsByPage(BrandPageDTO page) { diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryBrandServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryBrandServiceImpl.java index d4fe044b..0f5e0199 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryBrandServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryBrandServiceImpl.java @@ -22,10 +22,11 @@ import java.util.List; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class CategoryBrandServiceImpl extends ServiceImpl implements CategoryBrandService { + //分类品牌绑定 - private final CategoryBrandMapper categoryBrandMapper; + @Autowired + private CategoryBrandMapper categoryBrandMapper; @Override public List getCategoryBrandList(String categoryId) { diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryParameterGroupServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryParameterGroupServiceImpl.java index 13ed9b7d..4a45013f 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryParameterGroupServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryParameterGroupServiceImpl.java @@ -28,10 +28,10 @@ import java.util.Map; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class CategoryParameterGroupServiceImpl extends ServiceImpl implements CategoryParameterGroupService { //商品参数 - private final ParametersService parametersService; + @Autowired + private ParametersService parametersService; @Override public List getCategoryParams(String categoryId) { diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java index dfd6f47e..b4207081 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java @@ -34,14 +34,15 @@ import java.util.stream.Collectors; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class CategoryServiceImpl extends ServiceImpl implements CategoryService { private static final String DELETE_FLAG_COLUMN = "delete_flag"; //缓存 - private final Cache cache; + @Autowired + private Cache cache; //分类 - private final CategoryMapper categoryMapper; + @Autowired + private CategoryMapper categoryMapper; @Override public List dbList(String parentId) { diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategorySpecificationServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategorySpecificationServiceImpl.java index 67f4d626..9b308210 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategorySpecificationServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategorySpecificationServiceImpl.java @@ -22,10 +22,9 @@ import java.util.List; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class CategorySpecificationServiceImpl extends ServiceImpl implements CategorySpecificationService { - - private final CategorySpecificationMapper categorySpecificationMapper; + @Autowired + private CategorySpecificationMapper categorySpecificationMapper; @Override public List getCategorySpecList(String categoryId) { diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java index 6b674caf..3566b0e7 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java @@ -31,14 +31,16 @@ import java.util.*; **/ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class DraftGoodsServiceImpl extends ServiceImpl implements DraftGoodsService { //分类 - private final CategoryService categoryService; + @Autowired + private CategoryService categoryService; //商品相册 - private final GoodsGalleryService goodsGalleryService; + @Autowired + private GoodsGalleryService goodsGalleryService; //规格商品 - private final GoodsSkuService goodsSkuService; + @Autowired + private GoodsSkuService goodsSkuService; @Override public boolean addGoodsDraft(DraftGoodsDTO draftGoods) { diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsGalleryServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsGalleryServiceImpl.java index 40d9b220..d211d078 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsGalleryServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsGalleryServiceImpl.java @@ -29,14 +29,16 @@ import java.util.List; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class GoodsGalleryServiceImpl extends ServiceImpl implements GoodsGalleryService { //文件 - private final FileManagerPlugin fileManagerPlugin; + @Autowired + private FileManagerPlugin fileManagerPlugin; //商品相册数据层 - private final GoodsGalleryMapper goodsGalleryMapper; + @Autowired + private GoodsGalleryMapper goodsGalleryMapper; //设置 - private final SettingService settingService; + @Autowired + private SettingService settingService; @Override diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsParamsServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsParamsServiceImpl.java index 144f1638..729d1c32 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsParamsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsParamsServiceImpl.java @@ -31,10 +31,10 @@ import java.util.Map; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class GoodsParamsServiceImpl extends ServiceImpl implements GoodsParamsService { //分类-参数绑定 - private final CategoryParameterGroupService categoryParameterGroupService; + @Autowired + private CategoryParameterGroupService categoryParameterGroupService; @Override public void addParams(List paramList, String goodsId) { diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java index e4b355af..2f1a894f 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java @@ -54,27 +54,35 @@ import java.util.List; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class GoodsServiceImpl extends ServiceImpl implements GoodsService { //商品 - private final GoodsMapper goodsMapper; + @Autowired + private GoodsMapper goodsMapper; //商品属性 - private final GoodsParamsService goodsParamsService; + @Autowired + private GoodsParamsService goodsParamsService; //分类 - private final CategoryService categoryService; + @Autowired + private CategoryService categoryService; //设置 - private final SettingService settingService; + @Autowired + private SettingService settingService; //商品相册 - private final GoodsGalleryService goodsGalleryService; + @Autowired + private GoodsGalleryService goodsGalleryService; //商品规格 + @Autowired private GoodsSkuService goodsSkuService; //店铺详情 + @Autowired private StoreService storeService; //rocketMq - private final RocketMQTemplate rocketMQTemplate; + @Autowired + private RocketMQTemplate rocketMQTemplate; //rocketMq配置 - private final RocketmqCustomProperties rocketmqCustomProperties; + @Autowired + private RocketmqCustomProperties rocketmqCustomProperties; @Override public void underStoreGoods(String storeId) { @@ -351,13 +359,4 @@ public class GoodsServiceImpl extends ServiceImpl implements return goods; } - @Autowired - public void setGoodsSkuService(GoodsSkuService goodsSkuService) { - this.goodsSkuService = goodsSkuService; - } - - @Autowired - public void setStoreService(StoreService storeService) { - this.storeService = storeService; - } } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java index 762dbbc4..a7e86c3e 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java @@ -33,7 +33,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; @@ -51,25 +50,32 @@ import java.util.stream.Collectors; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class GoodsSkuServiceImpl extends ServiceImpl implements GoodsSkuService { //缓存 - private final Cache cache; + @Autowired + private Cache cache; //分类 - private final CategoryService categoryService; + @Autowired + private CategoryService categoryService; //商品相册 - private final GoodsGalleryService goodsGalleryService; + @Autowired + private GoodsGalleryService goodsGalleryService; //规格 - private final SpecificationService specificationService; + @Autowired + private SpecificationService specificationService; //规格项 - private final SpecValuesService specValuesService; + @Autowired + private SpecValuesService specValuesService; //缓存 - private final StringRedisTemplate stringRedisTemplate; + @Autowired + private StringRedisTemplate stringRedisTemplate; //rocketMq - private final RocketMQTemplate rocketMQTemplate; + @Autowired + private RocketMQTemplate rocketMQTemplate; //rocketMq配置 - private final RocketmqCustomProperties rocketmqCustomProperties; + @Autowired + private RocketmqCustomProperties rocketmqCustomProperties; //会员评价 @Autowired private MemberEvaluationService memberEvaluationService; diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsUnitServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsUnitServiceImpl.java index 499638fb..9a0ec650 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsUnitServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsUnitServiceImpl.java @@ -18,7 +18,6 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class GoodsUnitServiceImpl extends ServiceImpl implements GoodsUnitService { } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/ParametersServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/ParametersServiceImpl.java index 27ee4e58..79798e13 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/ParametersServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/ParametersServiceImpl.java @@ -17,6 +17,5 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class ParametersServiceImpl extends ServiceImpl implements ParametersService { } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/SpecValuesServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/SpecValuesServiceImpl.java index aceaf4c5..049aa874 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/SpecValuesServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/SpecValuesServiceImpl.java @@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -29,10 +28,10 @@ import java.util.List; @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class SpecValuesServiceImpl extends ServiceImpl implements SpecValuesService { //规格 + @Autowired private SpecificationService specificationService; @Override @@ -111,8 +110,4 @@ public class SpecValuesServiceImpl extends ServiceImpl implements SpecificationService { + //分类-规格绑定 - private final CategorySpecificationService categorySpecificationService; + @Autowired + private CategorySpecificationService categorySpecificationService; //规格值 + @Autowired private SpecValuesService specValuesService; @Override @@ -162,8 +163,4 @@ public class SpecificationServiceImpl extends ServiceImpl implements FootprintService { //足迹数据层 - private final FootprintMapper footprintMapper; + @Autowired + private FootprintMapper footprintMapper; //es商品业务层 - private final EsGoodsSearchService esGoodsSearchService; + @Autowired + private EsGoodsSearchService esGoodsSearchService; @Override public FootPrint saveFootprint(FootPrint footPrint) { diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/GoodsCollectionServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/GoodsCollectionServiceImpl.java index 06341860..11d26725 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/GoodsCollectionServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/GoodsCollectionServiceImpl.java @@ -34,15 +34,18 @@ import java.util.Optional; */ @Service @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) + public class GoodsCollectionServiceImpl extends ServiceImpl implements GoodsCollectionService { //商品收藏 - private final GoodsCollectionMapper goodsCollectionMapper; + @Autowired + private GoodsCollectionMapper goodsCollectionMapper; //rocketMq - private final RocketMQTemplate rocketMQTemplate; + @Autowired + private RocketMQTemplate rocketMQTemplate; //rocketMq配置 - private final RocketmqCustomProperties rocketmqCustomProperties; + @Autowired + private RocketmqCustomProperties rocketmqCustomProperties; @Override public IPage goodsCollection(PageVO pageVo) { diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberEvaluationServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberEvaluationServiceImpl.java index 8ef5c7cd..388b9f61 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberEvaluationServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberEvaluationServiceImpl.java @@ -59,23 +59,29 @@ import java.util.Map; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MemberEvaluationServiceImpl extends ServiceImpl implements MemberEvaluationService { //会员评价数据层 - private final MemberEvaluationMapper memberEvaluationMapper; + @Autowired + private MemberEvaluationMapper memberEvaluationMapper; //订单 - private final OrderService orderService; + @Autowired + private OrderService orderService; //子订单 - private final OrderItemService orderItemService; + @Autowired + private OrderItemService orderItemService; //会员 - private final MemberService memberService; + @Autowired + private MemberService memberService; //商品 - private final GoodsSkuService goodsSkuService; + @Autowired + private GoodsSkuService goodsSkuService; //rocketMq - private final RocketMQTemplate rocketMQTemplate; + @Autowired + private RocketMQTemplate rocketMQTemplate; //rocketMq配置 - private final RocketmqCustomProperties rocketmqCustomProperties; + @Autowired + private RocketmqCustomProperties rocketmqCustomProperties; @Override public IPage queryByParams(EvaluationQueryParams queryParams) { diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberNoticeSenterServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberNoticeSenterServiceImpl.java index aa5f3e8b..7782f184 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberNoticeSenterServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberNoticeSenterServiceImpl.java @@ -28,13 +28,14 @@ import java.util.List; */ @Service @Transactional(propagation = Propagation.REQUIRED, rollbackFor = java.lang.Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MemberNoticeSenterServiceImpl extends ServiceImpl implements MemberNoticeSenterService { //会员 - private final MemberService memberService; + @Autowired + private MemberService memberService; //会员站内信 - private final MemberNoticeService memberNoticeService; + @Autowired + private MemberNoticeService memberNoticeService; @Override public boolean customSave(MemberNoticeSenter memberNoticeSenter) { diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java index de21a05c..8a493180 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java @@ -20,10 +20,10 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MemberPointsHistoryServiceImpl extends ServiceImpl implements MemberPointsHistoryService { - private final MemberPointsHistoryMapper memberPointsHistoryMapper; + @Autowired + private MemberPointsHistoryMapper memberPointsHistoryMapper; @Override public MemberPointsHistoryVO getMemberPointsHistoryVO(String memberId) { diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberReceiptServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberReceiptServiceImpl.java index 0a172585..7175161b 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberReceiptServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberReceiptServiceImpl.java @@ -33,10 +33,9 @@ import java.util.List; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MemberReceiptServiceImpl extends ServiceImpl implements MemberReceiptService { - - private final MemberService memberService; + @Autowired + private MemberService memberService; @Override public IPage getPage(MemberReceiptVO memberReceiptVO, PageVO pageVO) { diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java index 11f42aa3..fe464474 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java @@ -44,7 +44,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; @@ -61,25 +60,31 @@ import java.util.List; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MemberServiceImpl extends ServiceImpl implements MemberService { //会员数据处理层 - private final MemberMapper memberMapper; + @Autowired + private MemberMapper memberMapper; //会员token + @Autowired private MemberTokenGenerate memberTokenGenerate; //商家token + @Autowired private StoreTokenGenerate storeTokenGenerate; //联合登录 + @Autowired private ConnectService connectService; @Autowired private StoreService storeService; //RocketMQ 配置 - private final RocketmqCustomProperties rocketmqCustomProperties; + @Autowired + private RocketmqCustomProperties rocketmqCustomProperties; //RocketMQ - private final RocketMQTemplate rocketMQTemplate; + @Autowired + private RocketMQTemplate rocketMQTemplate; //缓存 - private final Cache cache; + @Autowired + private Cache cache; @Override public Member findByUsername(String userName) { @@ -550,19 +555,4 @@ public class MemberServiceImpl extends ServiceImpl impleme throw new ServiceException(ResultCode.USER_PHONE_EXIST); } } - - @Autowired - public void setConnectService(ConnectService connectService) { - this.connectService = connectService; - } - - @Autowired - public void setMemberTokenGenerate(MemberTokenGenerate memberTokenGenerate) { - this.memberTokenGenerate = memberTokenGenerate; - } - - @Autowired - public void setStoreTokenGenerate(StoreTokenGenerate storeTokenGenerate) { - this.storeTokenGenerate = storeTokenGenerate; - } } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberSignServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberSignServiceImpl.java index bbca303c..cf863383 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberSignServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberSignServiceImpl.java @@ -39,19 +39,23 @@ import java.util.Map; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MemberSignServiceImpl extends ServiceImpl implements MemberSignService { //会员签到 - private final MemberSignMapper memberSignMapper; + @Autowired + private MemberSignMapper memberSignMapper; //RocketMQ - private final RocketMQTemplate rocketMQTemplate; + @Autowired + private RocketMQTemplate rocketMQTemplate; //RocketMQ 配置 - private final RocketmqCustomProperties rocketmqCustomProperties; + @Autowired + private RocketmqCustomProperties rocketmqCustomProperties; //配置 - private final SettingService settingService; + @Autowired + private SettingService settingService; //会员 - private final MemberService memberService; + @Autowired + private MemberService memberService; @Override diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWalletServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWalletServiceImpl.java index 1e461cf1..014ee379 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWalletServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWalletServiceImpl.java @@ -27,7 +27,6 @@ import cn.lili.modules.system.service.SettingService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.gson.Gson; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Service; @@ -44,18 +43,22 @@ import java.util.Date; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MemberWalletServiceImpl extends ServiceImpl implements MemberWalletService { //预存款数据层 - private final MemberWalletMapper walletMapper; + @Autowired + private MemberWalletMapper walletMapper; //预存款日志 - private final WalletLogService walletLogService; + @Autowired + private WalletLogService walletLogService; //设置 - private final SettingService settingService; + @Autowired + private SettingService settingService; //会员 - private final MemberService memberService; + @Autowired + private MemberService memberService; //会员提现申请 + @Autowired private MemberWithdrawApplyService memberWithdrawApplyService; @Override @@ -270,8 +273,4 @@ public class MemberWalletServiceImpl extends ServiceImpl implements MemberWithdrawApplyService { //提现申请数据层 - private final MemberWithdrawApplyMapper memberWithdrawApplyMapper; + @Autowired + private MemberWithdrawApplyMapper memberWithdrawApplyMapper; //会员余额 - private final MemberWalletService memberWalletService; + @Autowired + private MemberWalletService memberWalletService; @Override public Boolean audit(String applyId, Boolean result, String remark) { diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/StoreCollectionServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/StoreCollectionServiceImpl.java index 52859312..8ec6b0cc 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/StoreCollectionServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/StoreCollectionServiceImpl.java @@ -28,10 +28,9 @@ import java.util.Optional; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class StoreCollectionServiceImpl extends ServiceImpl implements StoreCollectionService { - - private final StoreCollectionMapper storeCollectionMapper; + @Autowired + private StoreCollectionMapper storeCollectionMapper; @Override public IPage storeCollection(PageVO pageVo) { diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/MessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/MessageServiceImpl.java index 1af5539b..ec54e23d 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/MessageServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/MessageServiceImpl.java @@ -12,7 +12,6 @@ import cn.lili.modules.message.mapper.StoreMessageMapper; import cn.lili.modules.message.service.MessageService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.messaging.simp.SimpMessagingTemplate; @@ -27,15 +26,17 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MessageServiceImpl extends ServiceImpl implements MessageService { - - private final MessageMapper messageMapper; - - private final StoreMessageMapper storeMessageMapper; - private final SimpMessagingTemplate messagingTemplate; - private final RocketMQTemplate rocketMQTemplate; - private final RocketmqCustomProperties rocketmqCustomProperties; + @Autowired + private MessageMapper messageMapper; + @Autowired + private StoreMessageMapper storeMessageMapper; + @Autowired + private SimpMessagingTemplate messagingTemplate; + @Autowired + private RocketMQTemplate rocketMQTemplate; + @Autowired + private RocketmqCustomProperties rocketmqCustomProperties; @Override diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/NoticeMessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/NoticeMessageServiceImpl.java index 2aded459..6bde7a03 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/NoticeMessageServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/NoticeMessageServiceImpl.java @@ -15,7 +15,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -30,11 +29,10 @@ import java.util.Map; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class NoticeMessageServiceImpl extends ServiceImpl implements NoticeMessageService { - - private final MemberNoticeService memberNoticeService; + @Autowired + private MemberNoticeService memberNoticeService; @Override public IPage getMessageTemplate(PageVO pageVO, String type) { diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/ShortLinkServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/ShortLinkServiceImpl.java index b69519df..be3ed903 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/ShortLinkServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/ShortLinkServiceImpl.java @@ -1,11 +1,9 @@ package cn.lili.modules.message.serviceimpl; -import cn.lili.modules.message.mapper.ShortLinkMapper; import cn.lili.modules.message.entity.dos.ShortLink; +import cn.lili.modules.message.mapper.ShortLinkMapper; import cn.lili.modules.message.service.ShortLinkService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -15,8 +13,6 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class ShortLinkServiceImpl extends ServiceImpl implements ShortLinkService { - private final ShortLinkMapper shortLinkMapper; } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsReachServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsReachServiceImpl.java index 620c7077..11f6ca92 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsReachServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsReachServiceImpl.java @@ -26,11 +26,11 @@ import java.util.List; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class SmsReachServiceImpl extends ServiceImpl implements SmsReachService { - - private final RocketMQTemplate rocketMQTemplate; - private final RocketmqCustomProperties rocketmqCustomProperties; + @Autowired + private RocketMQTemplate rocketMQTemplate; + @Autowired + private RocketmqCustomProperties rocketmqCustomProperties; @Override diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsSignServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsSignServiceImpl.java index d77efb5e..8e355950 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsSignServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsSignServiceImpl.java @@ -29,10 +29,9 @@ import java.util.Map; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class SmsSignServiceImpl extends ServiceImpl implements SmsSignService { - - private final AliSmsUtil aliSmsUtil; + @Autowired + private AliSmsUtil aliSmsUtil; @Override public void addSmsSign(SmsSign smsSign) { diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsTemplateServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsTemplateServiceImpl.java index 028d417a..9bd7e980 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsTemplateServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsTemplateServiceImpl.java @@ -26,10 +26,9 @@ import java.util.Map; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class SmsTemplateServiceImpl extends ServiceImpl implements SmsTemplateService { - - private final AliSmsUtil aliSmsUtil; + @Autowired + private AliSmsUtil aliSmsUtil; @Override diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/StoreMessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/StoreMessageServiceImpl.java index 6a72d6b1..c7fe0d3c 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/StoreMessageServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/StoreMessageServiceImpl.java @@ -13,7 +13,6 @@ import cn.lili.modules.message.service.StoreMessageService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.elasticsearch.ResourceNotFoundException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -29,10 +28,9 @@ import java.util.List; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class StoreMessageServiceImpl extends ServiceImpl implements StoreMessageService { - - private final StoreMessageMapper storeMessageMapper; + @Autowired + private StoreMessageMapper storeMessageMapper; @Override public boolean deleteByMessageId(String messageId) { diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMPMessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMPMessageServiceImpl.java index daaaa215..43328053 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMPMessageServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMPMessageServiceImpl.java @@ -18,7 +18,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -35,11 +34,12 @@ import java.util.Map; */ @Service @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) -public class WechatMPMessageServiceImpl extends ServiceImpl implements WechatMPMessageService { - private final WechatMPMessageMapper wechatMPMessageMapper; - private final WechatAccessTokenUtil wechatAccessTokenUtil; +public class WechatMPMessageServiceImpl extends ServiceImpl implements WechatMPMessageService { + @Autowired + private WechatMPMessageMapper wechatMPMessageMapper; + @Autowired + private WechatAccessTokenUtil wechatAccessTokenUtil; //get 获取所有的模版 private final String allMsgTpl = "https://api.weixin.qq.com/wxaapi/newtmpl/gettemplate?access_token="; diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java index 1d323640..368a1cd1 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java @@ -34,11 +34,11 @@ import java.util.Map; */ @Service @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class WechatMessageServiceImpl extends ServiceImpl implements WechatMessageService { - - private final WechatMessageMapper wechatMessageMapper; - private final WechatAccessTokenUtil wechatAccessTokenUtil; + @Autowired + private WechatMessageMapper wechatMessageMapper; + @Autowired + private WechatAccessTokenUtil wechatAccessTokenUtil; //get 获取所有的模版 private final String allMsgTpl = "https://api.weixin.qq.com/cgi-bin/template/get_all_private_template?access_token="; diff --git a/framework/src/main/java/cn/lili/modules/message/util/WechatAccessTokenUtil.java b/framework/src/main/java/cn/lili/modules/message/util/WechatAccessTokenUtil.java index 07f145a3..26ca19e2 100644 --- a/framework/src/main/java/cn/lili/modules/message/util/WechatAccessTokenUtil.java +++ b/framework/src/main/java/cn/lili/modules/message/util/WechatAccessTokenUtil.java @@ -27,12 +27,11 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class WechatAccessTokenUtil { - - private final Cache cache; - - private final SettingService settingService; + @Autowired + private Cache cache; + @Autowired + private SettingService settingService; /** * 获取某一平台等cgi token 用于业务调用，例如发送公众号消息 diff --git a/framework/src/main/java/cn/lili/modules/message/util/WechatMpCodeUtil.java b/framework/src/main/java/cn/lili/modules/message/util/WechatMpCodeUtil.java index 09600fda..6cfa3a9a 100644 --- a/framework/src/main/java/cn/lili/modules/message/util/WechatMpCodeUtil.java +++ b/framework/src/main/java/cn/lili/modules/message/util/WechatMpCodeUtil.java @@ -7,7 +7,6 @@ import cn.lili.modules.message.entity.dos.ShortLink; import cn.lili.modules.message.service.ShortLinkService; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.http.HttpEntity; @@ -38,16 +37,13 @@ import java.util.Map; */ @Slf4j @Component -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class WechatMpCodeUtil { private static String UN_LIMIT_API = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token="; private static String CREATE_QR_CODE = "https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token="; - @Autowired private WechatAccessTokenUtil wechatAccessTokenUtil; - @Autowired private ShortLinkService shortLinkService; diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/TradeBuilder.java b/framework/src/main/java/cn/lili/modules/order/cart/render/TradeBuilder.java index 19429c73..186ebe8a 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/TradeBuilder.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/TradeBuilder.java @@ -1,13 +1,12 @@ package cn.lili.modules.order.cart.render; import cn.lili.modules.order.cart.entity.dto.TradeDTO; +import cn.lili.modules.order.cart.entity.enums.CartTypeEnum; import cn.lili.modules.order.cart.entity.vo.CartSkuVO; import cn.lili.modules.order.cart.entity.vo.CartVO; +import cn.lili.modules.order.cart.service.CartService; import cn.lili.modules.order.order.entity.dos.Trade; import cn.lili.modules.order.order.service.TradeService; -import cn.lili.modules.order.cart.entity.enums.CartTypeEnum; -import cn.lili.modules.order.cart.service.CartService; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -24,12 +23,13 @@ import java.util.stream.Collectors; */ @Service @Slf4j -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class TradeBuilder { //购物车渲染 - private final List cartRenderSteps; + @Autowired + private List cartRenderSteps; //交易 - private final TradeService tradeService; + @Autowired + private TradeService tradeService; /** * 渲染整比交易 @@ -44,12 +44,8 @@ public class TradeBuilder { /** * 0-> 校验商品 1-》 满优惠渲染 2->渲染优惠 3->优惠券渲染 4->计算运费 5->计算价格 6->分销渲染 7->扩展操作 */ - private CartService cartService; - @Autowired - public void setCartService(CartService cartService) { - this.cartService = cartService; - } + private CartService cartService; /** * 构造购物车 diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CartPriceRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CartPriceRender.java index 91286e04..4a15ec65 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CartPriceRender.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CartPriceRender.java @@ -26,12 +26,12 @@ import java.util.Map; */ @Order(5) @Service -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class CartPriceRender implements CartRenderStep { //商品分类 - private final CategoryService categoryService; + @Autowired + private CategoryService categoryService; @Override public void render(TradeDTO tradeDTO) { diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java index ce35b594..f5a5476d 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java @@ -21,10 +21,10 @@ import org.springframework.stereotype.Service; */ @Order(0) @Service -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class CheckDataRender implements CartRenderStep { - private final GoodsSkuService goodsSkuService; + @Autowired + private GoodsSkuService goodsSkuService; @Override public void render(TradeDTO tradeDTO) { diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/DistributionPriceRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/DistributionPriceRender.java index 5d50d612..b8b53792 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/DistributionPriceRender.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/DistributionPriceRender.java @@ -19,12 +19,12 @@ import org.springframework.stereotype.Service; */ @Service @Order(6) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class DistributionPriceRender implements CartRenderStep { /** * 缓存 */ - private final Cache cache; + @Autowired + private Cache cache; @Override public void render(TradeDTO tradeDTO) { diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/FullDiscountRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/FullDiscountRender.java index 7b24bf15..33fa9b8c 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/FullDiscountRender.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/FullDiscountRender.java @@ -27,10 +27,10 @@ import java.util.stream.Collectors; */ @Service @Order(1) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class FullDiscountRender implements CartRenderStep { - private final FullDiscountService fullDiscountService; + @Autowired + private FullDiscountService fullDiscountService; @Override public void render(TradeDTO tradeDTO) { diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuFreightRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuFreightRender.java index 8a682f30..77cb7bbb 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuFreightRender.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuFreightRender.java @@ -25,10 +25,10 @@ import java.util.List; */ @Order(4) @Service -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class SkuFreightRender implements CartRenderStep { - private final FreightTemplateService freightTemplateService; + @Autowired + private FreightTemplateService freightTemplateService; @Override public void render(TradeDTO tradeDTO) { diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuPromotionRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuPromotionRender.java index 44ae91b9..f3150def 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuPromotionRender.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuPromotionRender.java @@ -37,12 +37,13 @@ import java.util.stream.Collectors; */ @Service @Order(2) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class SkuPromotionRender implements CartRenderStep { //促销计算 - private final PromotionPriceService promotionPriceService; + @Autowired + private PromotionPriceService promotionPriceService; //促销商品 - private final PromotionGoodsService promotionGoodsService; + @Autowired + private PromotionGoodsService promotionGoodsService; @Override public void render(TradeDTO tradeDTO) { diff --git a/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java index 64e06460..2940e6e8 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java @@ -35,7 +35,6 @@ import cn.lili.modules.store.entity.dos.FreightTemplateChild; import cn.lili.modules.store.entity.vos.FreightTemplateVO; import cn.lili.modules.store.service.FreightTemplateService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -53,25 +52,33 @@ import java.util.stream.Collectors; */ @Slf4j @Service -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class CartServiceImpl implements CartService { static String errorMessage = "购物车异常，请稍后重试"; + //缓存 - private final Cache cache; + @Autowired + private Cache cache; //会员优惠券 - private final MemberCouponService memberCouponService; + @Autowired + private MemberCouponService memberCouponService; //规格商品 - private final GoodsSkuService goodsSkuService; + @Autowired + private GoodsSkuService goodsSkuService; //促销商品 - private final PromotionGoodsService promotionGoodsService; + @Autowired + private PromotionGoodsService promotionGoodsService; //会员地址 - private final MemberAddressService memberAddressService; + @Autowired + private MemberAddressService memberAddressService; //ES商品 - private final EsGoodsSearchService esGoodsSearchService; + @Autowired + private EsGoodsSearchService esGoodsSearchService; //运费模板 - private final FreightTemplateService freightTemplateService; + @Autowired + private FreightTemplateService freightTemplateService; //交易 + @Autowired private TradeBuilder tradeBuilder; @Override diff --git a/framework/src/main/java/cn/lili/modules/order/order/aop/AfterSaleOperationLogAspect.java b/framework/src/main/java/cn/lili/modules/order/order/aop/AfterSaleOperationLogAspect.java index ecd11da7..a206a4b0 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/aop/AfterSaleOperationLogAspect.java +++ b/framework/src/main/java/cn/lili/modules/order/order/aop/AfterSaleOperationLogAspect.java @@ -28,11 +28,10 @@ import java.util.Map; @Slf4j @Aspect @Component -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class AfterSaleOperationLogAspect { - - private final AfterSaleLogService afterSaleLogService; + @Autowired + private AfterSaleLogService afterSaleLogService; @AfterReturning(returning = "rvt", pointcut = "@annotation(cn.lili.modules.order.order.aop.AfterSaleLogPoint)") public void afterReturning(JoinPoint joinPoint, Object rvt) { diff --git a/framework/src/main/java/cn/lili/modules/order/order/aop/OrderOperationLogAspect.java b/framework/src/main/java/cn/lili/modules/order/order/aop/OrderOperationLogAspect.java index e8552576..e446c292 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/aop/OrderOperationLogAspect.java +++ b/framework/src/main/java/cn/lili/modules/order/order/aop/OrderOperationLogAspect.java @@ -25,10 +25,10 @@ import java.util.Map; */ @Aspect @Component -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class OrderOperationLogAspect { - private final OrderLogService orderLogService; + @Autowired + private OrderLogService orderLogService; @After("@annotation(cn.lili.modules.order.order.aop.OrderLogPoint)") public void doAfter(JoinPoint joinPoint) { diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java index aae3910e..c8ad0c53 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java @@ -47,7 +47,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -63,23 +62,29 @@ import java.util.Date; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class AfterSaleServiceImpl extends ServiceImpl implements AfterSaleService { //订单 - private final OrderService orderService; + @Autowired + private OrderService orderService; //订单货物 - private final OrderItemService orderItemService; + @Autowired + private OrderItemService orderItemService; //物流公司 - private final LogisticsService logisticsService; + @Autowired + private LogisticsService logisticsService; //店铺详情 - private final StoreDetailService storeDetailService; + @Autowired + private StoreDetailService storeDetailService; //售后支持，这里用于退款操作 + @Autowired private RefundSupport refundSupport; //RocketMQ配置 - private final RocketmqCustomProperties rocketmqCustomProperties; + @Autowired + private RocketmqCustomProperties rocketmqCustomProperties; //RocketMQ - private final RocketMQTemplate rocketMQTemplate; + @Autowired + private RocketMQTemplate rocketMQTemplate; @Override public IPage getAfterSalePages(AfterSaleSearchParams saleSearchParams) { @@ -483,11 +488,6 @@ public class AfterSaleServiceImpl extends ServiceImpl implements OrderComplaintService { //订单 - private final OrderService orderService; + @Autowired + private OrderService orderService; //订单货物 - private final OrderItemService orderItemService; + @Autowired + private OrderItemService orderItemService; //商品规格 - private final GoodsSkuService goodsSkuService; + @Autowired + private GoodsSkuService goodsSkuService; //交易投诉沟通 - private final OrderComplaintCommunicationService orderComplaintCommunicationService; + @Autowired + private OrderComplaintCommunicationService orderComplaintCommunicationService; /** * 分页获取交易投诉信息 diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderItemServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderItemServiceImpl.java index 0723b9c8..b385f6dd 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderItemServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderItemServiceImpl.java @@ -28,10 +28,10 @@ import java.util.List; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class OrderItemServiceImpl extends ServiceImpl implements OrderItemService { - private final OrderItemMapper orderItemMapper; + @Autowired + private OrderItemMapper orderItemMapper; @Override public void updateCommentStatus(String orderItemSn, CommentStatusEnum commentStatusEnum) { diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPriceServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPriceServiceImpl.java index 369191cc..2bd6c150 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPriceServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPriceServiceImpl.java @@ -21,7 +21,6 @@ import cn.lili.modules.order.order.service.OrderService; import cn.lili.modules.payment.kit.enums.PaymentMethodEnum; import cn.lili.modules.payment.kit.plugin.bankTransfer.BankTransferPlugin; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,20 +35,23 @@ import java.util.List; */ @Service @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class OrderPriceServiceImpl implements OrderPriceService { //线下收款 - private final BankTransferPlugin bankTransferPlugin; - - private final OrderItemService orderItemService; - + @Autowired + private BankTransferPlugin bankTransferPlugin; + //订单货物 + @Autowired + private OrderItemService orderItemService; //交易数据层 - private final TradeMapper tradeMapper; + @Autowired + private TradeMapper tradeMapper; //订单 - private final OrderService orderService; + @Autowired + private OrderService orderService; //商品分类 - private final CategoryService categoryService; + @Autowired + private CategoryService categoryService; @Override @SystemLogPoint(description = "修改订单价格", customerLog = "'订单编号:'+#orderSn +'，价格修改为：'+#orderPrice") diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java index 297e3c8c..078405c5 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java @@ -60,7 +60,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -78,19 +77,20 @@ import java.util.List; */ @Service @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) + public class OrderServiceImpl extends ServiceImpl implements OrderService { private static final String ORDER_SN_COLUMN = "order_sn"; //订单数据层 - private final OrderMapper orderMapper; - + @Autowired + private OrderMapper orderMapper; //延时任务 - private final TimeTrigger timeTrigger; - + @Autowired + private TimeTrigger timeTrigger; //订单货物数据层 - private final OrderItemMapper orderItemMapper; + @Autowired + private OrderItemMapper orderItemMapper; //发票 @Autowired private ReceiptService receiptService; @@ -694,19 +694,4 @@ public class OrderServiceImpl extends ServiceImpl implements } } - @Autowired - public void setStoreFlowService(StoreFlowService storeFlowService) { - this.storeFlowService = storeFlowService; - } - - @Autowired - public void setPintuanService(PintuanService pintuanService) { - this.pintuanService = pintuanService; - } - - @Autowired - private void setGoodsSkuService(GoodsSkuService goodsSkuService) { - this.goodsSkuService = goodsSkuService; - } - } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/ReceiptServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/ReceiptServiceImpl.java index 4c076927..ed967f1f 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/ReceiptServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/ReceiptServiceImpl.java @@ -28,11 +28,11 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class ReceiptServiceImpl extends ServiceImpl implements ReceiptService { //发票mapper - private final ReceiptMapper receiptMapper; + @Autowired + private ReceiptMapper receiptMapper; @Override diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java index 8c7772ea..76a2d176 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java @@ -2,8 +2,6 @@ package cn.lili.modules.order.order.serviceimpl; import cn.lili.common.utils.*; import cn.lili.common.vo.PageVO; -import cn.lili.modules.goods.service.CategoryService; -import cn.lili.modules.goods.service.GoodsService; import cn.lili.modules.order.order.entity.dos.AfterSale; import cn.lili.modules.order.order.entity.dos.Order; import cn.lili.modules.order.order.entity.dos.OrderItem; @@ -15,14 +13,12 @@ import cn.lili.modules.order.order.service.OrderItemService; import cn.lili.modules.order.order.service.OrderService; import cn.lili.modules.order.order.service.StoreFlowService; import cn.lili.modules.payment.entity.RefundLog; -import cn.lili.modules.payment.service.PaymentService; import cn.lili.modules.payment.service.RefundLogService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -41,21 +37,17 @@ import java.util.List; @Slf4j @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class StoreFlowServiceImpl extends ServiceImpl implements StoreFlowService { - //商品 - private final GoodsService goodsService; - //商品分类 - private final CategoryService categoryService; //订单 + @Autowired private OrderService orderService; //订单货物 + @Autowired private OrderItemService orderItemService; //退款日志 + @Autowired private RefundLogService refundLogService; - //支付日志 - private PaymentService paymentService; @Override public void payOrder(String orderSn) { @@ -159,24 +151,4 @@ public class StoreFlowServiceImpl extends ServiceImpl implements TradeService { //缓存 - private final Cache cache; + @Autowired + private Cache cache; //订单 - private final OrderService orderService; + @Autowired + private OrderService orderService; //会员 - private final MemberService memberService; + @Autowired + private MemberService memberService; //优惠券 - private final CouponService couponService; + @Autowired + private CouponService couponService; //会员优惠券 - private final MemberCouponService memberCouponService; + @Autowired + private MemberCouponService memberCouponService; //RocketMQ - private final RocketMQTemplate rocketMQTemplate; + @Autowired + private RocketMQTemplate rocketMQTemplate; //RocketMQ 配置 - private final RocketmqCustomProperties rocketmqCustomProperties; + @Autowired + private RocketmqCustomProperties rocketmqCustomProperties; @Override diff --git a/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/OrderLogServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/OrderLogServiceImpl.java index a8689098..67ce26ca 100644 --- a/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/OrderLogServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/OrderLogServiceImpl.java @@ -21,7 +21,6 @@ import java.util.List; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class OrderLogServiceImpl extends ServiceImpl implements OrderLogService { @Override diff --git a/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/RechargeServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/RechargeServiceImpl.java index 62fb18f0..6114d3c7 100644 --- a/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/RechargeServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/RechargeServiceImpl.java @@ -33,12 +33,13 @@ import java.util.Date; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class RechargeServiceImpl extends ServiceImpl implements RechargeService { //预存款 - private final RechargeMapper rechargeMapper; + @Autowired + private RechargeMapper rechargeMapper; //会员预存款 + @Autowired private MemberWalletService memberWalletService; @Override @@ -102,8 +103,4 @@ public class RechargeServiceImpl extends ServiceImpl i throw new ServiceException(ResultCode.ORDER_NOT_EXIST); } - @Autowired - public void setMemberWalletService(MemberWalletService memberWalletService) { - this.memberWalletService = memberWalletService; - } } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/WalletLogServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/WalletLogServiceImpl.java index 991116ea..a1b69f8e 100644 --- a/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/WalletLogServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/WalletLogServiceImpl.java @@ -10,7 +10,6 @@ import cn.lili.modules.order.trade.service.WalletLogService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -25,10 +24,10 @@ import java.util.Date; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class WalletLogServiceImpl extends ServiceImpl implements WalletLogService { - private final WalletLogMapper walletLogMapper; + @Autowired + private WalletLogMapper walletLogMapper; @Override public IPage depositLogPage(PageVO page, DepositQueryVO depositQueryVO) { diff --git a/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleCategoryServiceImpl.java b/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleCategoryServiceImpl.java index 7a94edaa..4a056132 100644 --- a/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleCategoryServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleCategoryServiceImpl.java @@ -32,12 +32,13 @@ import java.util.List; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class ArticleCategoryServiceImpl extends ServiceImpl implements ArticleCategoryService { //缓存 - private final Cache cache; + @Autowired + private Cache cache; //文章 + @Autowired private ArticleService articleService; @Override diff --git a/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java b/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java index 7fb7b283..0a1f9f71 100644 --- a/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java @@ -18,7 +18,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -33,10 +32,10 @@ import java.util.List; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class ArticleServiceImpl extends ServiceImpl implements ArticleService { - private final ArticleMapper articleMapper; + @Autowired + private ArticleMapper articleMapper; @Override public IPage articlePage(ArticleSearchParams articleSearchParams) { diff --git a/framework/src/main/java/cn/lili/modules/page/serviceimpl/FeedbackServiceImpl.java b/framework/src/main/java/cn/lili/modules/page/serviceimpl/FeedbackServiceImpl.java index 1c7ee821..5e44a2b3 100644 --- a/framework/src/main/java/cn/lili/modules/page/serviceimpl/FeedbackServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/page/serviceimpl/FeedbackServiceImpl.java @@ -18,7 +18,6 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class FeedbackServiceImpl extends ServiceImpl implements FeedbackService { } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java index 795f5934..afe8386b 100644 --- a/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java @@ -29,10 +29,9 @@ import org.springframework.stereotype.Service; * @date 2020/12/11 9:15 */ @Service -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class PageDataServiceImpl extends ServiceImpl implements PageDataService { - - private final PageDataMapper pageDataMapper; + @Autowired + private PageDataMapper pageDataMapper; @Override public void addStorePageData(String storeId) { diff --git a/framework/src/main/java/cn/lili/modules/page/serviceimpl/SpecialServiceImpl.java b/framework/src/main/java/cn/lili/modules/page/serviceimpl/SpecialServiceImpl.java index b401e3be..85a19ed7 100644 --- a/framework/src/main/java/cn/lili/modules/page/serviceimpl/SpecialServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/page/serviceimpl/SpecialServiceImpl.java @@ -6,7 +6,6 @@ import cn.lili.modules.page.mapper.SpecialMapper; import cn.lili.modules.page.service.PageDataService; import cn.lili.modules.page.service.SpecialService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -17,13 +16,14 @@ import org.springframework.stereotype.Service; * @date 2020/12/7 11:27 */ @Service -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class SpecialServiceImpl extends ServiceImpl implements SpecialService { //专题 - private final SpecialMapper specialMapper; + @Autowired + private SpecialMapper specialMapper; //页面数据 - private final PageDataService pageDataService; + @Autowired + private PageDataService pageDataService; @Override public Special addSpecial(Special special) { diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/CashierSupport.java b/framework/src/main/java/cn/lili/modules/payment/kit/CashierSupport.java index a289ec9b..edb46b81 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/CashierSupport.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/CashierSupport.java @@ -19,7 +19,6 @@ import cn.lili.modules.system.entity.dto.payment.PaymentSupportSetting; import cn.lili.modules.system.entity.dto.payment.dto.PaymentSupportItem; import cn.lili.modules.system.entity.enums.SettingEnum; import cn.lili.modules.system.service.SettingService; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -36,14 +35,16 @@ import java.util.List; */ @Component @Slf4j -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class CashierSupport { //收银台 - private final List cashierExecuteList; + @Autowired + private List cashierExecuteList; //预存款 - private final MemberWalletService memberWalletService; + @Autowired + private MemberWalletService memberWalletService; //配置 - private final SettingService settingService; + @Autowired + private SettingService settingService; /** * 支付 diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/RefundSupport.java b/framework/src/main/java/cn/lili/modules/payment/kit/RefundSupport.java index ce1e7d07..1b9a218c 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/RefundSupport.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/RefundSupport.java @@ -10,7 +10,6 @@ import cn.lili.modules.order.order.service.StoreFlowService; import cn.lili.modules.payment.entity.RefundLog; import cn.lili.modules.payment.kit.enums.PaymentMethodEnum; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -26,15 +25,16 @@ import java.util.Date; */ @Component @Slf4j -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class RefundSupport { //店铺流水 - private final StoreFlowService storeFlowService; + @Autowired + private StoreFlowService storeFlowService; //售后 @Autowired private AfterSaleService afterSaleService; - - private final OrderService orderService; + //订单 + @Autowired + private OrderService orderService; /** * 售后退款 diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/OrderCashier.java b/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/OrderCashier.java index bc12803b..d99ef09b 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/OrderCashier.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/OrderCashier.java @@ -32,12 +32,13 @@ import java.util.List; */ @Slf4j @Component -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class OrderCashier implements CashierExecute { //订单 - private final OrderService orderService; + @Autowired + private OrderService orderService; //设置 - private final SettingService settingService; + @Autowired + private SettingService settingService; @Override public CashierEnum cashierEnum() { diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/RechargeCashier.java b/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/RechargeCashier.java index 703bb73b..f60bd762 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/RechargeCashier.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/RechargeCashier.java @@ -27,12 +27,13 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class RechargeCashier implements CashierExecute { //余额 - private final RechargeService rechargeService; + @Autowired + private RechargeService rechargeService; //设置 - private final SettingService settingService; + @Autowired + private SettingService settingService; @Override diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/TradeCashier.java b/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/TradeCashier.java index f3713c0b..7bd4e62e 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/TradeCashier.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/TradeCashier.java @@ -9,15 +9,14 @@ import cn.lili.modules.order.order.entity.enums.OrderStatusEnum; import cn.lili.modules.order.order.entity.enums.PayStatusEnum; import cn.lili.modules.order.order.service.OrderService; import cn.lili.modules.order.order.service.TradeService; -import cn.lili.modules.payment.kit.dto.PaymentSuccessParams; import cn.lili.modules.payment.kit.dto.PayParam; +import cn.lili.modules.payment.kit.dto.PaymentSuccessParams; import cn.lili.modules.payment.kit.enums.CashierEnum; import cn.lili.modules.payment.kit.params.CashierExecute; import cn.lili.modules.payment.kit.params.dto.CashierParam; import cn.lili.modules.system.entity.dto.BaseSetting; import cn.lili.modules.system.entity.enums.SettingEnum; import cn.lili.modules.system.service.SettingService; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -33,15 +32,17 @@ import java.util.stream.Collectors; */ @Slf4j @Component -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class TradeCashier implements CashierExecute { //交易 - private final TradeService tradeService; + @Autowired + private TradeService tradeService; //订单 - private final OrderService orderService; + @Autowired + private OrderService orderService; //设置 - private final SettingService settingService; + @Autowired + private SettingService settingService; @Override diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayPlugin.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayPlugin.java index c82e9ab6..f0749b98 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayPlugin.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayPlugin.java @@ -29,7 +29,6 @@ import com.alipay.api.domain.*; import com.alipay.api.internal.util.AlipaySignature; import com.alipay.api.response.AlipayTradeCancelResponse; import com.alipay.api.response.AlipayTradeRefundResponse; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -47,18 +46,22 @@ import java.util.Map; */ @Slf4j @Component -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class AliPayPlugin implements Payment { //支付日志 - private final PaymentService paymentService; + @Autowired + private PaymentService paymentService; //退款日志 - private final RefundLogService refundLogService; + @Autowired + private RefundLogService refundLogService; //收银台 - private final CashierSupport cashierSupport; + @Autowired + private CashierSupport cashierSupport; //设置 - private final SettingService settingService; + @Autowired + private SettingService settingService; //API域名 - private final ApiProperties apiProperties; + @Autowired + private ApiProperties apiProperties; @Override diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/bankTransfer/BankTransferPlugin.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/bankTransfer/BankTransferPlugin.java index 529f9427..77acc875 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/bankTransfer/BankTransferPlugin.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/bankTransfer/BankTransferPlugin.java @@ -10,7 +10,6 @@ import cn.lili.modules.payment.kit.enums.PaymentMethodEnum; import cn.lili.modules.payment.kit.params.dto.CashierParam; import cn.lili.modules.payment.service.PaymentService; import cn.lili.modules.payment.service.RefundLogService; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -24,11 +23,12 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class BankTransferPlugin implements Payment { //退款日志 - private final RefundLogService refundLogService; + @Autowired + private RefundLogService refundLogService; //支付日志 + @Autowired private PaymentService paymentService; @Override @@ -69,9 +69,4 @@ public class BankTransferPlugin implements Payment { log.info("支付回调通知：线上支付：{}", payParam); } - @Autowired - private void setPaymentService(PaymentService paymentService) { - this.paymentService = paymentService; - } - } diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wallet/WalletPlugin.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wallet/WalletPlugin.java index 54bc5fdd..987d619f 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wallet/WalletPlugin.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wallet/WalletPlugin.java @@ -5,7 +5,6 @@ import cn.lili.common.exception.ServiceException; import cn.lili.common.security.context.UserContext; import cn.lili.common.utils.ResultUtil; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.base.entity.enums.ClientTypeEnum; import cn.lili.modules.member.service.MemberWalletService; import cn.lili.modules.order.trade.entity.enums.DepositServiceTypeEnum; import cn.lili.modules.payment.entity.RefundLog; @@ -17,7 +16,6 @@ import cn.lili.modules.payment.kit.enums.PaymentMethodEnum; import cn.lili.modules.payment.kit.params.dto.CashierParam; import cn.lili.modules.payment.service.PaymentService; import cn.lili.modules.payment.service.RefundLogService; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -34,16 +32,19 @@ import javax.servlet.http.HttpServletResponse; */ @Slf4j @Component -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class WalletPlugin implements Payment { //支付日志 - private final PaymentService paymentService; + @Autowired + private PaymentService paymentService; //退款日志 - private final RefundLogService refundLogService; + @Autowired + private RefundLogService refundLogService; //会员余额 - private final MemberWalletService memberWalletService; + @Autowired + private MemberWalletService memberWalletService; //收银台 + @Autowired private CashierSupport cashierSupport; @Override @@ -169,9 +170,4 @@ public class WalletPlugin implements Payment { } - - @Autowired - public void setCashierSupport(CashierSupport cashierSupport) { - this.cashierSupport = cashierSupport; - } } diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java index 059d29e3..1ea97de7 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java @@ -43,7 +43,6 @@ import cn.lili.modules.system.entity.dto.payment.WechatPaymentSetting; import cn.lili.modules.system.entity.enums.SettingEnum; import cn.lili.modules.system.service.SettingService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -65,22 +64,29 @@ import java.util.Objects; */ @Slf4j @Component -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class WechatPlugin implements Payment { + //收银台 - private final CashierSupport cashierSupport; + @Autowired + private CashierSupport cashierSupport; //支付日志 - private final PaymentService paymentService; + @Autowired + private PaymentService paymentService; //缓存 - private final Cache cache; + @Autowired + private Cache cache; //退款日志 - private final RefundLogService refundLogService; + @Autowired + private RefundLogService refundLogService; //API域名 - private final ApiProperties apiProperties; + @Autowired + private ApiProperties apiProperties; //配置 - private final SettingService settingService; + @Autowired + private SettingService settingService; //联合登陆 - private final ConnectService connectService; + @Autowired + private ConnectService connectService; @Override diff --git a/framework/src/main/java/cn/lili/modules/payment/serviceimpl/PaymentServiceImpl.java b/framework/src/main/java/cn/lili/modules/payment/serviceimpl/PaymentServiceImpl.java index ec52e5a9..70ba903f 100644 --- a/framework/src/main/java/cn/lili/modules/payment/serviceimpl/PaymentServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/payment/serviceimpl/PaymentServiceImpl.java @@ -26,15 +26,14 @@ import java.util.List; @Slf4j @Service @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class PaymentServiceImpl implements PaymentService { @Autowired private List cashierExecutes; @Autowired private CashierSupport cashierSupport; - - private final OrderMapper orderMapper; + @Autowired + private OrderMapper orderMapper; @Override public void success(PaymentSuccessParams paymentSuccessParams) { diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java index 1be2912c..ffe3c787 100644 --- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java @@ -22,7 +22,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Service; @@ -41,17 +40,16 @@ import java.util.stream.Collectors; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class AdminUserServiceImpl extends ServiceImpl implements AdminUserService { - + @Autowired private UserRoleService userRoleService; - + @Autowired private RoleService roleService; - + @Autowired private DepartmentService departmentService; - + @Autowired private MenuService menuService; - + @Autowired private ManagerTokenGenerate managerTokenGenerate; @Override @@ -235,26 +233,4 @@ public class AdminUserServiceImpl extends ServiceImpl userRoles.add(new UserRole(userId, id))); userRoleService.updateUserRole(userId, userRoles); } - - - @Autowired - public void setUserRoleService(UserRoleService userRoleService) { - this.userRoleService = userRoleService; - } - - @Autowired - public void setRoleService(RoleService roleService) { - this.roleService = roleService; - } - - @Autowired - public void setDepartmentService(DepartmentService departmentService) { - this.departmentService = departmentService; - } - - @Autowired - public void setMenuService(MenuService menuService) { - this.menuService = menuService; - } - } diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/DepartmentRoleServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/DepartmentRoleServiceImpl.java index 2eb7397e..3c577f45 100644 --- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/DepartmentRoleServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/DepartmentRoleServiceImpl.java @@ -20,10 +20,9 @@ import java.util.List; */ @Service @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class DepartmentRoleServiceImpl extends ServiceImpl implements DepartmentRoleService { - - private final DepartmentRoleMapper departmentRoleMapper; + @Autowired + private DepartmentRoleMapper departmentRoleMapper; @Override public List listByDepartmentId(String departmentId) { diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/DepartmentServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/DepartmentServiceImpl.java index 59f89c96..42d54d30 100644 --- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/DepartmentServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/DepartmentServiceImpl.java @@ -27,24 +27,15 @@ import java.util.List; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class DepartmentServiceImpl extends ServiceImpl implements DepartmentService { //管理员 + @Autowired private AdminUserService adminUserService; //部门角色 + @Autowired private DepartmentRoleService departmentRoleService; - @Autowired - public void setDepartmentRoleService(DepartmentRoleService departmentRoleService) { - this.departmentRoleService = departmentRoleService; - } - - @Autowired - public void setAdminUserService(AdminUserService adminUserService) { - this.adminUserService = adminUserService; - } - @Override public void deleteByIds(List ids) { QueryWrapper queryWrapper = new QueryWrapper<>(); diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/MenuServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/MenuServiceImpl.java index cdd430c0..a463f6ee 100644 --- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/MenuServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/MenuServiceImpl.java @@ -34,17 +34,13 @@ import java.util.List; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MenuServiceImpl extends ServiceImpl implements MenuService { //菜单 - private final MenuMapper menuMapper; - //菜单角色 - private RoleMenuService roleMenuService; - @Autowired - public void setRoleMenuService(RoleMenuService roleMenuService) { - this.roleMenuService = roleMenuService; - } + private MenuMapper menuMapper; + //菜单角色 + @Autowired + private RoleMenuService roleMenuService; @Override public void deleteIds(List ids) { diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleMenuServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleMenuServiceImpl.java index 7cfb9e9f..5e28fc3b 100644 --- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleMenuServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleMenuServiceImpl.java @@ -22,13 +22,14 @@ import java.util.List; */ @Service @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class RoleMenuServiceImpl extends ServiceImpl implements RoleMenuService { //菜单 - private final MenuMapper menuMapper; + @Autowired + private MenuMapper menuMapper; //角色菜单 - private final RoleMenuMapper roleMenuMapper; + @Autowired + private RoleMenuMapper roleMenuMapper; @Override public List findByRoleId(String roleId) { diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleServiceImpl.java index a7e2dd4e..c15296a9 100644 --- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleServiceImpl.java @@ -9,7 +9,6 @@ import cn.lili.modules.permission.service.RoleService; import cn.lili.modules.permission.service.UserRoleService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -24,24 +23,15 @@ import java.util.List; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class RoleServiceImpl extends ServiceImpl implements RoleService { //部门角色 + @Autowired private DepartmentRoleService departmentRoleService; //用户权限 + @Autowired private UserRoleService userRoleService; - @Autowired - public void setDepartmentRoleService(DepartmentRoleService departmentRoleService) { - this.departmentRoleService = departmentRoleService; - } - - @Autowired - public void setUserRoleService(UserRoleService userRoleService) { - this.userRoleService = userRoleService; - } - @Override public List findByDefaultRole(Boolean defaultRole) { QueryWrapper queryWrapper = new QueryWrapper<>(); diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/SystemLogServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/SystemLogServiceImpl.java index 1b8667b0..25aeaffc 100644 --- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/SystemLogServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/SystemLogServiceImpl.java @@ -8,7 +8,6 @@ import cn.lili.modules.base.entity.systemlog.SystemLogVO; import cn.lili.modules.permission.service.SystemLogService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; @@ -29,11 +28,10 @@ import java.util.regex.Pattern; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class SystemLogServiceImpl implements SystemLogService { - - private final MongoTemplate mongoTemplate; + @Autowired + private MongoTemplate mongoTemplate; @Override public void saveLog(SystemLogVO systemLogVO) { diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/UserRoleServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/UserRoleServiceImpl.java index 9b819904..434b387e 100644 --- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/UserRoleServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/UserRoleServiceImpl.java @@ -21,10 +21,9 @@ import java.util.List; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class UserRoleServiceImpl extends ServiceImpl implements UserRoleService { - - private final UserRoleMapper userRoleMapper; + @Autowired + private UserRoleMapper userRoleMapper; @Override public List listByUserId(String userId) { diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java index b2f67ac3..09b7672d 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java @@ -34,7 +34,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; @@ -54,22 +53,29 @@ import java.util.stream.Collectors; */ @Service @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) + public class CouponServiceImpl extends ServiceImpl implements CouponService { //延时任务 - private final TimeTrigger timeTrigger; + @Autowired + private TimeTrigger timeTrigger; //Mongo - private final MongoTemplate mongoTemplate; + @Autowired + private MongoTemplate mongoTemplate; //规格商品 + @Autowired private GoodsSkuService goodsSkuService; //Rocketmq + @Autowired private RocketmqCustomProperties rocketmqCustomProperties; //促销商品 + @Autowired private PromotionGoodsService promotionGoodsService; //会员优惠券 + @Autowired private MemberCouponService memberCouponService; //满额活动 + @Autowired private FullDiscountService fullDiscountService; @Override @@ -368,29 +374,4 @@ public class CouponServiceImpl extends ServiceImpl impleme } } - @Autowired - public void setGoodsSkuService(GoodsSkuService goodsSkuService) { - this.goodsSkuService = goodsSkuService; - } - - @Autowired - public void setRocketmqCustomProperties(RocketmqCustomProperties rocketmqCustomProperties) { - this.rocketmqCustomProperties = rocketmqCustomProperties; - } - - @Autowired - public void setPromotionGoodsService(PromotionGoodsService promotionGoodsService) { - this.promotionGoodsService = promotionGoodsService; - } - - @Autowired - public void setMemberCouponService(MemberCouponService memberCouponService) { - this.memberCouponService = memberCouponService; - } - - @Autowired - public void setFullDiscountService(FullDiscountService fullDiscountService) { - this.fullDiscountService = fullDiscountService; - } - } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java index ad59314b..c97a7495 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java @@ -46,22 +46,28 @@ import java.util.List; */ @Service @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class FullDiscountServiceImpl extends ServiceImpl implements FullDiscountService { private static final String SELLER_ID_COLUMN = "storeId"; private static final String PROMOTION_STATUS_COLUMN = "promotionStatus"; + //延时任务 - private final TimeTrigger timeTrigger; + @Autowired + private TimeTrigger timeTrigger; //Mongo - private final MongoTemplate mongoTemplate; + @Autowired + private MongoTemplate mongoTemplate; //满额活动 - private final FullDiscountMapper fullDiscountMapper; + @Autowired + private FullDiscountMapper fullDiscountMapper; //Rocketmq - private final RocketmqCustomProperties rocketmqCustomProperties; + @Autowired + private RocketmqCustomProperties rocketmqCustomProperties; //优惠券 + @Autowired private CouponService couponService; //促销商品 + @Autowired private PromotionGoodsService promotionGoodsService; @Override @@ -316,15 +322,4 @@ public class FullDiscountServiceImpl extends ServiceImpl implements MemberAddressService { @Override diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java index 9c634c59..dd5bbe4b 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java @@ -37,12 +37,12 @@ import java.util.List; */ @Service @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MemberCouponServiceImpl extends ServiceImpl implements MemberCouponService { /** * 优惠券 */ + @Autowired private CouponService couponService; @Override @@ -210,8 +210,4 @@ public class MemberCouponServiceImpl extends ServiceImpl implements PintuanService { //延时任务 - private final TimeTrigger timeTrigger; + @Autowired + private TimeTrigger timeTrigger; //Mongo - private final MongoTemplate mongoTemplate; + @Autowired + private MongoTemplate mongoTemplate; //促销商品 - private final PromotionGoodsService promotionGoodsService; + @Autowired + private PromotionGoodsService promotionGoodsService; //规格商品 - private final GoodsSkuService goodsSkuService; + @Autowired + private GoodsSkuService goodsSkuService; //会员 - private final MemberService memberService; + @Autowired + private MemberService memberService; //Rocketmq - private final RocketmqCustomProperties rocketmqCustomProperties; + @Autowired + private RocketmqCustomProperties rocketmqCustomProperties; //订单 + @Autowired private OrderService orderService; @Override @@ -514,8 +519,4 @@ public class PintuanServiceImpl extends ServiceImpl impl } } - @Autowired - public void setOrderService(OrderService orderService) { - this.orderService = orderService; - } } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsCategoryServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsCategoryServiceImpl.java index a2ac3b08..ee27e9ff 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsCategoryServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsCategoryServiceImpl.java @@ -23,7 +23,6 @@ import org.springframework.transaction.annotation.Transactional; **/ @Service @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class PointsGoodsCategoryServiceImpl extends ServiceImpl implements PointsGoodsCategoryService { /** diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java index 281a6d1b..a6fb6770 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java @@ -26,7 +26,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; @@ -46,17 +45,20 @@ import java.util.List; **/ @Service @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class PointsGoodsServiceImpl extends ServiceImpl implements PointsGoodsService { //延时任务 - private final TimeTrigger timeTrigger; + @Autowired + private TimeTrigger timeTrigger; //Mongo - private final MongoTemplate mongoTemplate; + @Autowired + private MongoTemplate mongoTemplate; //Rocketmq - private final RocketmqCustomProperties rocketmqCustomProperties; + @Autowired + private RocketmqCustomProperties rocketmqCustomProperties; //规格商品 - private final GoodsSkuService goodsSkuService; + @Autowired + private GoodsSkuService goodsSkuService; //Es商品 @Autowired private EsGoodsIndexService goodsIndexService; diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java index 22522cbf..2724925e 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java @@ -35,7 +35,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; @@ -56,18 +55,23 @@ import java.util.List; */ @Service @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) + public class PromotionGoodsServiceImpl extends ServiceImpl implements PromotionGoodsService { //Mongo - private final MongoTemplate mongoTemplate; + @Autowired + private MongoTemplate mongoTemplate; //Redis - private final StringRedisTemplate stringRedisTemplate; + @Autowired + private StringRedisTemplate stringRedisTemplate; //限时抢购申请 + @Autowired private SeckillApplyService seckillApplyService; //规格商品 + @Autowired private GoodsSkuService goodsSkuService; //积分商品 + @Autowired private PointsGoodsService pointsGoodsService; //分销商品 @Autowired @@ -427,24 +431,4 @@ public class PromotionGoodsServiceImpl extends ServiceImpl tradeSkuList, List memberCouponList) { diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionServiceImpl.java index 3ba9289a..05367e7b 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionServiceImpl.java @@ -19,7 +19,6 @@ import cn.lili.modules.search.service.EsGoodsIndexService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.MongoTemplate; @@ -39,27 +38,36 @@ import java.util.*; @Slf4j @Service @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class PromotionServiceImpl implements PromotionService { //会员优惠券 + @Autowired private MemberCouponService memberCouponService; //秒杀 + @Autowired private SeckillService seckillService; //秒杀申请 + @Autowired private SeckillApplyService seckillApplyService; //满额活动 + @Autowired private FullDiscountService fullDiscountService; //拼团 + @Autowired private PintuanService pintuanService; //优惠券 + @Autowired private CouponService couponService; //促销商品 + @Autowired private PromotionGoodsService promotionGoodsService; //积分商品 + @Autowired private PointsGoodsService pointsGoodsService; //ES商品 + @Autowired private EsGoodsIndexService goodsIndexService; //Mongo + @Autowired private MongoTemplate mongoTemplate; @@ -345,55 +353,4 @@ public class PromotionServiceImpl implements PromotionService { log.error("当前" + type.name() + "活动ID为[" + id + "] 不存在，更改活动状态至[ " + status + " ]失败！"); throw new ServiceException("当前活动已停止"); } - - - @Autowired - public void setPintuanService(PintuanService pintuanService) { - this.pintuanService = pintuanService; - } - - @Autowired - public void setMemberCouponService(MemberCouponService memberCouponService) { - this.memberCouponService = memberCouponService; - } - - @Autowired - public void setSeckillService(SeckillService seckillService) { - this.seckillService = seckillService; - } - - @Autowired - public void setSeckillApplyService(SeckillApplyService seckillApplyService) { - this.seckillApplyService = seckillApplyService; - } - - @Autowired - public void setFullDiscountService(FullDiscountService fullDiscountService) { - this.fullDiscountService = fullDiscountService; - } - - @Autowired - public void setCouponService(CouponService couponService) { - this.couponService = couponService; - } - - @Autowired - public void setPromotionGoodsService(PromotionGoodsService promotionGoodsService) { - this.promotionGoodsService = promotionGoodsService; - } - - @Autowired - public void setPointsGoodsService(PointsGoodsService pointsGoodsService) { - this.pointsGoodsService = pointsGoodsService; - } - - @Autowired - public void setGoodsIndexService(EsGoodsIndexService goodsIndexService) { - this.goodsIndexService = goodsIndexService; - } - - @Autowired - public void setMongoTemplate(MongoTemplate mongoTemplate) { - this.mongoTemplate = mongoTemplate; - } } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java index e3402bd9..157ae00c 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java @@ -51,20 +51,25 @@ import java.util.stream.Collectors; */ @Service @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class SeckillApplyServiceImpl extends ServiceImpl implements SeckillApplyService { //缓存 - private final Cache cache; + @Autowired + private Cache cache; //Mongo - private final MongoTemplate mongoTemplate; + @Autowired + private MongoTemplate mongoTemplate; //规格商品 + @Autowired private GoodsSkuService goodsSkuService; //ES商品 + @Autowired private EsGoodsIndexService esGoodsIndexService; //促销商品 + @Autowired private PromotionGoodsService promotionGoodsService; //秒杀 + @Autowired private SeckillService seckillService; @Override @@ -534,24 +539,4 @@ public class SeckillApplyServiceImpl extends ServiceImpl implements SeckillService { //延时任务 - private final TimeTrigger timeTrigger; + @Autowired + private TimeTrigger timeTrigger; //Mongo - private final MongoTemplate mongoTemplate; + @Autowired + private MongoTemplate mongoTemplate; //Rocketmq - private final RocketmqCustomProperties rocketmqCustomProperties; + @Autowired + private RocketmqCustomProperties rocketmqCustomProperties; //商品索引 + @Autowired private EsGoodsIndexService goodsIndexService; //促销商品 + @Autowired private PromotionGoodsService promotionGoodsService; //秒杀申请 + @Autowired private SeckillApplyService seckillApplyService; @Override @@ -277,20 +281,4 @@ public class SeckillServiceImpl extends ServiceImpl impl throw new ServiceException("当前时间内已存在同类活动"); } } - - @Autowired - public void setEsGoodsIndexService(EsGoodsIndexService goodsIndexService) { - this.goodsIndexService = goodsIndexService; - } - - @Autowired - public void setPromotionGoodsService(PromotionGoodsService promotionGoodsService) { - this.promotionGoodsService = promotionGoodsService; - } - - @Autowired - public void setSeckillApplyService(SeckillApplyService seckillApplyService) { - this.seckillApplyService = seckillApplyService; - } - } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseOrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseOrderServiceImpl.java index 11cb57ea..b9f46d84 100644 --- a/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseOrderServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseOrderServiceImpl.java @@ -30,10 +30,9 @@ import java.util.Map; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class PurchaseOrderServiceImpl extends ServiceImpl implements PurchaseOrderService { - - private final PurchaseOrderItemService purchaseOrderItemService; + @Autowired + private PurchaseOrderItemService purchaseOrderItemService; @Override public PurchaseOrderVO addPurchaseOrder(PurchaseOrderVO purchaseOrderVO) { diff --git a/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseQuotedServiceImpl.java b/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseQuotedServiceImpl.java index 3d05a95f..8dbdd847 100644 --- a/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseQuotedServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseQuotedServiceImpl.java @@ -9,7 +9,6 @@ import cn.lili.modules.purchase.service.PurchaseQuotedService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -25,11 +24,11 @@ import java.util.List; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class PurchaseQuotedServiceImpl extends ServiceImpl implements PurchaseQuotedService { - - private final PurchaseQuotedMapper purchaseQuotedMapper; - private final PurchaseQuotedItemService purchaseQuotedItemService; + @Autowired + private PurchaseQuotedMapper purchaseQuotedMapper; + @Autowired + private PurchaseQuotedItemService purchaseQuotedItemService; @Override public PurchaseQuotedVO addPurchaseQuoted(PurchaseQuotedVO purchaseQuotedVO) { diff --git a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsIndexServiceImpl.java b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsIndexServiceImpl.java index 750b2111..2de787c3 100644 --- a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsIndexServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsIndexServiceImpl.java @@ -49,20 +49,18 @@ import java.util.stream.Collectors; **/ @Slf4j @Service -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class EsGoodsIndexServiceImpl extends BaseElasticsearchService implements EsGoodsIndexService { - private final ElasticsearchProperties elasticsearchProperties; - private final EsGoodsIndexRepository goodsIndexRepository; - private final EsGoodsSearchService goodsSearchService; - private final GoodsWordsService goodsWordsService; - - private PromotionService promotionService; - @Autowired - public void setPromotionService(PromotionService promotionService) { - this.promotionService = promotionService; - } + private ElasticsearchProperties elasticsearchProperties; + @Autowired + private EsGoodsIndexRepository goodsIndexRepository; + @Autowired + private EsGoodsSearchService goodsSearchService; + @Autowired + private GoodsWordsService goodsWordsService; + @Autowired + private PromotionService promotionService; @Override public void addIndex(EsGoodsIndex goods) { diff --git a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java index 4f7da41e..18f39c39 100644 --- a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java @@ -18,7 +18,6 @@ import cn.lili.modules.search.entity.dto.SelectorOptions; import cn.lili.modules.search.entity.enums.HotWordsRedisKeyEnum; import cn.lili.modules.search.repository.EsGoodsIndexRepository; import cn.lili.modules.search.service.EsGoodsSearchService; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.lucene.search.join.ScoreMode; import org.elasticsearch.common.lucene.search.function.FunctionScoreQuery; @@ -55,7 +54,6 @@ import java.util.*; **/ @Slf4j @Service -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class EsGoodsSearchServiceImpl implements EsGoodsSearchService { private static final String ATTR_PATH = "attrList"; @@ -64,15 +62,20 @@ public class EsGoodsSearchServiceImpl implements EsGoodsSearchService { private static final String ATTR_NAME_KEY = "nameList"; private static final String ATTR_VALUE_KEY = "valueList"; - private final EsGoodsIndexRepository goodsIndexRepository; + @Autowired + private EsGoodsIndexRepository goodsIndexRepository; //商品分类 - private final CategoryService categoryService; + @Autowired + private CategoryService categoryService; //品牌 - private final BrandService brandService; + @Autowired + private BrandService brandService; //ES - private final ElasticsearchRestTemplate restTemplate; + @Autowired + private ElasticsearchRestTemplate restTemplate; //缓存 - private final Cache cache; + @Autowired + private Cache cache; @Override public Page searchGoods(EsGoodsSearchDTO searchDTO, PageVO pageVo) { diff --git a/framework/src/main/java/cn/lili/modules/statistics/aop/aspect/PageViewInterceptor.java b/framework/src/main/java/cn/lili/modules/statistics/aop/aspect/PageViewInterceptor.java index 4044c75c..1f23a077 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/aop/aspect/PageViewInterceptor.java +++ b/framework/src/main/java/cn/lili/modules/statistics/aop/aspect/PageViewInterceptor.java @@ -32,12 +32,13 @@ import java.util.Map; @Aspect @Configuration @Slf4j -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class PageViewInterceptor { - private final Cache cache; + @Autowired + private Cache cache; - private final HttpServletRequest request; + @Autowired + private HttpServletRequest request; @AfterReturning(returning = "rvt", pointcut = "@annotation(cn.lili.modules.statistics.aop.PageViewPoint)") diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsDataServiceImpl.java index a8fd8eb9..d8d65ddb 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsDataServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsDataServiceImpl.java @@ -28,13 +28,13 @@ import java.util.List; * @date 2020/12/9 11:30 */ @Service -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class GoodsStatisticsDataServiceImpl extends ServiceImpl implements GoodsStatisticsDataService { /** * 商品统计 */ - private final GoodsStatisticsDataMapper goodsStatisticsDataMapper; + @Autowired + private GoodsStatisticsDataMapper goodsStatisticsDataMapper; @Override public List getGoodsStatisticsData(GoodsStatisticsQueryParam goodsStatisticsQueryParam, Integer num) { diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java index c2321ca7..2c38464b 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java @@ -13,6 +13,7 @@ import cn.lili.modules.order.order.entity.enums.FlowTypeEnum; import cn.lili.modules.order.order.entity.enums.OrderStatusEnum; import cn.lili.modules.order.order.service.AfterSaleService; import cn.lili.modules.order.order.service.OrderComplaintService; +import cn.lili.modules.order.trade.entity.enums.AfterSaleTypeEnum; import cn.lili.modules.promotion.service.SeckillService; import cn.lili.modules.statistics.mapper.StoreStatisticsDataMapper; import cn.lili.modules.statistics.model.dto.GoodsStatisticsQueryParam; @@ -24,11 +25,9 @@ import cn.lili.modules.statistics.service.*; import cn.lili.modules.store.entity.enums.BillStatusEnum; import cn.lili.modules.store.service.BillService; import cn.lili.modules.store.service.StoreService; -import cn.lili.modules.order.trade.entity.enums.AfterSaleTypeEnum; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -42,61 +41,73 @@ import java.util.Map; * @date 2020/12/15 17:57 */ @Service -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class IndexStatisticsServiceImpl implements IndexStatisticsService { /** * 订单统计 */ - private final OrderStatisticsDataService orderStatisticsDataService; + @Autowired + private OrderStatisticsDataService orderStatisticsDataService; /** * 会员统计 */ - private final MemberStatisticsDataService memberStatisticsDataService; + @Autowired + private MemberStatisticsDataService memberStatisticsDataService; /** * 商品统计 */ - private final GoodsStatisticsDataService goodsStatisticsDataService; + @Autowired + private GoodsStatisticsDataService goodsStatisticsDataService; /** * 店铺统计 */ - private final StoreStatisticsDataMapper storeStatisticsDataMapper; + @Autowired + private StoreStatisticsDataMapper storeStatisticsDataMapper; /** * 商品 */ - private final GoodsService goodsService; + @Autowired + private GoodsService goodsService; /** * 店铺 */ - private final StoreService storeService; + @Autowired + private StoreService storeService; /** * 店铺 */ - private final MemberEvaluationService memberEvaluationService; + @Autowired + private MemberEvaluationService memberEvaluationService; /** * 售后 */ - private final AfterSaleService afterSaleService; + @Autowired + private AfterSaleService afterSaleService; /** * 投诉 */ - private final OrderComplaintService orderComplaintService; + @Autowired + private OrderComplaintService orderComplaintService; /** * 分销员提现 */ - private final DistributionCashService distributionCashService; + @Autowired + private DistributionCashService distributionCashService; /** * 平台PV统计 */ - private final PlatformViewDataService platformViewDataService; + @Autowired + private PlatformViewDataService platformViewDataService; /** * 结算单 */ - private final BillService billService; + @Autowired + private BillService billService; /** * 秒杀活动 */ - private final SeckillService seckillService; + @Autowired + private SeckillService seckillService; @Override public IndexNoticeVO indexNotice() { diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberStatisticsDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberStatisticsDataServiceImpl.java index 645d36d7..3a7a66b0 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberStatisticsDataServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberStatisticsDataServiceImpl.java @@ -10,7 +10,6 @@ import cn.lili.modules.statistics.util.StatisticsDateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -24,13 +23,13 @@ import java.util.List; * @date 2020/12/9 18:33 */ @Service -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MemberStatisticsDataServiceImpl extends ServiceImpl implements MemberStatisticsDataService { /** * 会员统计 */ - private final MemberStatisticsDataMapper memberStatisticsDataMapper; + @Autowired + private MemberStatisticsDataMapper memberStatisticsDataMapper; @Override public Integer getMemberCount() { diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderStatisticsDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderStatisticsDataServiceImpl.java index fe0fd8df..217b01d1 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderStatisticsDataServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderStatisticsDataServiceImpl.java @@ -35,15 +35,17 @@ import java.util.*; * @date 2020/12/9 17:16 */ @Service -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class OrderStatisticsDataServiceImpl extends ServiceImpl implements OrderStatisticsDataService { //订单统计 - private final OrderStatisticsDataMapper orderStatisticsDataMapper; + @Autowired + private OrderStatisticsDataMapper orderStatisticsDataMapper; //平台PV统计 - private final PlatformViewDataService platformViewDataService; + @Autowired + private PlatformViewDataService platformViewDataService; //订单 - private final OrderService orderService; + @Autowired + private OrderService orderService; @Override public OrderOverviewVO overview(StatisticsQueryParam statisticsQueryParam) { diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java index 48cd985a..723faf2e 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java @@ -42,16 +42,19 @@ import java.util.List; * 2021/1/18 12:07 */ @Service -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class PlatformViewDataServiceImpl extends ServiceImpl implements PlatformViewDataService { //在线人数统计 - private final StatisticsProperties statisticsProperties; + @Autowired + private StatisticsProperties statisticsProperties; //会员 - private final MemberService memberService; + @Autowired + private MemberService memberService; //平台流量统计 - private final PlatformViewDataMapper platformViewDataMapper; + @Autowired + private PlatformViewDataMapper platformViewDataMapper; //缓存 - private final Cache cache; + @Autowired + private Cache cache; @Override diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/RefundOrderStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/RefundOrderStatisticsServiceImpl.java index 89aa8676..43819871 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/RefundOrderStatisticsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/RefundOrderStatisticsServiceImpl.java @@ -26,11 +26,11 @@ import org.springframework.stereotype.Service; * @date 2020/12/10 11:30 */ @Service -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class RefundOrderStatisticsServiceImpl extends ServiceImpl implements RefundOrderStatisticsService { //退款统计 - private final RefundOrderStatisticsDataMapper refundOrderStatisticsDataMapper; + @Autowired + private RefundOrderStatisticsDataMapper refundOrderStatisticsDataMapper; @Override public IPage getRefundOrderStatisticsData(PageVO pageVO, StatisticsQueryParam statisticsQueryParam) { diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java index e3e6f5ce..248e7c07 100644 --- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java @@ -26,7 +26,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -42,15 +41,17 @@ import java.util.Date; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class BillServiceImpl extends ServiceImpl implements BillService { //店铺详情 - private final StoreDetailService storeDetailService; + @Autowired + private StoreDetailService storeDetailService; //商家流水 + @Autowired private StoreFlowService storeFlowService; //结算单 - private final BillMapper billMapper; + @Autowired + private BillMapper billMapper; @Override public void createBill(String storeId, Date startTime) { @@ -196,9 +197,4 @@ public class BillServiceImpl extends ServiceImpl implements Bi return this.count(lambdaUpdateWrapper); } - @Autowired - public void setStoreFlowService(StoreFlowService storeFlowService) { - this.storeFlowService = storeFlowService; - } - } diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceChildImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceChildImpl.java index b36965cb..764f34ec 100644 --- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceChildImpl.java +++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceChildImpl.java @@ -21,11 +21,11 @@ import java.util.List; */ @Service @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class FreightTemplateServiceChildImpl extends ServiceImpl implements FreightTemplateChildService { //配送子模板数据层 - private final FreightTemplateChildMapper freightTemplateChildMapper; + @Autowired + private FreightTemplateChildMapper freightTemplateChildMapper; @Override public List getFreightTemplateChild(String freightTemplateId) { diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceImpl.java index 49136efa..40771f63 100644 --- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceImpl.java @@ -36,15 +36,17 @@ import java.util.List; */ @Service @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class FreightTemplateServiceImpl extends ServiceImpl implements FreightTemplateService { //配送模板 - private final FreightTemplateMapper freightTemplateMapper; + @Autowired + private FreightTemplateMapper freightTemplateMapper; //配送子模板 - private final FreightTemplateChildService freightTemplateChildService; + @Autowired + private FreightTemplateChildService freightTemplateChildService; //缓存 - private final Cache cache; + @Autowired + private Cache cache; @Override diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreAddressServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreAddressServiceImpl.java index 9a9258ae..a0ec09e9 100644 --- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreAddressServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreAddressServiceImpl.java @@ -24,10 +24,10 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class StoreAddressServiceImpl extends ServiceImpl implements StoreAddressService { - private final StoreAddressMapper storeAddressMapper; + @Autowired + private StoreAddressMapper storeAddressMapper; @Override public IPage getStoreAddress(PageVO pageVo) { diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreDetailServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreDetailServiceImpl.java index 8eb75ddb..2dcc4e65 100644 --- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreDetailServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreDetailServiceImpl.java @@ -35,15 +35,17 @@ import java.util.List; */ @Service @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class StoreDetailServiceImpl extends ServiceImpl implements StoreDetailService { //店铺详情数据层 - private final StoreDetailMapper storeDetailMapper; + @Autowired + private StoreDetailMapper storeDetailMapper; //店铺 - private final StoreService storeService; + @Autowired + private StoreService storeService; //分类 - private final CategoryService categoryService; + @Autowired + private CategoryService categoryService; @Override public StoreDetailVO getStoreDetailVO(String storeId) { diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreGoodsLabelServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreGoodsLabelServiceImpl.java index 7b5398d4..68ccd76a 100644 --- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreGoodsLabelServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreGoodsLabelServiceImpl.java @@ -26,10 +26,10 @@ import java.util.List; */ @Service @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class StoreGoodsLabelServiceImpl extends ServiceImpl implements StoreGoodsLabelService { - private final StoreGoodsLabelMapper storeGoodsLabelMapper; + @Autowired + private StoreGoodsLabelMapper storeGoodsLabelMapper; @Override public List listByStoreId(String storeId) { diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java index 2583ee8b..3f5ba6b2 100644 --- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java @@ -50,23 +50,29 @@ import java.util.Optional; */ @Service @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class StoreServiceImpl extends ServiceImpl implements StoreService { //店铺 - private final StoreMapper storeMapper; + @Autowired + private StoreMapper storeMapper; //会员 + @Autowired private MemberService memberService; //商品 + @Autowired private GoodsService goodsService; //商品SKU + @Autowired private GoodsSkuService goodsSkuService; //店铺详情 + @Autowired private StoreDetailService storeDetailService; //页面 + @Autowired private PageDataService pageDataService; //店铺收藏 - private final StoreCollectionService storeCollectionService; + @Autowired + private StoreCollectionService storeCollectionService; @Override public IPage findByConditionPage(StoreSearchParams storeSearchParams, PageVO page) { @@ -312,25 +318,4 @@ public class StoreServiceImpl extends ServiceImpl implements return this.getOne(lambdaQueryWrapper); } - @Autowired - public void setGoodsService(GoodsService goodsService) { - this.goodsService = goodsService; - } - @Autowired - public void setGoodsSkuService(GoodsSkuService goodsSkuService) { - this.goodsSkuService = goodsSkuService; - } - @Autowired - public void setPageDataService(PageDataService pageDataService) { - this.pageDataService = pageDataService; - } - @Autowired - public void setMemberService(MemberService memberService) { - this.memberService = memberService; - } - @Autowired - public void setStoreDetailService(StoreDetailService storeDetailService) { - this.storeDetailService = storeDetailService; - } - } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/AppVersionServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/AppVersionServiceImpl.java index 3bb17469..51ece980 100644 --- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/AppVersionServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/AppVersionServiceImpl.java @@ -4,8 +4,6 @@ import cn.lili.modules.system.entity.dos.AppVersionDO; import cn.lili.modules.system.mapper.AppVersionMapper; import cn.lili.modules.system.service.AppVersionService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -18,7 +16,6 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class AppVersionServiceImpl extends ServiceImpl implements AppVersionService { } diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/InstantDeliveryLogServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/InstantDeliveryLogServiceImpl.java index 1580e791..c7257c6b 100644 --- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/InstantDeliveryLogServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/InstantDeliveryLogServiceImpl.java @@ -17,7 +17,6 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class InstantDeliveryLogServiceImpl extends ServiceImpl implements InstantDeliveryLogService { } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/InstantDeliveryServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/InstantDeliveryServiceImpl.java index d6e91ccc..b44f713a 100644 --- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/InstantDeliveryServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/InstantDeliveryServiceImpl.java @@ -13,7 +13,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.gson.Gson; -import lombok.RequiredArgsConstructor; import org.elasticsearch.ResourceNotFoundException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -32,7 +31,6 @@ import java.util.Map; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class InstantDeliveryServiceImpl extends ServiceImpl implements InstantDeliveryService { @Autowired diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/LogisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/LogisticsServiceImpl.java index 9f00615f..1518d878 100644 --- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/LogisticsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/LogisticsServiceImpl.java @@ -38,10 +38,9 @@ import java.util.Map; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class LogisticsServiceImpl extends ServiceImpl implements LogisticsService { - - private final SettingService settingService; + @Autowired + private SettingService settingService; @Override public Traces getLogistic(String logisticsId, String logisticsNo) { diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/SensitiveWordsServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/SensitiveWordsServiceImpl.java index f5c4bd4f..cddfc6a3 100644 --- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/SensitiveWordsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/SensitiveWordsServiceImpl.java @@ -17,7 +17,6 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class SensitiveWordsServiceImpl extends ServiceImpl implements SensitiveWordsService { } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/ServiceNoticeServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/ServiceNoticeServiceImpl.java index 1f2a18ae..f9e8726d 100644 --- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/ServiceNoticeServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/ServiceNoticeServiceImpl.java @@ -16,7 +16,6 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class ServiceNoticeServiceImpl extends ServiceImpl implements ServiceNoticeService { } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/SettingServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/SettingServiceImpl.java index 795b5c4d..65a5f519 100644 --- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/SettingServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/SettingServiceImpl.java @@ -17,7 +17,6 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class SettingServiceImpl extends ServiceImpl implements SettingService { @Override diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/StoreLogisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/StoreLogisticsServiceImpl.java index ce392b03..95678794 100644 --- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/StoreLogisticsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/StoreLogisticsServiceImpl.java @@ -8,7 +8,6 @@ import cn.lili.modules.system.service.StoreLogisticsService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -23,10 +22,11 @@ import java.util.List; */ @Service @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) + public class StoreLogisticsServiceImpl extends ServiceImpl implements StoreLogisticsService { - private final StoreLogisticsMapper storeLogisticsMapper; + @Autowired + private StoreLogisticsMapper storeLogisticsMapper; @Override public List getStoreLogistics() { diff --git a/framework/src/main/java/cn/lili/modules/system/utils/SensitiveWordsFilter.java b/framework/src/main/java/cn/lili/modules/system/utils/SensitiveWordsFilter.java index 42e422fa..07a3c9fe 100644 --- a/framework/src/main/java/cn/lili/modules/system/utils/SensitiveWordsFilter.java +++ b/framework/src/main/java/cn/lili/modules/system/utils/SensitiveWordsFilter.java @@ -2,7 +2,6 @@ package cn.lili.modules.system.utils; import cn.lili.modules.system.entity.dos.SensitiveWords; import cn.lili.modules.system.service.SensitiveWordsService; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; @@ -22,7 +21,6 @@ import java.util.NavigableSet; * 2020-02-25 14:10:16 */ @Component -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class SensitiveWordsFilter implements Serializable, ApplicationRunner { @@ -39,8 +37,8 @@ public class SensitiveWordsFilter implements Serializable, ApplicationRunner { * 使用2个字符的hash定位。 */ protected static SensitiveWordsNode[] nodes; - - private final SensitiveWordsService sensitiveWordsService; + @Autowired + private SensitiveWordsService sensitiveWordsService; /** diff --git a/framework/src/main/resources/templates/java/controller.btl b/framework/src/main/resources/templates/java/controller.btl index 20bdc5bd..227fee5e 100644 --- a/framework/src/main/resources/templates/java/controller.btl +++ b/framework/src/main/resources/templates/java/controller.btl @@ -26,7 +26,7 @@ import java.util.List; @Api(tags = "${entity.description}接口") @RequestMapping("/lili/${entity.classNameLowerCase}") @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) + public class ${entity.className}Controller { private final ${entity.className}Service ${entity.classNameLowerCase}Service; diff --git a/framework/src/main/resources/templates/java/serviceImpl.btl b/framework/src/main/resources/templates/java/serviceImpl.btl index 556514f7..ce083c27 100644 --- a/framework/src/main/resources/templates/java/serviceImpl.btl +++ b/framework/src/main/resources/templates/java/serviceImpl.btl @@ -16,7 +16,7 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) + public class ${entity.className}ServiceImpl extends ServiceImpl<${entity.className}Mapper, ${entity.className}> implements ${entity.className}Service { private final ${entity.className}Mapper ${entity.classNameLowerCase}Mapper; diff --git a/manager-api/src/main/java/cn/lili/controller/distribution/DistributionCashManagerController.java b/manager-api/src/main/java/cn/lili/controller/distribution/DistributionCashManagerController.java index 1aff99ad..a0a708a0 100644 --- a/manager-api/src/main/java/cn/lili/controller/distribution/DistributionCashManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/distribution/DistributionCashManagerController.java @@ -10,7 +10,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,10 +24,10 @@ import javax.validation.constraints.NotNull; @RestController @Api(tags = "管理端,分销佣金管理接口") @RequestMapping("/manager/distribution/cash") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class DistributionCashManagerController { - private final DistributionCashService distributorCashService; + @Autowired + private DistributionCashService distributorCashService; @ApiOperation(value = "通过id获取分销佣金详情") @GetMapping(value = "/get/{id}") diff --git a/manager-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsManagerController.java b/manager-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsManagerController.java index aeb003dc..2bab1437 100644 --- a/manager-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsManagerController.java @@ -24,10 +24,10 @@ import java.util.List; @RestController @Api(tags = "管理端,分销商品管理接口") @RequestMapping("/manager/distribution/goods") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class DistributionGoodsManagerController { - private final DistributionGoodsService distributionGoodsService; + @Autowired + private DistributionGoodsService distributionGoodsService; @GetMapping(value = "/getByPage") @ApiOperation(value = "分页获取") diff --git a/manager-api/src/main/java/cn/lili/controller/distribution/DistributionManagerController.java b/manager-api/src/main/java/cn/lili/controller/distribution/DistributionManagerController.java index a4469cab..d1899011 100644 --- a/manager-api/src/main/java/cn/lili/controller/distribution/DistributionManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/distribution/DistributionManagerController.java @@ -27,10 +27,10 @@ import javax.validation.constraints.NotNull; @RestController @Api(tags = "管理端,分销员管理接口") @RequestMapping("/manager/distribution") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class DistributionManagerController { - private final DistributionService distributionService; + @Autowired + private DistributionService distributionService; @ApiOperation(value = "分页获取") @GetMapping(value = "/getByPage") diff --git a/manager-api/src/main/java/cn/lili/controller/distribution/DistributionOrderManagerController.java b/manager-api/src/main/java/cn/lili/controller/distribution/DistributionOrderManagerController.java index 21ddaeee..ea7455cd 100644 --- a/manager-api/src/main/java/cn/lili/controller/distribution/DistributionOrderManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/distribution/DistributionOrderManagerController.java @@ -24,10 +24,10 @@ import org.springframework.web.bind.annotation.RestController; @RestController @Api(tags = "管理端,分销订单管理接口") @RequestMapping("/manager/distribution/order") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class DistributionOrderManagerController { - private final DistributionOrderService distributionOrderService; + @Autowired + private DistributionOrderService distributionOrderService; @ApiOperation(value = "通过id获取分销订单") @GetMapping(value = "/get/{id}") diff --git a/manager-api/src/main/java/cn/lili/controller/file/FileManagerController.java b/manager-api/src/main/java/cn/lili/controller/file/FileManagerController.java index d807733b..feb0da84 100644 --- a/manager-api/src/main/java/cn/lili/controller/file/FileManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/file/FileManagerController.java @@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -27,10 +26,10 @@ import java.util.List; @RestController @Api(tags = "管理端,文件管理管理接口") @RequestMapping("/manager/file") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class FileManagerController { - private final FileService fileService; + @Autowired + private FileService fileService; @ApiOperation(value = "管理端管理所有图片") diff --git a/manager-api/src/main/java/cn/lili/controller/goods/BrandManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/BrandManagerController.java index 7ea4bd95..e88d31a8 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/BrandManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/BrandManagerController.java @@ -33,13 +33,13 @@ import java.util.List; @RestController @Api(tags = "管理端,品牌接口") @RequestMapping("/manager/goods/brand") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class BrandManagerController { /** * 品牌 */ - private final BrandService brandService; + @Autowired + private BrandService brandService; @ApiOperation(value = "通过id获取") @ApiImplicitParam(name = "id", value = "品牌ID", required = true, dataType = "String", paramType = "path") diff --git a/manager-api/src/main/java/cn/lili/controller/goods/CategoryBrandManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/CategoryBrandManagerController.java index 1708d609..cc755433 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/CategoryBrandManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/CategoryBrandManagerController.java @@ -26,13 +26,13 @@ import java.util.List; @RestController @Api(tags = "管理端,分类品牌接口") @RequestMapping("/manager/category/brand") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class CategoryBrandManagerController { /** * 规格品牌管理 */ - private final CategoryBrandService categoryBrandService; + @Autowired + private CategoryBrandService categoryBrandService; @ApiOperation(value = "查询某分类下绑定的品牌信息") @ApiImplicitParam(name = "categoryId", value = "分类id", required = true, dataType = "String", paramType = "path") diff --git a/manager-api/src/main/java/cn/lili/controller/goods/CategoryManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/CategoryManagerController.java index 9a5cedfb..f3c8eb5a 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/CategoryManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/CategoryManagerController.java @@ -31,18 +31,19 @@ import java.util.List; @Api(tags = "管理端,商品分类接口") @RequestMapping("/manager/goods/category") @CacheConfig(cacheNames = "category") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class CategoryManagerController { /** * 分类 */ - private final CategoryService categoryService; + @Autowired + private CategoryService categoryService; /** * 商品 */ - private final GoodsService goodsService; + @Autowired + private GoodsService goodsService; @ApiOperation(value = "查询某分类下的全部子分类列表") @ApiImplicitParam(name = "parentId", value = "父id，顶级为0", required = true, dataType = "String", paramType = "path") diff --git a/manager-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupManagerController.java index 01604f18..980a3d08 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupManagerController.java @@ -27,18 +27,19 @@ import java.util.List; @RestController @Api(tags = "管理端,分类绑定参数组接口") @RequestMapping("/manager/goods/category/parameters") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class CategoryParameterGroupManagerController { /** * 参数组 */ - private final ParametersService parametersService; + @Autowired + private ParametersService parametersService; /** * 分类参数 */ - private final CategoryParameterGroupService categoryParameterGroupService; + @Autowired + private CategoryParameterGroupService categoryParameterGroupService; @ApiOperation(value = "查询某分类下绑定的参数信息") @GetMapping(value = "/{categoryId}") diff --git a/manager-api/src/main/java/cn/lili/controller/goods/CategorySpecificationManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/CategorySpecificationManagerController.java index 541f3550..ece78da9 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/CategorySpecificationManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/CategorySpecificationManagerController.java @@ -28,18 +28,19 @@ import java.util.List; @RestController @Api(tags = "管理端,商品分类规格接口") @RequestMapping("/manager/goods/category/spec") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class CategorySpecificationManagerController { /** * 分类规格 */ - private final CategorySpecificationService categorySpecificationService; + @Autowired + private CategorySpecificationService categorySpecificationService; /** * 规格 */ - private final SpecificationService specificationService; + @Autowired + private SpecificationService specificationService; @ApiOperation(value = "查询某分类下绑定的规格信息") diff --git a/manager-api/src/main/java/cn/lili/controller/goods/GoodsManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/GoodsManagerController.java index 711d6757..72b32f14 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/GoodsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/GoodsManagerController.java @@ -33,12 +33,13 @@ import java.util.List; @RestController @Api(tags = "管理端,商品管理接口") @RequestMapping("/manager/goods") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class GoodsManagerController { //商品 - private final GoodsService goodsService; + @Autowired + private GoodsService goodsService; //规格商品 - private final GoodsSkuService goodsSkuService; + @Autowired + private GoodsSkuService goodsSkuService; @ApiOperation(value = "分页获取") @GetMapping(value = "/list") diff --git a/manager-api/src/main/java/cn/lili/controller/goods/GoodsParameterManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/GoodsParameterManagerController.java index 2ed5b661..6aa198ab 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/GoodsParameterManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/GoodsParameterManagerController.java @@ -26,10 +26,10 @@ import java.util.List; @RestController @Api(tags = "管理端,商品关联参数管理接口") @RequestMapping("/manager/goods/parameters") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class GoodsParameterManagerController { - private final GoodsParamsService goodsParamsService; + @Autowired + private GoodsParamsService goodsParamsService; @ApiImplicitParams({ @ApiImplicitParam(name = "goodsId", value = "商品ID", required = true, paramType = "path", dataType = "String"), diff --git a/manager-api/src/main/java/cn/lili/controller/goods/GoodsUnitManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/GoodsUnitManagerController.java index 75de6e86..600f1a5d 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/GoodsUnitManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/GoodsUnitManagerController.java @@ -30,10 +30,10 @@ import java.util.List; @RestController @Api(tags = "管理端,商品计量单位接口") @RequestMapping("/manager/goods/goodsUnit") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class GoodsUnitManagerController { - private final GoodsUnitService goodsUnitService; + @Autowired + private GoodsUnitService goodsUnitService; @ApiOperation(value = "分页获取商品计量单位") diff --git a/manager-api/src/main/java/cn/lili/controller/goods/ParameterManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/ParameterManagerController.java index 60844fa2..6895f96e 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/ParameterManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/ParameterManagerController.java @@ -8,7 +8,6 @@ import cn.lili.modules.goods.service.ParametersService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -23,10 +22,10 @@ import javax.validation.Valid; @RestController @Api(tags = "管理端,分类绑定参数组管理接口") @RequestMapping("/manager/goods/parameters") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class ParameterManagerController { - private final ParametersService parametersService; + @Autowired + private ParametersService parametersService; @ApiOperation(value = "添加参数") @PostMapping diff --git a/manager-api/src/main/java/cn/lili/controller/goods/SpecValuesManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/SpecValuesManagerController.java index b050a248..1d42f85b 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/SpecValuesManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/SpecValuesManagerController.java @@ -9,7 +9,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,10 +24,10 @@ import java.util.List; @RestController @Api(tags = "管理端,规格项管理接口") @RequestMapping("/manager/goods/specValues") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class SpecValuesManagerController { - private final SpecValuesService specValuesService; + @Autowired + private SpecValuesService specValuesService; @GetMapping(value = "/values/{id}") @ApiImplicitParam(name = "id", value = "规格项ID", required = true, dataType = "String", paramType = "path") diff --git a/manager-api/src/main/java/cn/lili/controller/goods/SpecificationManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/SpecificationManagerController.java index 5eae4cd7..8e64700f 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/SpecificationManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/SpecificationManagerController.java @@ -31,10 +31,10 @@ import java.util.List; @RestController @Api(tags = "管理端,商品规格接口") @RequestMapping("/manager/goods/spec") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class SpecificationManagerController { - private final SpecificationService specificationService; + @Autowired + private SpecificationService specificationService; @GetMapping(value = "/{id}") @ApiImplicitParam(name = "id", value = "商品规格ID", required = true, dataType = "String", paramType = "path") diff --git a/manager-api/src/main/java/cn/lili/controller/member/ConnectConfigManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/ConnectConfigManagerController.java index 0cf6fcc6..f11dadd3 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/ConnectConfigManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/ConnectConfigManagerController.java @@ -7,7 +7,6 @@ import cn.lili.modules.connect.entity.vo.ConnectConfigForm; import cn.lili.modules.connect.service.ConnectConfigService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -23,10 +22,10 @@ import java.util.List; @RestController @Api(tags = "管理端,联合登陆配置接口") @RequestMapping("/manager/connectConfig") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class ConnectConfigManagerController { - private final ConnectConfigService connectConfigService; + @Autowired + private ConnectConfigService connectConfigService; @GetMapping(value = "/list") @ApiOperation(value = "获取所有联合配置") diff --git a/manager-api/src/main/java/cn/lili/controller/member/IpInfoManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/IpInfoManagerController.java index 620b5931..10a2e2ea 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/IpInfoManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/IpInfoManagerController.java @@ -5,7 +5,6 @@ import cn.lili.common.utils.ResultUtil; import cn.lili.common.vo.ResultMessage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -22,10 +21,9 @@ import javax.servlet.http.HttpServletRequest; @RestController @Api(tags = "管理端,IP接口") @RequestMapping("/manager/common/ip") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class IpInfoManagerController { - - private final IpHelper ipHelper; + @Autowired + private IpHelper ipHelper; @RequestMapping(value = "/info", method = RequestMethod.GET) @ApiOperation(value = "IP及天气相关信息") diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberAddressManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberAddressManagerController.java index d87d2041..fdca86ad 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberAddressManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberAddressManagerController.java @@ -25,10 +25,9 @@ import javax.validation.Valid; @RestController @Api(tags = "管理端,会员地址API") @RequestMapping("/manager/member/address") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MemberAddressManagerController { - - private final MemberAddressService memberAddressService; + @Autowired + private MemberAddressService memberAddressService; @ApiOperation(value = "会员地址分页列表") @GetMapping("/{memberId}") diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberEvaluationManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberEvaluationManagerController.java index c593b19a..661cb892 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberEvaluationManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberEvaluationManagerController.java @@ -28,10 +28,9 @@ import javax.validation.constraints.NotNull; @RestController @Api(tags = "管理端,会员商品评价接口") @RequestMapping("/manager/memberEvaluation") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MemberEvaluationManagerController { - - private final MemberEvaluationService memberEvaluationService; + @Autowired + private MemberEvaluationService memberEvaluationService; @ApiOperation(value = "通过id获取评论") @ApiImplicitParam(name = "id", value = "评价ID", required = true, dataType = "String", paramType = "path") diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java index 43b1b33a..ee119830 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java @@ -14,7 +14,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -30,10 +29,9 @@ import java.util.List; @RestController @Api(tags = "管理端,会员接口") @RequestMapping("/manager/member") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MemberManagerController { - - private final MemberService memberService; + @Autowired + private MemberService memberService; @ApiOperation(value = "会员分页列表") @GetMapping diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeLogManagerController.java index 6636ece7..d67c7d03 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeLogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeLogManagerController.java @@ -25,10 +25,9 @@ import java.util.List; @RestController @Api(tags = "管理端,会员消息接口") @RequestMapping("/manager/memberNoticeLog") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MemberNoticeLogManagerController { - - private final MemberNoticeLogService memberNoticeLogService; + @Autowired + private MemberNoticeLogService memberNoticeLogService; @ApiOperation(value = "通过id获取") @GetMapping(value = "/get/{id}") diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeSenterManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeSenterManagerController.java index d4119835..bcc9df21 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeSenterManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeSenterManagerController.java @@ -26,10 +26,9 @@ import java.util.List; @RestController @Api(tags = "管理端,会员消息接口") @RequestMapping("/manager/memberNoticeSenter") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MemberNoticeSenterManagerController { - - private final MemberNoticeSenterService memberNoticeSenterService; + @Autowired + private MemberNoticeSenterService memberNoticeSenterService; @ApiOperation(value = "通过id获取") @GetMapping(value = "/get/{id}") diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberPointsHistoryManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberPointsHistoryManagerController.java index 99f5d15c..531d6ccb 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberPointsHistoryManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberPointsHistoryManagerController.java @@ -28,10 +28,9 @@ import org.springframework.web.bind.annotation.RestController; @RestController @Api(tags = "管理端,会员积分历史接口") @RequestMapping("/manager/member/memberPointsHistory") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MemberPointsHistoryManagerController { - - private final MemberPointsHistoryService memberPointsHistoryService; + @Autowired + private MemberPointsHistoryService memberPointsHistoryService; @ApiOperation(value = "分页获取") @ApiImplicitParams({ diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberWalletManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberWalletManagerController.java index c57b6c8f..5c6bec6c 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberWalletManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberWalletManagerController.java @@ -7,7 +7,6 @@ import cn.lili.modules.member.service.MemberWalletService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -23,10 +22,9 @@ import org.springframework.web.bind.annotation.RestController; @RestController @Api(tags = "管理端,预存款接口") @RequestMapping("/manager/members/wallet") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MemberWalletManagerController { - - private final MemberWalletService memberWalletService; + @Autowired + private MemberWalletService memberWalletService; @GetMapping @ApiOperation(value = "查询会员预存款余额") diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyManagerController.java index 8bcb2372..ae05c2a9 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyManagerController.java @@ -12,10 +12,12 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** @@ -28,10 +30,9 @@ import org.springframework.web.bind.annotation.*; @Api(tags = "管理端,余额提现记录接口") @RequestMapping("/manager/members/withdraw-apply") @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MemberWithdrawApplyManagerController { - - private final MemberWithdrawApplyService memberWithdrawApplyService; + @Autowired + private MemberWithdrawApplyService memberWithdrawApplyService; @ApiOperation(value = "分页获取提现记录") diff --git a/manager-api/src/main/java/cn/lili/controller/other/ArticleCategoryManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/ArticleCategoryManagerController.java index 2361279f..cd9b6b60 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/ArticleCategoryManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/ArticleCategoryManagerController.java @@ -9,7 +9,6 @@ import cn.lili.modules.page.service.ArticleCategoryService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,13 +24,13 @@ import java.util.List; @RestController @Api(tags = "管理端,文章分类管理接口") @RequestMapping("/manager/article-category") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class ArticleCategoryManagerController { /** * 文章分类 */ - private final ArticleCategoryService articleCategoryService; + @Autowired + private ArticleCategoryService articleCategoryService; @ApiOperation(value = "查询分类列表") @GetMapping(value = "/all-children") diff --git a/manager-api/src/main/java/cn/lili/controller/other/ArticleManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/ArticleManagerController.java index 0c998053..446146f0 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/ArticleManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/ArticleManagerController.java @@ -28,13 +28,13 @@ import javax.validation.Valid; @RestController @Api(tags = "管理端,文章接口") @RequestMapping("/manager/article") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class ArticleManagerController { /** * 文章 */ - private final ArticleService articleService; + @Autowired + private ArticleService articleService; @ApiOperation(value = "查看文章") @ApiImplicitParam(name = "id", value = "文章ID", required = true, dataType = "String", paramType = "path") diff --git a/manager-api/src/main/java/cn/lili/controller/other/CustomWordsController.java b/manager-api/src/main/java/cn/lili/controller/other/CustomWordsController.java index e1094fa8..bf2017e6 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/CustomWordsController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/CustomWordsController.java @@ -7,7 +7,6 @@ import cn.lili.modules.search.service.CustomWordsService; import cn.lili.modules.system.entity.dos.Setting; import cn.lili.modules.system.service.SettingService; import io.swagger.annotations.Api; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -24,17 +23,18 @@ import java.nio.charset.StandardCharsets; @RestController @Api(tags = "管理端,自定义分词接口") @RequestMapping("/manager/custom-words") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class CustomWordsController { /** * 分词 */ - private final CustomWordsService customWordsService; + @Autowired + private CustomWordsService customWordsService; /** * 设置 */ - private final SettingService settingService; + @Autowired + private SettingService settingService; @GetMapping public String getCustomWords(String secretKey) { diff --git a/manager-api/src/main/java/cn/lili/controller/other/CustomWordsManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/CustomWordsManagerController.java index b81e5614..ec829554 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/CustomWordsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/CustomWordsManagerController.java @@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -27,13 +26,13 @@ import javax.validation.constraints.NotNull; @RestController @Api(tags = "管理端,自定义分词接口") @RequestMapping("/manager/manager/custom-words") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class CustomWordsManagerController { /** * 分词 */ - private final CustomWordsService customWordsService; + @Autowired + private CustomWordsService customWordsService; @ApiOperation(value = "添加自定义分词") @PostMapping diff --git a/manager-api/src/main/java/cn/lili/controller/other/FeedbackManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/FeedbackManagerController.java index 7c5c6eed..9491c673 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/FeedbackManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/FeedbackManagerController.java @@ -26,13 +26,13 @@ import org.springframework.web.bind.annotation.RestController; @RestController @Api(tags = "管理端,意见反馈接口") @RequestMapping("/manager/feedback") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class FeedbackManagerController { /** * 意见反馈 */ - private final FeedbackService feedbackService; + @Autowired + private FeedbackService feedbackService; @ApiOperation(value = "查询意见反馈列表") @ApiImplicitParam(name = "parentId", value = "父id，顶级为0", required = true, dataType = "String", paramType = "path") diff --git a/manager-api/src/main/java/cn/lili/controller/other/MessageManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/MessageManagerController.java index d98b7819..a3ec9ec3 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/MessageManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/MessageManagerController.java @@ -24,10 +24,9 @@ import org.springframework.web.bind.annotation.*; @RestController @Api(tags = "管理端,消息发送管理接口") @RequestMapping("/manager/message") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MessageManagerController { - - private final MessageService messageService; + @Autowired + private MessageService messageService; @GetMapping diff --git a/manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java index 0e407ddf..58e79a7b 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java @@ -12,7 +12,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -28,10 +27,10 @@ import javax.validation.constraints.NotNull; @RestController @Api(tags = "管理端,页面设置管理接口") @RequestMapping("/manager/pageData") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class PageDataManagerController { - private final PageDataService pageDataService; + @Autowired + private PageDataService pageDataService; @ApiOperation(value = "获取页面信息") @ApiImplicitParam(name = "id", value = "页面ID", required = true, dataType = "String", paramType = "path") diff --git a/manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.java index 555a89fa..5bc33d29 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.java @@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -28,10 +27,10 @@ import java.util.List; @RestController @Api(tags = "管理端,敏感词管理接口") @RequestMapping("/manager/sensitiveWords") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class SensitiveWordsManagerController { - private final SensitiveWordsService sensitiveWordsService; + @Autowired + private SensitiveWordsService sensitiveWordsService; @ApiOperation(value = "通过id获取") @ApiImplicitParam(name = "id", value = "敏感词ID", required = true, dataType = "String", paramType = "path") diff --git a/manager-api/src/main/java/cn/lili/controller/other/SpecialManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/SpecialManagerController.java index a199801f..72a2ad68 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/SpecialManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/SpecialManagerController.java @@ -28,10 +28,10 @@ import java.util.List; @RestController @Api(tags = "管理端,专题活动接口") @RequestMapping("/manager/special") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class SpecialManagerController { - private final SpecialService specialService; + @Autowired + private SpecialService specialService; @ApiOperation(value = "添加专题活动") @PostMapping("/addSpecial") diff --git a/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java b/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java index 6542cade..9545792f 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java @@ -11,7 +11,6 @@ import cn.lili.modules.base.service.VerificationSourceService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -29,10 +28,10 @@ import java.util.List; @Api(tags = "管理端,验证码资源维护接口") @RequestMapping("/manager/verificationSource") @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class VerificationSourceController { - private final VerificationSourceService verificationSourceService; + @Autowired + private VerificationSourceService verificationSourceService; @GetMapping(value = "/{id}") @ApiOperation(value = "查看验证码资源维护详情") diff --git a/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java b/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java index 869cd4be..039b1fb2 100644 --- a/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java @@ -19,7 +19,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; @@ -42,12 +41,11 @@ import java.util.List; @RequestMapping("/manager/user") @Transactional @Validated -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class AdminUserManagerController { - - private final AdminUserService adminUserService; - - private final DepartmentService departmentService; + @Autowired + private AdminUserService adminUserService; + @Autowired + private DepartmentService departmentService; @GetMapping(value = "/login") diff --git a/manager-api/src/main/java/cn/lili/controller/permission/DepartmentManagerController.java b/manager-api/src/main/java/cn/lili/controller/permission/DepartmentManagerController.java index 66c0bf8d..6741e4a6 100644 --- a/manager-api/src/main/java/cn/lili/controller/permission/DepartmentManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/permission/DepartmentManagerController.java @@ -26,10 +26,9 @@ import java.util.List; @RestController @Api(tags = "管理端,部门管理接口") @RequestMapping("/manager/department") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class DepartmentManagerController { - - private final DepartmentService departmentService; + @Autowired + private DepartmentService departmentService; @GetMapping(value = "/{id}") @ApiOperation(value = "查看部门详情") diff --git a/manager-api/src/main/java/cn/lili/controller/permission/DepartmentRoleManagerController.java b/manager-api/src/main/java/cn/lili/controller/permission/DepartmentRoleManagerController.java index d998c745..0448c5eb 100644 --- a/manager-api/src/main/java/cn/lili/controller/permission/DepartmentRoleManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/permission/DepartmentRoleManagerController.java @@ -23,10 +23,9 @@ import java.util.List; @RestController @Api(tags = "管理端,部门角色接口") @RequestMapping("/manager/departmentRole") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class DepartmentRoleManagerController { - - private final DepartmentRoleService departmentRoleService; + @Autowired + private DepartmentRoleService departmentRoleService; @GetMapping(value = "/{departmentId}") @ApiOperation(value = "查看部门拥有的角色") diff --git a/manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java b/manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java index 5dbc1d4f..8ad7c9d1 100644 --- a/manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java @@ -26,11 +26,9 @@ import java.util.List; @RestController @Api(tags = "管理端,菜单管理接口") @RequestMapping("/manager/menu") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MenuManagerController { - - private final MenuService menuService; - + @Autowired + private MenuService menuService; @ApiOperation(value = "搜索菜单") @GetMapping diff --git a/manager-api/src/main/java/cn/lili/controller/permission/RoleManagerController.java b/manager-api/src/main/java/cn/lili/controller/permission/RoleManagerController.java index 82551cf5..b3669fb1 100644 --- a/manager-api/src/main/java/cn/lili/controller/permission/RoleManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/permission/RoleManagerController.java @@ -26,10 +26,9 @@ import java.util.List; @RestController @Api(tags = "管理端,角色管理接口") @RequestMapping("/manager/role") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class RoleManagerController { - - private final RoleService roleService; + @Autowired + private RoleService roleService; @PostMapping @ApiOperation(value = "添加") diff --git a/manager-api/src/main/java/cn/lili/controller/permission/RoleMenuManagerController.java b/manager-api/src/main/java/cn/lili/controller/permission/RoleMenuManagerController.java index 5c69271c..c2c5ba59 100644 --- a/manager-api/src/main/java/cn/lili/controller/permission/RoleMenuManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/permission/RoleMenuManagerController.java @@ -23,10 +23,9 @@ import java.util.List; @RestController @Api(tags = "管理端,角色菜单接口") @RequestMapping("/manager/roleMenu") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class RoleMenuManagerController { - - private final RoleMenuService roleMenuService; + @Autowired + private RoleMenuService roleMenuService; @GetMapping(value = "/{roleId}") @ApiOperation(value = "查看某角色拥有到菜单") diff --git a/manager-api/src/main/java/cn/lili/controller/permission/UserRoleManagerController.java b/manager-api/src/main/java/cn/lili/controller/permission/UserRoleManagerController.java index bedbe5c3..c1f23cbc 100644 --- a/manager-api/src/main/java/cn/lili/controller/permission/UserRoleManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/permission/UserRoleManagerController.java @@ -7,7 +7,6 @@ import cn.lili.modules.permission.entity.dos.UserRole; import cn.lili.modules.permission.service.UserRoleService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -23,10 +22,9 @@ import java.util.List; @RestController @Api(tags = "管理端,管理员角色接口") @RequestMapping("/manager/userRole") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class UserRoleManagerController { - - private final UserRoleService userRoleService; + @Autowired + private UserRoleService userRoleService; @GetMapping(value = "/{userId}") @ApiOperation(value = "查看管理员角色") diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/CouponManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/CouponManagerController.java index 1b3fb2ff..d5389d86 100644 --- a/manager-api/src/main/java/cn/lili/controller/promotion/CouponManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/promotion/CouponManagerController.java @@ -19,7 +19,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -35,11 +34,11 @@ import java.util.List; @RestController @Api(tags = "管理端,优惠券接口") @RequestMapping("/manager/promotion/coupon") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class CouponManagerController { - - private final CouponService couponService; - private final MemberCouponService memberCouponService; + @Autowired + private CouponService couponService; + @Autowired + private MemberCouponService memberCouponService; @ApiOperation(value = "获取优惠券列表") @GetMapping diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/FullDiscountManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/FullDiscountManagerController.java index 82ff03ad..ef8c0a42 100644 --- a/manager-api/src/main/java/cn/lili/controller/promotion/FullDiscountManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/promotion/FullDiscountManagerController.java @@ -25,10 +25,9 @@ import org.springframework.web.bind.annotation.RestController; @RestController @Api(tags = "管理端,满额活动接口") @RequestMapping("/manager/promotion/fullDiscount") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class FullDiscountManagerController { - - private final FullDiscountService fullDiscountService; + @Autowired + private FullDiscountService fullDiscountService; @ApiOperation(value = "获取满优惠列表") @GetMapping diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/PintuanManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/PintuanManagerController.java index 5838a43d..59509afe 100644 --- a/manager-api/src/main/java/cn/lili/controller/promotion/PintuanManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/promotion/PintuanManagerController.java @@ -30,11 +30,11 @@ import java.util.Date; @RestController @Api(tags = "管理端,平台拼团接口") @RequestMapping("/manager/promotion/pintuan") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class PintuanManagerController { - - private final PintuanService pintuanService; - private final PromotionGoodsService promotionGoodsService; + @Autowired + private PintuanService pintuanService; + @Autowired + private PromotionGoodsService promotionGoodsService; @GetMapping(value = "/{id}") @ApiOperation(value = "通过id获取") diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsCategoryManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsCategoryManagerController.java index abddabe6..96a48ac3 100644 --- a/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsCategoryManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsCategoryManagerController.java @@ -10,7 +10,6 @@ import cn.lili.modules.promotion.service.PointsGoodsCategoryService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -23,10 +22,9 @@ import org.springframework.web.bind.annotation.*; @RestController @Api(tags = "管理端,积分商品分类接口") @RequestMapping("/manager/promotion/pointsGoodsCategory") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class PointsGoodsCategoryManagerController { - - private final PointsGoodsCategoryService pointsGoodsCategoryService; + @Autowired + private PointsGoodsCategoryService pointsGoodsCategoryService; @PostMapping @ApiOperation(value = "添加积分商品分类") diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsManagerController.java index 06c26f33..50a1bda4 100644 --- a/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsManagerController.java @@ -29,10 +29,9 @@ import java.util.List; @RestController @Api(tags = "管理端,积分商品接口") @RequestMapping("/manager/promotion/pointsGoods") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class PointsGoodsManagerController { - - private final PointsGoodsService pointsGoodsService; + @Autowired + private PointsGoodsService pointsGoodsService; @PostMapping(consumes = "application/json", produces = "application/json") @ApiOperation(value = "添加积分商品") diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/PromotionManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/PromotionManagerController.java index b7ec8b17..e57ff029 100644 --- a/manager-api/src/main/java/cn/lili/controller/promotion/PromotionManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/promotion/PromotionManagerController.java @@ -27,12 +27,12 @@ import java.util.Map; @RestController @Api(tags = "管理端,促销接口") @RequestMapping("/manager/promotion") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class PromotionManagerController { - private final PromotionService promotionService; - - private final PromotionGoodsService promotionGoodsService; + @Autowired + private PromotionService promotionService; + @Autowired + private PromotionGoodsService promotionGoodsService; @GetMapping("/current") @ApiOperation(value = "获取当前进行中的促销活动") diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/SeckillManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/SeckillManagerController.java index 5e1add64..f23d762a 100644 --- a/manager-api/src/main/java/cn/lili/controller/promotion/SeckillManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/promotion/SeckillManagerController.java @@ -16,7 +16,6 @@ import cn.lili.modules.promotion.service.SeckillService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -29,11 +28,11 @@ import org.springframework.web.bind.annotation.*; @RestController @Api(tags = "管理端,限时抢购接口") @RequestMapping("/manager/promotion/seckill") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class SeckillManagerController { - - private final SeckillService seckillService; - private final SeckillApplyService seckillApplyService; + @Autowired + private SeckillService seckillService; + @Autowired + private SeckillApplyService seckillApplyService; @PostMapping @ApiOperation(value = "添加限时抢购") diff --git a/manager-api/src/main/java/cn/lili/controller/purchase/PurchaseManagerController.java b/manager-api/src/main/java/cn/lili/controller/purchase/PurchaseManagerController.java index f24904cc..5b3eb693 100644 --- a/manager-api/src/main/java/cn/lili/controller/purchase/PurchaseManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/purchase/PurchaseManagerController.java @@ -14,7 +14,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -30,17 +29,18 @@ import java.util.List; @Api(tags = "管理端,采购接口") @RestController @RequestMapping("/manager/purchase") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class PurchaseManagerController { /** * 采购单 */ - private final PurchaseOrderService purchaseOrderService; + @Autowired + private PurchaseOrderService purchaseOrderService; /** * 采购单报价 */ - private final PurchaseQuotedService purchaseQuotedService; + @Autowired + private PurchaseQuotedService purchaseQuotedService; @ApiOperation(value = "采购单分页") diff --git a/manager-api/src/main/java/cn/lili/controller/setting/AppVersionManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/AppVersionManagerController.java index 9c54a7c5..9abb5578 100755 --- a/manager-api/src/main/java/cn/lili/controller/setting/AppVersionManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/AppVersionManagerController.java @@ -28,10 +28,9 @@ import javax.validation.Valid; @RestController @Api("管理端,app版本控制器") @RequestMapping("/manager/systems/app/version") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class AppVersionManagerController { - - private final AppVersionService appVersionService; + @Autowired + private AppVersionService appVersionService; @ApiOperation(value = "查询app升级消息", response = AppVersionDO.class) diff --git a/manager-api/src/main/java/cn/lili/controller/setting/InstantDeliveryManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/InstantDeliveryManagerController.java index 3c1e1c93..8ac44efd 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/InstantDeliveryManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/InstantDeliveryManagerController.java @@ -30,10 +30,9 @@ import java.util.List; @RestController @Api(tags = "管理端,即时配送接口") @RequestMapping("/manager/instant-delivery") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class InstantDeliveryManagerController { - - private final InstantDeliveryService instantDeliveryService; + @Autowired + private InstantDeliveryService instantDeliveryService; @GetMapping(value = "/getByPage") @ApiOperation(value = "分页获取") diff --git a/manager-api/src/main/java/cn/lili/controller/setting/LogManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/LogManagerController.java index 5d6226bb..9a73f418 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/LogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/LogManagerController.java @@ -28,10 +28,9 @@ import java.util.List; @RestController @Api(tags = "日志管理接口") @RequestMapping("/manager/log") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class LogManagerController { - - private final SystemLogService systemLogService; + @Autowired + private SystemLogService systemLogService; @GetMapping(value = "/getAllByPage") @ApiOperation(value = "分页获取全部") diff --git a/manager-api/src/main/java/cn/lili/controller/setting/LogisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/LogisticsManagerController.java index c1831b12..6139f9b0 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/LogisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/LogisticsManagerController.java @@ -27,10 +27,9 @@ import javax.validation.constraints.NotNull; @RestController @Api(tags = "管理端,物流公司接口") @RequestMapping("/manager/logistics") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class LogisticsManagerController { - - private final LogisticsService logisticsService; + @Autowired + private LogisticsService logisticsService; @ApiOperation(value = "通过id获取物流公司") @GetMapping(value = "/get/{id}") diff --git a/manager-api/src/main/java/cn/lili/controller/setting/MemberNoticeManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/MemberNoticeManagerController.java index 2b7b30e7..7f0e520d 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/MemberNoticeManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/MemberNoticeManagerController.java @@ -13,7 +13,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -28,10 +27,9 @@ import java.util.List; @RestController @Api(tags = "管理端,会员站内信管理API") @RequestMapping("/manager/member/notice") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MemberNoticeManagerController { - - private final MemberNoticeService memberNoticeService; + @Autowired + private MemberNoticeService memberNoticeService; @ApiOperation(value = "获取详情") @GetMapping(value = "/{id}") diff --git a/manager-api/src/main/java/cn/lili/controller/setting/NoticeMessageManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/NoticeMessageManagerController.java index 80e534af..97b1e0fc 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/NoticeMessageManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/NoticeMessageManagerController.java @@ -36,10 +36,9 @@ import java.util.List; @RestController @Api(tags = "管理端,会员站内信管理接口") @RequestMapping("/manager/noticeMessage") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class NoticeMessageManagerController { - - private final NoticeMessageService noticeMessageService; + @Autowired + private NoticeMessageService noticeMessageService; @ApiOperation(value = "消息模板分页") @GetMapping diff --git a/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java index dc5a53ce..68be7c49 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java @@ -27,10 +27,9 @@ import java.util.List; @Api(tags = "管理端,行政地区管理接口") @RequestMapping("/manager/region") @Transactional -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class RegionManagerController { - - private final RegionService regionService; + @Autowired + private RegionService regionService; @PostMapping(value = "/sync") @ApiOperation(value = "同步高德行政地区数据") diff --git a/manager-api/src/main/java/cn/lili/controller/setting/ServiceNoticeManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/ServiceNoticeManagerController.java index 932ea8c7..219efd6a 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/ServiceNoticeManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/ServiceNoticeManagerController.java @@ -11,7 +11,6 @@ import cn.lili.modules.system.service.ServiceNoticeService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -27,10 +26,9 @@ import java.util.List; @RestController @Api(tags = "管理端,服务订阅消息接口") @RequestMapping("/manager/admin/notice") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class ServiceNoticeManagerController { - - private final ServiceNoticeService serviceNoticeService; + @Autowired + private ServiceNoticeService serviceNoticeService; @ApiOperation(value = "查看服务订阅消息详情") @GetMapping(value = "/{id}") diff --git a/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java index 7d5dc4bf..febe56cf 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java @@ -18,7 +18,6 @@ import cn.lili.modules.system.service.SettingService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -33,10 +32,9 @@ import java.util.Collections; @RestController @Api(tags = "管理端,系统设置接口") @RequestMapping("/manager/system/setting") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class SettingManagerController { - - private final SettingService settingService; + @Autowired + private SettingService settingService; @DemoSite diff --git a/manager-api/src/main/java/cn/lili/controller/setting/SettingXManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/SettingXManagerController.java index 988f24d9..1dfe06a4 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/SettingXManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/SettingXManagerController.java @@ -5,8 +5,6 @@ import cn.lili.common.vo.ResultMessage; import cn.lili.modules.system.entity.dto.payment.dto.PaymentSupportForm; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -21,7 +19,6 @@ import org.springframework.web.bind.annotation.RestController; @RestController @Api(tags = "管理端,系统设置扩展接口") @RequestMapping("/manager/system/settingx") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class SettingXManagerController { @ApiOperation(value = "支持支付方式表单") diff --git a/manager-api/src/main/java/cn/lili/controller/setting/SmsManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/SmsManagerController.java index 7ef4e3ef..07967b61 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/SmsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/SmsManagerController.java @@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -26,10 +25,9 @@ import java.util.List; @RestController @Api(tags = "管理端,短信接口") @RequestMapping("/manager/sms") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class SmsManagerController { - - private final SmsReachService smsReachService; + @Autowired + private SmsReachService smsReachService; @ApiOperation(value = "接口批量发送短信") @PostMapping diff --git a/manager-api/src/main/java/cn/lili/controller/setting/SmsSignManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/SmsSignManagerController.java index 2b866701..ea81f601 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/SmsSignManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/SmsSignManagerController.java @@ -25,9 +25,9 @@ import javax.validation.Valid; @RestController @Api(tags = "管理端,短信签名接口") @RequestMapping("/manager/sms/sign") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class SmsSignManagerController { - private final SmsSignService smsSignService; + @Autowired + private SmsSignService smsSignService; @ApiOperation(value = "新增短信签名") diff --git a/manager-api/src/main/java/cn/lili/controller/setting/SmsTemplateManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/SmsTemplateManagerController.java index 5dec0463..442c838a 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/SmsTemplateManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/SmsTemplateManagerController.java @@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,9 +24,9 @@ import javax.validation.Valid; @RestController @Api(tags = "管理端,短信模板接口") @RequestMapping("/manager/sms/template") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class SmsTemplateManagerController { - private final SmsTemplateService smsTemplateService; + @Autowired + private SmsTemplateService smsTemplateService; @ApiOperation(value = "新增短信模板") @PostMapping diff --git a/manager-api/src/main/java/cn/lili/controller/setting/WechatMPMessageManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/WechatMPMessageManagerController.java index 3c77d3c7..48ad5c9b 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/WechatMPMessageManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/WechatMPMessageManagerController.java @@ -11,7 +11,6 @@ import cn.lili.modules.message.service.WechatMPMessageService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -26,10 +25,9 @@ import java.util.List; @Api(tags = "微信小程序消息订阅接口") @RequestMapping("/manager/message/wechatMPMessage") @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class WechatMPMessageManagerController { - - private final WechatMPMessageService wechatMPMessageService; + @Autowired + private WechatMPMessageService wechatMPMessageService; @GetMapping(value = "/init") @ApiOperation(value = "初始化微信小程序消息订阅") diff --git a/manager-api/src/main/java/cn/lili/controller/setting/WechatMessageManageController.java b/manager-api/src/main/java/cn/lili/controller/setting/WechatMessageManageController.java index ce803533..3713ca10 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/WechatMessageManageController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/WechatMessageManageController.java @@ -26,10 +26,9 @@ import java.util.List; @RestController @Api(tags = "管理端,微信消息接口") @RequestMapping("/manager/message/wechat") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class WechatMessageManageController { - - private final WechatMessageService wechatMessageService; + @Autowired + private WechatMessageService wechatMessageService; @GetMapping(value = "/init") diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsManagerController.java index f34809d0..9c46710b 100644 --- a/manager-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsManagerController.java @@ -25,10 +25,9 @@ import java.util.List; @Api(tags = "管理端,商品统计接口") @RestController @RequestMapping("/manager/statistics/goods") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class GoodsStatisticsManagerController { - - private final GoodsStatisticsDataService goodsStatisticsDataService; + @Autowired + private GoodsStatisticsDataService goodsStatisticsDataService; @ApiOperation(value = "获取统计列表,排行前一百的数据") @GetMapping diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsManagerController.java index d60b83d9..888e9426 100644 --- a/manager-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsManagerController.java @@ -26,13 +26,13 @@ import java.util.List; @Api(tags = "管理端,首页统计数据接口") @RestController @RequestMapping("/manager/statistics/index") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class IndexStatisticsManagerController { /** * 首页统计 */ - private final IndexStatisticsService indexStatisticsService; + @Autowired + private IndexStatisticsService indexStatisticsService; @ApiOperation(value = "获取首页查询数据") @GetMapping diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/MemberStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/MemberStatisticsManagerController.java index 78de296b..2b70a512 100644 --- a/manager-api/src/main/java/cn/lili/controller/statistics/MemberStatisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/statistics/MemberStatisticsManagerController.java @@ -24,10 +24,9 @@ import java.util.List; @Api(tags = "管理端,会员统计接口") @RestController @RequestMapping("/manager/statistics/member") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MemberStatisticsManagerController { - - private final MemberStatisticsDataService memberStatisticsDataService; + @Autowired + private MemberStatisticsDataService memberStatisticsDataService; @ApiOperation(value = "获取会员统计") @GetMapping diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsManagerController.java index a189ba53..cd81f48f 100644 --- a/manager-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsManagerController.java @@ -31,14 +31,13 @@ import java.util.List; @Api(tags = "管理端,订单统计接口") @RestController @RequestMapping("/manager/statistics/order") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class OrderStatisticsManagerController { - - private final OrderStatisticsDataService orderStatisticsDataService; - - private final OrderService orderService; - - private final AfterSaleService afterSaleService; + @Autowired + private OrderStatisticsDataService orderStatisticsDataService; + @Autowired + private OrderService orderService; + @Autowired + private AfterSaleService afterSaleService; @ApiOperation(value = "订单概览统计") @GetMapping("/overview") diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsManagerController.java index a3752cee..01907451 100644 --- a/manager-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsManagerController.java @@ -9,7 +9,6 @@ import cn.lili.modules.statistics.service.RefundOrderStatisticsService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -24,10 +23,9 @@ import org.springframework.web.bind.annotation.RestController; @Api(tags = "管理端,退款统计接口") @RestController @RequestMapping("/manager/statistics/refund/order") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class RefundOrderStatisticsManagerController { - - private final RefundOrderStatisticsService refundOrderStatisticsService; + @Autowired + private RefundOrderStatisticsService refundOrderStatisticsService; @ApiOperation(value = "获取退款统计列表") @GetMapping("/getByPage") diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsManagerController.java index 46e512af..a01eaf6a 100644 --- a/manager-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsManagerController.java @@ -9,7 +9,6 @@ import cn.lili.modules.statistics.model.vo.PlatformViewVO; import cn.lili.modules.statistics.service.PlatformViewDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -26,10 +25,9 @@ import java.util.List; @Api(tags = "管理端,流量统计接口") @RestController @RequestMapping("/manager/statistics/view") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class ViewStatisticsManagerController { - - private final PlatformViewDataService platformViewDataService; + @Autowired + private PlatformViewDataService platformViewDataService; @ApiOperation(value = "流量数据 表单获取") @GetMapping("/list") diff --git a/manager-api/src/main/java/cn/lili/controller/store/BillManagerController.java b/manager-api/src/main/java/cn/lili/controller/store/BillManagerController.java index 8b429536..26c8237a 100644 --- a/manager-api/src/main/java/cn/lili/controller/store/BillManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/store/BillManagerController.java @@ -29,10 +29,9 @@ import javax.validation.constraints.NotNull; @RestController @Api(tags = "管理端,商家结算单接口") @RequestMapping("/manager/store/bill") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class BillManagerController { - - private final BillService billService; + @Autowired + private BillService billService; @ApiOperation(value = "通过id获取结算单") @ApiImplicitParam(name = "id", value = "结算单ID", required = true, paramType = "path") diff --git a/manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java b/manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java index 886441a6..ce0b9f3c 100644 --- a/manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java @@ -19,7 +19,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -35,17 +34,18 @@ import java.util.List; @Api(tags = "管理端,店铺管理接口") @RestController @RequestMapping("/manager/store") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class StoreManagerController { /** * 店铺 */ - private final StoreService storeService; + @Autowired + private StoreService storeService; /** * 店铺详情 */ - private final StoreDetailService storeDetailService; + @Autowired + private StoreDetailService storeDetailService; @ApiOperation(value = "获取店铺分页列表") @GetMapping("/all") diff --git a/manager-api/src/main/java/cn/lili/controller/store/StoreMessageManagerController.java b/manager-api/src/main/java/cn/lili/controller/store/StoreMessageManagerController.java index 65a2da32..c4588473 100644 --- a/manager-api/src/main/java/cn/lili/controller/store/StoreMessageManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/store/StoreMessageManagerController.java @@ -9,7 +9,6 @@ import cn.lili.modules.message.service.StoreMessageService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; @@ -27,10 +26,9 @@ import org.springframework.web.bind.annotation.RestController; @RestController @Api(tags = "管理端,店铺消息消息管理接口") @RequestMapping("/manager/message/store") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class StoreMessageManagerController { - - private final StoreMessageService storeMessageService; + @Autowired + private StoreMessageService storeMessageService; @GetMapping diff --git a/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleManagerController.java index 4ba3bf05..9f33615e 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleManagerController.java @@ -27,13 +27,13 @@ import javax.validation.constraints.NotNull; @RestController @RequestMapping("/manager/afterSale") @Api(tags = "管理端,售后接口") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class AfterSaleManagerController { /** * 售后 */ - private final AfterSaleService afterSaleService; + @Autowired + private AfterSaleService afterSaleService; @ApiOperation(value = "分页获取售后服务") @GetMapping(value = "/page") diff --git a/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleReasonManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleReasonManagerController.java index 01b7f696..94cd2c3f 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleReasonManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleReasonManagerController.java @@ -27,13 +27,13 @@ import javax.validation.Valid; @RestController @RequestMapping("/manager/afterSaleReason") @Api(tags = "管理端,售后原因接口") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class AfterSaleReasonManagerController { /** * 售后原因 */ - private final AfterSaleReasonService afterSaleReasonService; + @Autowired + private AfterSaleReasonService afterSaleReasonService; @ApiOperation(value = "查看售后原因") @ApiImplicitParam(name = "id", value = "售后原因ID", required = true, dataType = "String", paramType = "path") diff --git a/manager-api/src/main/java/cn/lili/controller/trade/OrderComplaintManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/OrderComplaintManagerController.java index 6e4373c3..fde20a39 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/OrderComplaintManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/OrderComplaintManagerController.java @@ -33,18 +33,19 @@ import org.springframework.web.bind.annotation.*; @RestController @Api(tags = "管理端,交易投诉接口") @RequestMapping("/manager/complain") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class OrderComplaintManagerController { /** * 交易投诉 */ - private final OrderComplaintService orderComplaintService; + @Autowired + private OrderComplaintService orderComplaintService; /** * 交易投诉沟通 */ - private final OrderComplaintCommunicationService orderComplaintCommunicationService; + @Autowired + private OrderComplaintCommunicationService orderComplaintCommunicationService; @ApiOperation(value = "通过id获取") @ApiImplicitParam(name = "id", value = "投诉单ID", required = true, paramType = "path") diff --git a/manager-api/src/main/java/cn/lili/controller/trade/OrderLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/OrderLogManagerController.java index 7ea1c6f5..40e8e15f 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/OrderLogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/OrderLogManagerController.java @@ -28,10 +28,9 @@ import org.springframework.web.bind.annotation.RestController; @RestController @Api(tags = "管理端,订单日志管理接口") @RequestMapping("/manager/orderLog") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class OrderLogManagerController { - - private final OrderLogService orderLogService; + @Autowired + private OrderLogService orderLogService; @GetMapping(value = "/get/{id}") @ApiOperation(value = "通过id获取") diff --git a/manager-api/src/main/java/cn/lili/controller/trade/OrderManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/OrderManagerController.java index 98fd1488..e53ffedf 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/OrderManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/OrderManagerController.java @@ -32,13 +32,15 @@ import javax.validation.constraints.NotNull; @RestController @RequestMapping("/manager/orders") @Api(tags = "管理端,订单API") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) + public class OrderManagerController { //订单 - private final OrderService orderService; + @Autowired + private OrderService orderService; //订单价格 - private final OrderPriceService orderPriceService; + @Autowired + private OrderPriceService orderPriceService; @ApiOperation(value = "查询订单列表分页") diff --git a/manager-api/src/main/java/cn/lili/controller/trade/PaymentLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/PaymentLogManagerController.java index a4009bd5..cefcffb2 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/PaymentLogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/PaymentLogManagerController.java @@ -29,10 +29,10 @@ import org.springframework.web.bind.annotation.RestController; @Api(tags = "管理端,收款日志接口") @RequestMapping("/manager/paymentLog") @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class PaymentLogManagerController { - private final PaymentService paymentService; + @Autowired + private PaymentService paymentService; @GetMapping diff --git a/manager-api/src/main/java/cn/lili/controller/trade/ReceiptManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/ReceiptManagerController.java index 09168b8e..ea9ceb9e 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/ReceiptManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/ReceiptManagerController.java @@ -9,7 +9,6 @@ import cn.lili.modules.order.order.service.ReceiptService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -24,10 +23,10 @@ import org.springframework.web.bind.annotation.RestController; @RestController @Api(tags = "管理端,发票记录接口") @RequestMapping("/manager/receipt") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class ReceiptManagerController { - private final ReceiptService receiptService; + @Autowired + private ReceiptService receiptService; @ApiOperation(value = "获取发票分页信息") diff --git a/manager-api/src/main/java/cn/lili/controller/trade/RechargeManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/RechargeManagerController.java index 28300ed3..0287be30 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/RechargeManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/RechargeManagerController.java @@ -25,10 +25,9 @@ import org.springframework.web.bind.annotation.*; @Api(tags = "管理端,预存款充值记录接口") @RequestMapping("/manager/recharge") @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class RechargeManagerController { - - private final RechargeService rechargeService; + @Autowired + private RechargeService rechargeService; @ApiOperation(value = "分页获取预存款充值记录") @GetMapping diff --git a/manager-api/src/main/java/cn/lili/controller/trade/RefundLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/RefundLogManagerController.java index 57d8f464..2ea7fee6 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/RefundLogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/RefundLogManagerController.java @@ -28,10 +28,9 @@ import org.springframework.web.bind.annotation.RestController; @Api(tags = "管理端,退款日志接口") @RequestMapping("/manager/refundLog") @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class RefundLogManagerController { - - private final RefundLogService refundLogService; + @Autowired + private RefundLogService refundLogService; @GetMapping(value = "/{id}") @ApiOperation(value = "查看退款日志详情") diff --git a/manager-api/src/main/java/cn/lili/controller/trade/WalletLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/WalletLogManagerController.java index fb257d72..67bff876 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/WalletLogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/WalletLogManagerController.java @@ -26,10 +26,9 @@ import org.springframework.web.bind.annotation.RestController; @Api(tags = "管理端,预存款充值记录接口") @RequestMapping("/manager/wallet/log") @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class WalletLogManagerController { - - private final WalletLogService walletLogService; + @Autowired + private WalletLogService walletLogService; @ApiOperation(value = "分页获取预存款充值记录") @GetMapping diff --git a/manager-api/src/main/java/cn/lili/security/ManagerSecurityConfig.java b/manager-api/src/main/java/cn/lili/security/ManagerSecurityConfig.java index 2f0d6b56..aac90fec 100644 --- a/manager-api/src/main/java/cn/lili/security/ManagerSecurityConfig.java +++ b/manager-api/src/main/java/cn/lili/security/ManagerSecurityConfig.java @@ -3,7 +3,6 @@ package cn.lili.security; import cn.lili.common.cache.Cache; import cn.lili.common.security.CustomAccessDeniedHandler; import cn.lili.config.properties.IgnoredUrlsProperties; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; @@ -23,24 +22,25 @@ import org.springframework.web.cors.CorsConfigurationSource; @Slf4j @Configuration @EnableGlobalMethodSecurity(prePostEnabled = true) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class ManagerSecurityConfig extends WebSecurityConfigurerAdapter { /** * 忽略验权配置 */ - private final IgnoredUrlsProperties ignoredUrlsProperties; + @Autowired + private IgnoredUrlsProperties ignoredUrlsProperties; /** * spring security -》 权限不足处理 */ - private final CustomAccessDeniedHandler accessDeniedHandler; + @Autowired + private CustomAccessDeniedHandler accessDeniedHandler; - - private final Cache cache; - - private final CorsConfigurationSource corsConfigurationSource; + @Autowired + private Cache cache; + @Autowired + private CorsConfigurationSource corsConfigurationSource; @Override protected void configure(HttpSecurity http) throws Exception { diff --git a/seller-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsStoreController.java b/seller-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsStoreController.java index 1b663820..4fa6d230 100644 --- a/seller-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsStoreController.java @@ -29,18 +29,19 @@ import javax.validation.constraints.NotNull; @RestController @Api(tags = "店铺端,分销商品接口") @RequestMapping("/store/distributionGoods") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class DistributionGoodsStoreController { /** * 分销商品 */ - private final DistributionGoodsService distributionGoodsService; + @Autowired + private DistributionGoodsService distributionGoodsService; /** * 已选择分销商品 */ - private final DistributionSelectedGoodsService distributionSelectedGoodsService; + @Autowired + private DistributionSelectedGoodsService distributionSelectedGoodsService; @ApiOperation(value = "获取分销商商品列表") @GetMapping diff --git a/seller-api/src/main/java/cn/lili/controller/distribution/DistributionOrderStoreController.java b/seller-api/src/main/java/cn/lili/controller/distribution/DistributionOrderStoreController.java index 04c69440..a724d616 100644 --- a/seller-api/src/main/java/cn/lili/controller/distribution/DistributionOrderStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/distribution/DistributionOrderStoreController.java @@ -24,13 +24,13 @@ import org.springframework.web.bind.annotation.RestController; @RestController @Api(tags = "店铺端,分销订单接口") @RequestMapping("/store/distributionOrder") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class DistributionOrderStoreController { /** * 分销订单 */ - private final DistributionOrderService distributionOrderService; + @Autowired + private DistributionOrderService distributionOrderService; @ApiOperation(value = "获取分销订单列表") @GetMapping diff --git a/seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java index 9a2affbb..b71d58bb 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java @@ -29,11 +29,11 @@ import java.util.List; @Api(tags = "店铺端,分类绑定参数组管理接口") @RequestMapping("/store/goods/category/parameters") @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class CategoryParameterGroupStoreController { - - private final ParametersService parametersService; - private final CategoryParameterGroupService categoryParameterGroupService; + @Autowired + private ParametersService parametersService; + @Autowired + private CategoryParameterGroupService categoryParameterGroupService; @ApiOperation(value = "查询某分类下绑定的参数信息") @GetMapping(value = "/{category_id}") diff --git a/seller-api/src/main/java/cn/lili/controller/goods/CategorySpecificationStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/CategorySpecificationStoreController.java index 2b6122e9..b9fb8ac1 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/CategorySpecificationStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/CategorySpecificationStoreController.java @@ -30,12 +30,11 @@ import java.util.List; @Api(tags = "店铺端,商品分类规格接口") @RequestMapping("/store/goods/category/spec") @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class CategorySpecificationStoreController { - - private final CategorySpecificationService categorySpecificationService; - - private final SpecificationService specificationService; + @Autowired + private CategorySpecificationService categorySpecificationService; + @Autowired + private SpecificationService specificationService; @ApiOperation(value = "查询某分类下绑定的规格信息") diff --git a/seller-api/src/main/java/cn/lili/controller/goods/CategoryStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/CategoryStoreController.java index e8901915..ce969a6e 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/CategoryStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/CategoryStoreController.java @@ -12,7 +12,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheConfig; import org.springframework.transaction.annotation.Transactional; @@ -34,21 +33,23 @@ import java.util.List; @RequestMapping("/store/goods/category") @CacheConfig(cacheNames = "category") @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class CategoryStoreController { /** * 分类 */ - private final CategoryService categoryService; + @Autowired + private CategoryService categoryService; /** * 分类品牌 */ - private final CategoryBrandService categoryBrandService; + @Autowired + private CategoryBrandService categoryBrandService; /** * 店铺详情 */ - private final StoreDetailService storeDetailService; + @Autowired + private StoreDetailService storeDetailService; @ApiOperation(value = "获取店铺经营的分类") @GetMapping(value = "/all") diff --git a/seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java index 5f936c5e..f24207a7 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java @@ -27,10 +27,9 @@ import org.springframework.web.bind.annotation.*; @RestController @Api(tags = "店铺端,草稿商品接口") @RequestMapping("/store/draft/goods") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class DraftGoodsStoreController { - - private final DraftGoodsService draftGoodsService; + @Autowired + private DraftGoodsService draftGoodsService; @ApiOperation(value = "分页获取草稿商品列表") diff --git a/seller-api/src/main/java/cn/lili/controller/goods/GoodsGalleryController.java b/seller-api/src/main/java/cn/lili/controller/goods/GoodsGalleryController.java index cfb68471..dcdc768f 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/GoodsGalleryController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/GoodsGalleryController.java @@ -11,7 +11,6 @@ import cn.lili.modules.goods.service.GoodsGalleryService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -26,10 +25,9 @@ import java.util.List; @RestController @Api(tags = "店铺端,商品相册接口") @RequestMapping("/store/goodsGallery") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class GoodsGalleryController { - - private final GoodsGalleryService goodsGalleryService; + @Autowired + private GoodsGalleryService goodsGalleryService; @ApiOperation(value = "通过id获取") @GetMapping(value = "/get/{id}") diff --git a/seller-api/src/main/java/cn/lili/controller/goods/GoodsLabelStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/GoodsLabelStoreController.java index fe1a3407..044d85a7 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/GoodsLabelStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/GoodsLabelStoreController.java @@ -10,7 +10,6 @@ import cn.lili.modules.store.service.StoreGoodsLabelService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -26,13 +25,13 @@ import java.util.List; @Api(tags = "店铺端,店铺分类接口") @RestController @RequestMapping("/store/goods/label") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class GoodsLabelStoreController { /** * 店铺分类 */ - private final StoreGoodsLabelService storeGoodsLabelService; + @Autowired + private StoreGoodsLabelService storeGoodsLabelService; @ApiOperation(value = "获取当前店铺商品分类列表") @GetMapping diff --git a/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java index 7c037a1a..7f882f98 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java @@ -37,15 +37,17 @@ import java.util.List; @RestController @Api(tags = "店铺端,商品接口") @RequestMapping("/store/goods") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class GoodsStoreController { //商品 - private final GoodsService goodsService; + @Autowired + private GoodsService goodsService; //商品sku - private final GoodsSkuService goodsSkuService; + @Autowired + private GoodsSkuService goodsSkuService; //店铺详情 - private final StoreDetailService storeDetailService; + @Autowired + private StoreDetailService storeDetailService; @ApiOperation(value = "分页获取商品列表") @GetMapping(value = "/list") diff --git a/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java index 5e5d032f..a208d753 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java @@ -27,10 +27,9 @@ import org.springframework.web.bind.annotation.RestController; @Api(tags = "店铺端,商品计量单位接口") @RequestMapping("/store/goods/unit") @Transactional(rollbackFor = Exception.class) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class GoodsUnitStoreController { - - private final GoodsUnitService goodsUnitService; + @Autowired + private GoodsUnitService goodsUnitService; @ApiOperation(value = "分页获取商品计量单位") diff --git a/seller-api/src/main/java/cn/lili/controller/goods/SpecValuesStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/SpecValuesStoreController.java index 2afcd64c..85b1f977 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/SpecValuesStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/SpecValuesStoreController.java @@ -11,7 +11,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -27,10 +26,9 @@ import java.util.List; @RestController @Api(tags = "店铺端,规格项管理接口") @RequestMapping("/store/goods/spec-values") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class SpecValuesStoreController { - - private final SpecValuesService specValuesService; + @Autowired + private SpecValuesService specValuesService; @GetMapping(value = "/values/{id}") @ApiImplicitParam(name = "id", value = "规格项ID", required = true, dataType = "String", paramType = "path") diff --git a/seller-api/src/main/java/cn/lili/controller/goods/SpecificationStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/SpecificationStoreController.java index 2c53173f..e4c4c561 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/SpecificationStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/SpecificationStoreController.java @@ -31,10 +31,9 @@ import java.util.List; @RestController @Api(tags = "店铺端,规格管理接口") @RequestMapping("/store/goods/spec") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class SpecificationStoreController { - - private final SpecificationService specificationService; + @Autowired + private SpecificationService specificationService; @GetMapping(value = "/page") diff --git a/seller-api/src/main/java/cn/lili/controller/member/StoreUserController.java b/seller-api/src/main/java/cn/lili/controller/member/StoreUserController.java index 5ce3b034..d9a4bb7f 100644 --- a/seller-api/src/main/java/cn/lili/controller/member/StoreUserController.java +++ b/seller-api/src/main/java/cn/lili/controller/member/StoreUserController.java @@ -9,7 +9,6 @@ import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.service.MemberService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -25,10 +24,9 @@ import org.springframework.web.bind.annotation.RestController; @RestController @Api(tags = "店铺端,管理员接口") @RequestMapping("/store/user") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class StoreUserController { - - private final MemberService memberService; + @Autowired + private MemberService memberService; @GetMapping(value = "/info") diff --git a/seller-api/src/main/java/cn/lili/controller/other/ArticleStoreController.java b/seller-api/src/main/java/cn/lili/controller/other/ArticleStoreController.java index 0af0cc9f..3acd0f0c 100644 --- a/seller-api/src/main/java/cn/lili/controller/other/ArticleStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/other/ArticleStoreController.java @@ -11,7 +11,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -27,13 +26,13 @@ import org.springframework.web.bind.annotation.RestController; @RestController @Api(tags = "店铺端,文章接口") @RequestMapping("/store/article") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class ArticleStoreController { /** * 文章 */ - private final ArticleService articleService; + @Autowired + private ArticleService articleService; @ApiOperation(value = "分页获取") @ApiImplicitParams({ diff --git a/seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java b/seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java index e0825958..05b9c096 100644 --- a/seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java +++ b/seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java @@ -9,7 +9,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,13 +24,13 @@ import javax.validation.constraints.NotNull; @RestController @Api(tags = "店铺端,商家登录接口 ") @RequestMapping("/store/login") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class StorePassportController { /** * 会员 */ - private final MemberService memberService; + @Autowired + private MemberService memberService; @ApiOperation(value = "登录接口") diff --git a/seller-api/src/main/java/cn/lili/controller/promotion/CouponStoreController.java b/seller-api/src/main/java/cn/lili/controller/promotion/CouponStoreController.java index 8a7a64d8..c16ea52f 100644 --- a/seller-api/src/main/java/cn/lili/controller/promotion/CouponStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/promotion/CouponStoreController.java @@ -15,7 +15,6 @@ import cn.lili.modules.promotion.service.CouponService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -31,10 +30,10 @@ import java.util.List; @RestController @Api(tags = "店铺端,优惠券接口") @RequestMapping("/store/promotion/coupon") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class CouponStoreController { - private final CouponService couponService; + @Autowired + private CouponService couponService; @GetMapping @ApiOperation(value = "获取优惠券列表") diff --git a/seller-api/src/main/java/cn/lili/controller/promotion/FullDiscountStoreController.java b/seller-api/src/main/java/cn/lili/controller/promotion/FullDiscountStoreController.java index 9101f601..e3af4044 100644 --- a/seller-api/src/main/java/cn/lili/controller/promotion/FullDiscountStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/promotion/FullDiscountStoreController.java @@ -27,10 +27,10 @@ import org.springframework.web.bind.annotation.*; @RestController @Api(tags = "店铺端,满额活动接口") @RequestMapping("/store/promotion/fullDiscount") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class FullDiscountStoreController { - private final FullDiscountService fullDiscountService; + @Autowired + private FullDiscountService fullDiscountService; @ApiOperation(value = "新增满优惠活动") @PostMapping(consumes = "application/json", produces = "application/json") diff --git a/seller-api/src/main/java/cn/lili/controller/promotion/PintuanStoreController.java b/seller-api/src/main/java/cn/lili/controller/promotion/PintuanStoreController.java index 466667a4..78815efe 100644 --- a/seller-api/src/main/java/cn/lili/controller/promotion/PintuanStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/promotion/PintuanStoreController.java @@ -16,7 +16,6 @@ import cn.lili.modules.promotion.service.PromotionGoodsService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -31,11 +30,12 @@ import java.util.Date; @RestController @Api(tags = "店铺端,拼团管理接口") @RequestMapping("/store/promotion/pintuan") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class PintuanStoreController { - private final PintuanService pintuanService; - private final PromotionGoodsService promotionGoodsService; + @Autowired + private PintuanService pintuanService; + @Autowired + private PromotionGoodsService promotionGoodsService; @GetMapping diff --git a/seller-api/src/main/java/cn/lili/controller/promotion/SeckillStoreController.java b/seller-api/src/main/java/cn/lili/controller/promotion/SeckillStoreController.java index 458a2729..7ce0a9c5 100644 --- a/seller-api/src/main/java/cn/lili/controller/promotion/SeckillStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/promotion/SeckillStoreController.java @@ -31,11 +31,11 @@ import java.util.List; @RestController @Api(tags = "店铺端,限时抢购接口") @RequestMapping("/store/promotion/seckill") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class SeckillStoreController { - - private final SeckillService seckillService; - private final SeckillApplyService seckillApplyService; + @Autowired + private SeckillService seckillService; + @Autowired + private SeckillApplyService seckillApplyService; @GetMapping @ApiOperation(value = "获取限时抢购列表") diff --git a/seller-api/src/main/java/cn/lili/controller/settings/FreightTemplateStoreController.java b/seller-api/src/main/java/cn/lili/controller/settings/FreightTemplateStoreController.java index 1c349f7a..ddf3a00e 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/FreightTemplateStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/settings/FreightTemplateStoreController.java @@ -25,10 +25,9 @@ import java.util.List; @RestController @Api(tags = "店铺端,运费模板接口") @RequestMapping("/store/freightTemplate") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class FreightTemplateStoreController { - - private final FreightTemplateService freightTemplateService; + @Autowired + private FreightTemplateService freightTemplateService; @ApiOperation(value = "商家运费模板列表") @GetMapping diff --git a/seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java b/seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java index e76db9aa..1f024b9f 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java @@ -27,10 +27,9 @@ import org.springframework.web.bind.annotation.RestController; @RestController @Api(tags = "店铺端,日志管理接口") @RequestMapping("/store/log") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class LogStoreController { - - private final SystemLogService systemLogService; + @Autowired + private SystemLogService systemLogService; @GetMapping(value = "/getAllByPage") @ApiOperation(value = "分页获取全部") diff --git a/seller-api/src/main/java/cn/lili/controller/settings/LogisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/settings/LogisticsStoreController.java index e8123017..799cea3c 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/LogisticsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/settings/LogisticsStoreController.java @@ -26,13 +26,13 @@ import java.util.List; @RestController @Api(tags = "店铺端,物流公司接口") @RequestMapping("/store/logistics") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class LogisticsStoreController { /** * 物流公司 */ - private final StoreLogisticsService storeLogisticsService; + @Autowired + private StoreLogisticsService storeLogisticsService; @ApiOperation(value = "获取商家物流公司列表，如果已选择则checked有值") @GetMapping diff --git a/seller-api/src/main/java/cn/lili/controller/settings/StoreAddressController.java b/seller-api/src/main/java/cn/lili/controller/settings/StoreAddressController.java index 25936734..f53e58d6 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/StoreAddressController.java +++ b/seller-api/src/main/java/cn/lili/controller/settings/StoreAddressController.java @@ -28,13 +28,13 @@ import javax.validation.Valid; @RestController @Api(tags = "店铺端,商家地址（自提点）接口") @RequestMapping("/store/storeAddress") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class StoreAddressController { /** * 店铺自提点 */ - private final StoreAddressService storeAddressService; + @Autowired + private StoreAddressService storeAddressService; @ApiOperation(value = "获取商家自提点分页") @GetMapping diff --git a/seller-api/src/main/java/cn/lili/controller/settings/StoreMessageController.java b/seller-api/src/main/java/cn/lili/controller/settings/StoreMessageController.java index 4affe5d0..b3e6b060 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/StoreMessageController.java +++ b/seller-api/src/main/java/cn/lili/controller/settings/StoreMessageController.java @@ -29,13 +29,13 @@ import java.util.Map; @RestController @Api(tags = "店铺端,消息接口") @RequestMapping("/store/message") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class StoreMessageController { /** * 商家消息 */ - private final StoreMessageService storeMessageService; + @Autowired + private StoreMessageService storeMessageService; @ApiOperation(value = "获取商家消息") @ApiImplicitParam(name = "status", value = "状态", required = true, paramType = "query") diff --git a/seller-api/src/main/java/cn/lili/controller/settings/StorePageDataController.java b/seller-api/src/main/java/cn/lili/controller/settings/StorePageDataController.java index 2d2c3ffc..341f784e 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/StorePageDataController.java +++ b/seller-api/src/main/java/cn/lili/controller/settings/StorePageDataController.java @@ -29,10 +29,9 @@ import javax.validation.Valid; @RestController @Api(tags = "店铺端,页面接口") @RequestMapping("/store/pageData") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class StorePageDataController { - - private final PageDataService pageDataService; + @Autowired + private PageDataService pageDataService; @ApiOperation(value = "页面列表") @ApiImplicitParam(name = "pageClientType", value = "客户端类型", required = true, dataType = "String", paramType = "path") diff --git a/seller-api/src/main/java/cn/lili/controller/settings/StoreSettingsController.java b/seller-api/src/main/java/cn/lili/controller/settings/StoreSettingsController.java index cef6fa54..6be762ad 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/StoreSettingsController.java +++ b/seller-api/src/main/java/cn/lili/controller/settings/StoreSettingsController.java @@ -13,7 +13,6 @@ import cn.lili.modules.store.service.StoreService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PutMapping; @@ -31,17 +30,18 @@ import javax.validation.Valid; @RestController @Api(tags = "店铺端,店铺设置接口") @RequestMapping("/store/settings") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class StoreSettingsController { /** * 店铺 */ - private final StoreService storeService; + @Autowired + private StoreService storeService; /** * 店铺详情 */ - private final StoreDetailService storeDetailService; + @Autowired + private StoreDetailService storeDetailService; @ApiOperation(value = "获取商家设置") @GetMapping diff --git a/seller-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsStoreController.java index 4a171d92..ad8803a6 100644 --- a/seller-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsStoreController.java @@ -25,13 +25,13 @@ import java.util.List; @Api(tags = "店铺端,商品统计接口") @RestController @RequestMapping("/store/statistics/goods") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class GoodsStatisticsStoreController { /** * 商品统计 */ - private final GoodsStatisticsDataService goodsStatisticsDataService; + @Autowired + private GoodsStatisticsDataService goodsStatisticsDataService; @ApiOperation(value = "获取统计列表,排行前一百的数据") @GetMapping diff --git a/seller-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsStoreController.java index 37579ef0..f823cc49 100644 --- a/seller-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsStoreController.java @@ -27,17 +27,18 @@ import java.util.List; @Api(tags = "店铺端,首页统计接口") @RestController @RequestMapping("/store/statistics/index") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class IndexStatisticsStoreController { /** * 热卖商品统计 */ - private final GoodsStatisticsDataService goodsStatisticsDataService; + @Autowired + private GoodsStatisticsDataService goodsStatisticsDataService; /** * 首页统计 */ - private final IndexStatisticsService indexStatisticsService; + @Autowired + private IndexStatisticsService indexStatisticsService; @ApiOperation(value = "获取统计列表,排行前一百的数据") @GetMapping("/top100") diff --git a/seller-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsStoreController.java index 936614e1..eb512db9 100644 --- a/seller-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsStoreController.java @@ -32,21 +32,23 @@ import java.util.List; @Api(tags = "店铺端,订单统计接口") @RestController @RequestMapping("/store/statistics/order") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class OrderStatisticsStoreController { /** * 订单 */ - private final OrderService orderService; + @Autowired + private OrderService orderService; /** * 售后 */ - private final AfterSaleService afterSaleService; + @Autowired + private AfterSaleService afterSaleService; /** * 订单统计 */ - private final OrderStatisticsDataService orderStatisticsDataService; + @Autowired + private OrderStatisticsDataService orderStatisticsDataService; @ApiOperation(value = "订单概览统计") @GetMapping("/overview") diff --git a/seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java index 189148dd..9b412728 100644 --- a/seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java @@ -10,7 +10,6 @@ import cn.lili.modules.statistics.service.RefundOrderStatisticsService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -25,10 +24,10 @@ import org.springframework.web.bind.annotation.RestController; @Api(tags = "店铺端,退款统计接口") @RestController @RequestMapping("/store/statistics/refund/order") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class RefundOrderStatisticsStoreController { - private final RefundOrderStatisticsService refundOrderStatisticsService; + @Autowired + private RefundOrderStatisticsService refundOrderStatisticsService; @ApiOperation(value = "获取退款统计列表") @GetMapping("/getByPage") diff --git a/seller-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsStoreController.java index ca1c8f86..41bc723b 100644 --- a/seller-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsStoreController.java @@ -8,7 +8,6 @@ import cn.lili.modules.statistics.model.vo.PlatformViewVO; import cn.lili.modules.statistics.service.PlatformViewDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -25,10 +24,9 @@ import java.util.List; @Api(tags = "店铺端,流量统计接口") @RestController @RequestMapping("/store/statistics/view") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class ViewStatisticsStoreController { - - private final PlatformViewDataService platformViewDataService; + @Autowired + private PlatformViewDataService platformViewDataService; @ApiOperation(value = "流量数据 表单获取") @GetMapping("/list") diff --git a/seller-api/src/main/java/cn/lili/controller/trade/AfterSaleStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/AfterSaleStoreController.java index d7c5f70f..0a62fdc5 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/AfterSaleStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/AfterSaleStoreController.java @@ -27,10 +27,10 @@ import javax.validation.constraints.NotNull; @RestController @Api(tags = "店铺端,售后管理接口") @RequestMapping("/store/afterSale") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class AfterSaleStoreController { - private final AfterSaleService afterSaleService; + @Autowired + private AfterSaleService afterSaleService; @ApiOperation(value = "查看售后服务详情") @ApiImplicitParam(name = "sn", value = "售后单号", required = true, paramType = "path") diff --git a/seller-api/src/main/java/cn/lili/controller/trade/BillStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/BillStoreController.java index 846f8afa..6f7db4a2 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/BillStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/BillStoreController.java @@ -27,10 +27,10 @@ import org.springframework.web.bind.annotation.*; @RestController @Api(tags = "店铺端,结算单接口") @RequestMapping("/store/bill") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class BillStoreController { - private final BillService billService; + @Autowired + private BillService billService; @ApiOperation(value = "获取结算单分页") @GetMapping(value = "/getByPage") diff --git a/seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java index 8e017259..4cd9074a 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java @@ -25,10 +25,10 @@ import org.springframework.web.bind.annotation.*; @RestController @Api(tags = "店铺端,商品评价管理接口") @RequestMapping("/store/memberEvaluation") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MemberEvaluationStoreController { - private final MemberEvaluationService memberEvaluationService; + @Autowired + private MemberEvaluationService memberEvaluationService; @ApiOperation(value = "分页获取会员评论列表") @GetMapping diff --git a/seller-api/src/main/java/cn/lili/controller/trade/OrderComplaintStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/OrderComplaintStoreController.java index 9f484bb7..a43b0839 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/OrderComplaintStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/OrderComplaintStoreController.java @@ -29,18 +29,19 @@ import org.springframework.web.bind.annotation.*; @RestController @Api(tags = "店铺端,交易投诉接口") @RequestMapping("/store/complain") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class OrderComplaintStoreController { /** * 交易投诉 */ - private final OrderComplaintService orderComplaintService; + @Autowired + private OrderComplaintService orderComplaintService; /** * 投诉沟通 */ - private final OrderComplaintCommunicationService orderComplaintCommunicationService; + @Autowired + private OrderComplaintCommunicationService orderComplaintCommunicationService; @ApiOperation(value = "通过id获取") @ApiImplicitParam(name = "id", value = "投诉单ID", required = true, paramType = "path") diff --git a/seller-api/src/main/java/cn/lili/controller/trade/OrderLogStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/OrderLogStoreController.java index 4b4c9852..7822bff1 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/OrderLogStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/OrderLogStoreController.java @@ -25,10 +25,10 @@ import java.util.List; @RestController @Api(tags = "店铺端,订单日志接口") @RequestMapping("/store/orderLog") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class OrderLogStoreController { - private final OrderLogService orderLogService; + @Autowired + private OrderLogService orderLogService; @ApiOperation(value = "通过订单编号获取订单日志") @ApiImplicitParam(name = "orderSn", value = "订单编号", required = true, paramType = "path") diff --git a/seller-api/src/main/java/cn/lili/controller/trade/OrderStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/OrderStoreController.java index 83f03d06..de4127a9 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/OrderStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/OrderStoreController.java @@ -30,18 +30,19 @@ import javax.validation.constraints.NotNull; @RestController @RequestMapping("/store/orders") @Api(tags = "店铺端,订单接口") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class OrderStoreController { /** * 订单 */ - private final OrderService orderService; + @Autowired + private OrderService orderService; /** * 订单价格 */ - private final OrderPriceService orderPriceService; + @Autowired + private OrderPriceService orderPriceService; @ApiOperation(value = "查询订单列表") @GetMapping diff --git a/seller-api/src/main/java/cn/lili/controller/trade/ReceiptStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/ReceiptStoreController.java index 2c24ba61..2ca3ae5d 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/ReceiptStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/ReceiptStoreController.java @@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,10 +24,10 @@ import org.springframework.web.bind.annotation.*; @RestController @Api(tags = "店铺端,发票接口") @RequestMapping("/store/receipt") -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class ReceiptStoreController { - private final ReceiptService receiptService; + @Autowired + private ReceiptService receiptService; @ApiOperation(value = "分页获取") @GetMapping diff --git a/seller-api/src/main/java/cn/lili/security/StoreSecurityConfig.java b/seller-api/src/main/java/cn/lili/security/StoreSecurityConfig.java index 33b57956..91cb7f7e 100644 --- a/seller-api/src/main/java/cn/lili/security/StoreSecurityConfig.java +++ b/seller-api/src/main/java/cn/lili/security/StoreSecurityConfig.java @@ -4,7 +4,6 @@ import cn.lili.common.cache.Cache; import cn.lili.common.security.CustomAccessDeniedHandler; import cn.lili.common.utils.SpringContextUtil; import cn.lili.config.properties.IgnoredUrlsProperties; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; @@ -24,22 +23,22 @@ import org.springframework.web.cors.CorsConfigurationSource; @Slf4j @Configuration @EnableGlobalMethodSecurity(prePostEnabled = true) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class StoreSecurityConfig extends WebSecurityConfigurerAdapter { - /** * 忽略验权配置 */ - private final IgnoredUrlsProperties ignoredUrlsProperties; + @Autowired + private IgnoredUrlsProperties ignoredUrlsProperties; /** * spring security -》 权限不足处理 */ - private final CustomAccessDeniedHandler accessDeniedHandler; + @Autowired + private CustomAccessDeniedHandler accessDeniedHandler; - - private final Cache cache; + @Autowired + private Cache cache; @Override diff --git a/socket-api/src/main/java/cn/lili/scocket/listener/MessageSendListener.java b/socket-api/src/main/java/cn/lili/scocket/listener/MessageSendListener.java index a972848c..a0b9e4e7 100644 --- a/socket-api/src/main/java/cn/lili/scocket/listener/MessageSendListener.java +++ b/socket-api/src/main/java/cn/lili/scocket/listener/MessageSendListener.java @@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.CrossOrigin; @Component @CrossOrigin @Slf4j -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) + @RocketMQMessageListener(topic = "${lili.data.rocketmq.other-topic}", consumerGroup = "${lili.data.rocketmq.other-group}") public class MessageSendListener implements RocketMQListener { diff --git a/socket-api/src/main/java/cn/lili/scocket/listener/ScoketSecurityConfig.java b/socket-api/src/main/java/cn/lili/scocket/listener/ScoketSecurityConfig.java index d317190a..85eb8558 100644 --- a/socket-api/src/main/java/cn/lili/scocket/listener/ScoketSecurityConfig.java +++ b/socket-api/src/main/java/cn/lili/scocket/listener/ScoketSecurityConfig.java @@ -20,7 +20,7 @@ import org.springframework.security.config.annotation.web.configurers.Expression @Slf4j @Configuration @EnableGlobalMethodSecurity(prePostEnabled = true) -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) + public class ScoketSecurityConfig extends WebSecurityConfigurerAdapter {