From c049552fc7b85b976cadf949ddc73995016a426d Mon Sep 17 00:00:00 2001 From: lifenlong Date: Mon, 17 May 2021 12:55:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=86=97=E4=BD=99=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/ConnectConfigServiceImpl.java | 4 --- .../DistributionGoodsServiceImpl.java | 11 +++----- .../serviceimpl/DistributionServiceImpl.java | 6 +---- .../serviceimpl/CategoryBrandServiceImpl.java | 8 ++---- .../serviceimpl/CategoryServiceImpl.java | 7 ++---- .../CategorySpecificationServiceImpl.java | 6 ++--- .../serviceimpl/GoodsGalleryServiceImpl.java | 11 +++----- .../goods/serviceimpl/GoodsServiceImpl.java | 5 +--- .../serviceimpl/FootprintServiceImpl.java | 8 ++---- .../GoodsCollectionServiceImpl.java | 6 +---- .../MemberEvaluationServiceImpl.java | 9 +++---- .../MemberPointsHistoryServiceImpl.java | 10 +++----- .../member/serviceimpl/MemberServiceImpl.java | 13 ++++------ .../serviceimpl/MemberSignServiceImpl.java | 11 +++----- .../serviceimpl/MemberWalletServiceImpl.java | 25 ++++++++----------- .../MemberWithdrawApplyServiceImpl.java | 12 ++++----- .../StoreCollectionServiceImpl.java | 6 +---- .../serviceimpl/StoreMessageServiceImpl.java | 11 +++----- .../WechatMPMessageServiceImpl.java | 4 +-- .../serviceimpl/WechatMessageServiceImpl.java | 6 ++--- .../serviceimpl/OrderItemServiceImpl.java | 7 +----- .../order/serviceimpl/OrderServiceImpl.java | 5 +--- .../order/serviceimpl/ReceiptServiceImpl.java | 11 +------- .../serviceimpl/RechargeServiceImpl.java | 14 ++++------- .../serviceimpl/WalletLogServiceImpl.java | 6 +---- .../page/serviceimpl/ArticleServiceImpl.java | 4 --- .../page/serviceimpl/PageDataServiceImpl.java | 12 +++------ .../page/serviceimpl/SpecialServiceImpl.java | 3 --- .../DepartmentRoleServiceImpl.java | 11 +++----- .../serviceimpl/MenuServiceImpl.java | 13 +++------- .../serviceimpl/RoleMenuServiceImpl.java | 10 +++----- .../serviceimpl/UserRoleServiceImpl.java | 6 ++--- .../serviceimpl/FullDiscountServiceImpl.java | 6 +---- .../PurchaseQuotedServiceImpl.java | 2 -- .../serviceimpl/CustomWordsServiceImpl.java | 1 - .../GoodsStatisticsDataServiceImpl.java | 10 ++------ .../MemberStatisticsDataServiceImpl.java | 17 ++++--------- .../OrderStatisticsDataServiceImpl.java | 6 +---- .../PlatformViewDataServiceImpl.java | 6 +---- .../RefundOrderStatisticsServiceImpl.java | 8 +----- .../store/serviceimpl/BillServiceImpl.java | 9 +++---- .../FreightTemplateServiceChildImpl.java | 8 +----- .../FreightTemplateServiceImpl.java | 19 +++++--------- .../serviceimpl/StoreAddressServiceImpl.java | 18 ++++--------- .../serviceimpl/StoreDetailServiceImpl.java | 14 ++++------- .../StoreGoodsLabelServiceImpl.java | 13 +++------- .../store/serviceimpl/StoreServiceImpl.java | 12 +++------ .../StoreLogisticsServiceImpl.java | 8 ++---- 48 files changed, 125 insertions(+), 313 deletions(-) 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 15a4e2323..8fbd22d36 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 @@ -7,8 +7,6 @@ import cn.lili.modules.connect.mapper.ConnectConfigMapper; import cn.lili.modules.connect.service.ConnectConfigService; 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; @@ -23,8 +21,6 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) public class ConnectConfigServiceImpl extends ServiceImpl implements ConnectConfigService { - @Autowired - private ConnectConfigMapper connectConfigMapper; @Override public List listForms() { 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 b3cacfc78..8ca801d8f 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 @@ -34,9 +34,6 @@ import org.springframework.transaction.annotation.Transactional; @Transactional public class DistributionGoodsServiceImpl extends ServiceImpl implements DistributionGoodsService { - //分销商品 - @Autowired - private DistributionGoodsMapper distributionGoodsMapper; //分销员 @Autowired private DistributionService distributionService; @@ -48,22 +45,22 @@ public class DistributionGoodsServiceImpl extends ServiceImpl goodsPage(DistributionGoodsSearchParams searchParams) { //获取商家的分销商品列表 if (UserContext.getCurrentUser().getRole().equals(UserEnums.STORE)) { - return distributionGoodsMapper.getDistributionGoodsVO(PageUtil.initPage(searchParams), searchParams.storeQueryWrapper()); + return this.baseMapper.getDistributionGoodsVO(PageUtil.initPage(searchParams), searchParams.storeQueryWrapper()); } else if (UserContext.getCurrentUser().getRole().equals(UserEnums.MEMBER)) { //判断当前登录用户是否为分销员 Distribution distribution = distributionService.getDistribution(); if (distribution != null) { //判断查看已选择的分销商品列表 if (searchParams.isChecked()) { - return distributionGoodsMapper.selectGoods(PageUtil.initPage(searchParams), searchParams.distributionQueryWrapper(), distribution.getId()); + return this.baseMapper.selectGoods(PageUtil.initPage(searchParams), searchParams.distributionQueryWrapper(), distribution.getId()); } else { - return distributionGoodsMapper.notSelectGoods(PageUtil.initPage(searchParams), searchParams.distributionQueryWrapper(), distribution.getId()); + return this.baseMapper.notSelectGoods(PageUtil.initPage(searchParams), searchParams.distributionQueryWrapper(), distribution.getId()); } } throw new ServiceException(ResultCode.DISTRIBUTION_NOT_EXIST); } //如果是平台则直接进行查询 - return distributionGoodsMapper.getDistributionGoodsVO(PageUtil.initPage(searchParams), searchParams.distributionQueryWrapper()); + return this.baseMapper.getDistributionGoodsVO(PageUtil.initPage(searchParams), searchParams.distributionQueryWrapper()); } @Override 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 170d1f62f..dc476792d 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 @@ -43,10 +43,6 @@ public class DistributionServiceImpl extends ServiceImpl implements CategoryBrandService { - //分类品牌绑定 - @Autowired - private CategoryBrandMapper categoryBrandMapper; - @Override public List getCategoryBrandList(String categoryId) { - return categoryBrandMapper.getCategoryBrandList(categoryId); + return this.baseMapper.getCategoryBrandList(categoryId); } @Override public void deleteByCategoryId(String categoryId) { - categoryBrandMapper.delete(new LambdaUpdateWrapper().eq(CategoryBrand::getCategoryId, categoryId)); + this.baseMapper.delete(new LambdaUpdateWrapper().eq(CategoryBrand::getCategoryId, categoryId)); } @Override 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 b42070816..1d26a5d22 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 @@ -40,9 +40,6 @@ public class CategoryServiceImpl extends ServiceImpl i //缓存 @Autowired private Cache cache; - //分类 - @Autowired - private CategoryMapper categoryMapper; @Override public List dbList(String parentId) { @@ -159,7 +156,7 @@ public class CategoryServiceImpl extends ServiceImpl i .ne(category.getId() != null, "id", category.getId()) .eq(DELETE_FLAG_COLUMN, false) .orderByAsc("sort_order"); - return this.categoryMapper.selectList(queryWrapper); + return this.baseMapper.selectList(queryWrapper); } @Override @@ -187,7 +184,7 @@ public class CategoryServiceImpl extends ServiceImpl i .set("sort_order", category.getSortOrder()) .set(DELETE_FLAG_COLUMN, category.getDeleteFlag()) .set("commission_rate", category.getCommissionRate()); - categoryMapper.update(category, updateWrapper); + this.baseMapper.update(category, updateWrapper); removeCache(); } 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 9b3082100..60405e675 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 @@ -23,12 +23,10 @@ import java.util.List; @Service @Transactional public class CategorySpecificationServiceImpl extends ServiceImpl implements CategorySpecificationService { - @Autowired - private CategorySpecificationMapper categorySpecificationMapper; @Override public List getCategorySpecList(String categoryId) { - return categorySpecificationMapper.getCategorySpecList(categoryId); + return this.baseMapper.getCategorySpecList(categoryId); } @Override @@ -38,6 +36,6 @@ public class CategorySpecificationServiceImpl extends ServiceImpl().eq(CategorySpecification::getCategoryId,categoryId)); + this.baseMapper.delete(new LambdaQueryWrapper().eq(CategorySpecification::getCategoryId,categoryId)); } } \ No newline at end of file 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 d211d078a..6cd185330 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 @@ -12,7 +12,6 @@ import cn.lili.modules.system.service.SettingService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; 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,9 +32,7 @@ public class GoodsGalleryServiceImpl extends ServiceImpl goodsGalleryList, String goodsId) { //删除原来商品相册信息 - this.goodsGalleryMapper.delete(new UpdateWrapper().eq("goods_id", goodsId)); + this.baseMapper.delete(new UpdateWrapper().eq("goods_id", goodsId)); //确定好图片选择器后进行处理 int i = 0; for (String origin : goodsGalleryList) { @@ -54,7 +51,7 @@ public class GoodsGalleryServiceImpl extends ServiceImpl goodsGalleryList(String goodsId) { //根据商品id查询商品相册 - return goodsGalleryMapper.selectList(new QueryWrapper().eq("goods_id", goodsId)); + return this.baseMapper.selectList(new QueryWrapper().eq("goods_id", goodsId)); } } \ No newline at end of file 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 eaa703491..f717e3d3c 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 @@ -55,9 +55,6 @@ import java.util.List; @Transactional public class GoodsServiceImpl extends ServiceImpl implements GoodsService { - //商品 - @Autowired - private GoodsMapper goodsMapper; //商品属性 @Autowired private GoodsParamsService goodsParamsService; @@ -85,7 +82,7 @@ public class GoodsServiceImpl extends ServiceImpl implements @Override public void underStoreGoods(String storeId) { - this.goodsMapper.underStoreGoods(storeId); + this.baseMapper.underStoreGoods(storeId); } @Override diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java index 89d283983..c66cf5abc 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java @@ -11,7 +11,6 @@ import cn.lili.modules.search.service.EsGoodsSearchService; 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; @@ -30,9 +29,6 @@ import java.util.Objects; @Transactional public class FootprintServiceImpl extends ServiceImpl implements FootprintService { - //足迹数据层 - @Autowired - private FootprintMapper footprintMapper; //es商品业务层 @Autowired private EsGoodsSearchService esGoodsSearchService; @@ -54,7 +50,7 @@ public class FootprintServiceImpl extends ServiceImpl skuIdList = footprintMapper.footprintSkuIdList(PageUtil.initPage(pageVO), lambdaQueryWrapper); + List skuIdList = this.baseMapper.footprintSkuIdList(PageUtil.initPage(pageVO), lambdaQueryWrapper); if (skuIdList.size() > 0) { List list = esGoodsSearchService.getEsGoodsBySkuIds(skuIdList); //去除为空的商品数据 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 11d267258..b4bd13d08 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 @@ -17,7 +17,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.stereotype.Service; @@ -37,9 +36,6 @@ import java.util.Optional; public class GoodsCollectionServiceImpl extends ServiceImpl implements GoodsCollectionService { - //商品收藏 - @Autowired - private GoodsCollectionMapper goodsCollectionMapper; //rocketMq @Autowired private RocketMQTemplate rocketMQTemplate; @@ -53,7 +49,7 @@ public class GoodsCollectionServiceImpl extends ServiceImpl implements MemberEvaluationService { - //会员评价数据层 - @Autowired - private MemberEvaluationMapper memberEvaluationMapper; //订单 @Autowired private OrderService orderService; @@ -91,12 +88,12 @@ public class MemberEvaluationServiceImpl extends ServiceImpl queryByParams(StoreEvaluationQueryParams storeEvaluationQueryParams) { - return memberEvaluationMapper.getMemberEvaluationList(PageUtil.initPage(storeEvaluationQueryParams), storeEvaluationQueryParams.queryWrapper()); + return this.baseMapper.getMemberEvaluationList(PageUtil.initPage(storeEvaluationQueryParams), storeEvaluationQueryParams.queryWrapper()); } @Override public IPage queryPage(EvaluationQueryParams evaluationQueryParams, PageVO page) { - return memberEvaluationMapper.getMemberEvaluationList(PageUtil.initPage(page), evaluationQueryParams.queryWrapper()); + return this.baseMapper.getMemberEvaluationList(PageUtil.initPage(page), evaluationQueryParams.queryWrapper()); } @Override @@ -163,7 +160,7 @@ public class MemberEvaluationServiceImpl extends ServiceImpl> list = memberEvaluationMapper.getEvaluationNumber(goodsId); + List> list = this.baseMapper.getEvaluationNumber(goodsId); Integer good = 0; Integer moderate = 0; 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 8a493180e..ef10a09b3 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 @@ -22,8 +22,6 @@ import org.springframework.transaction.annotation.Transactional; @Transactional public class MemberPointsHistoryServiceImpl extends ServiceImpl implements MemberPointsHistoryService { - @Autowired - private MemberPointsHistoryMapper memberPointsHistoryMapper; @Override public MemberPointsHistoryVO getMemberPointsHistoryVO(String memberId) { @@ -32,12 +30,12 @@ public class MemberPointsHistoryServiceImpl extends ServiceImpl implements MemberService { - //会员数据处理层 - @Autowired - private MemberMapper memberMapper; //会员token @Autowired private MemberTokenGenerate memberTokenGenerate; @@ -90,7 +87,7 @@ public class MemberServiceImpl extends ServiceImpl impleme public Member findByUsername(String userName) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("username", userName); - return memberMapper.selectOne(queryWrapper); + return this.baseMapper.selectOne(queryWrapper); } @@ -107,7 +104,7 @@ public class MemberServiceImpl extends ServiceImpl impleme public boolean findByMobile(String uuid, String mobile) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("mobile", mobile); - Member member = memberMapper.selectOne(queryWrapper); + Member member = this.baseMapper.selectOne(queryWrapper); if (member == null) { throw new ServiceException(ResultCode.USER_NOT_PHONE); } @@ -204,7 +201,7 @@ public class MemberServiceImpl extends ServiceImpl impleme public Token mobilePhoneLogin(String mobilePhone) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("mobile", mobilePhone); - Member member = memberMapper.selectOne(queryWrapper); + Member member = this.baseMapper.selectOne(queryWrapper); //如果手机号不存在则自动注册用户 if (member == null) { member = new Member(mobilePhone, UuidUtils.getUUID(), mobilePhone); @@ -413,7 +410,7 @@ public class MemberServiceImpl extends ServiceImpl impleme @Override public List distribution() { - List memberDistributionVOS = memberMapper.distribution(); + List memberDistributionVOS = this.baseMapper.distribution(); return memberDistributionVOS; } @@ -426,7 +423,7 @@ public class MemberServiceImpl extends ServiceImpl impleme private Member findByPhone(String mobilePhone) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("mobile", mobilePhone); - return memberMapper.selectOne(queryWrapper); + return this.baseMapper.selectOne(queryWrapper); } /** 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 1fb34be92..42d864bfe 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 @@ -40,9 +40,6 @@ import java.util.Map; @Transactional public class MemberSignServiceImpl extends ServiceImpl implements MemberSignService { - //会员签到 - @Autowired - private MemberSignMapper memberSignMapper; //RocketMQ @Autowired private RocketMQTemplate rocketMQTemplate; @@ -66,12 +63,12 @@ public class MemberSignServiceImpl extends ServiceImpl todaySigns = memberSignMapper.getTodayMemberSign(queryWrapper); + List todaySigns = this.baseMapper.getTodayMemberSign(queryWrapper); if (todaySigns.size() > 0) { throw new ServiceException(ResultCode.MEMBER_SIGN_REPEAT); } //当前签到天数的前一天日期 - List signs = memberSignMapper.getBeforeMemberSign(authUser.getId()); + List signs = this.baseMapper.getBeforeMemberSign(authUser.getId()); //构建参数 MemberSign memberSign = new MemberSign(); memberSign.setMemberId(authUser.getId()); @@ -84,7 +81,7 @@ public class MemberSignServiceImpl extends ServiceImpl 0) { String destination = rocketmqCustomProperties.getMemberTopic() + ":" + MemberTagsEnum.MEMBER_SING.name(); @@ -101,7 +98,7 @@ public class MemberSignServiceImpl extends ServiceImpl implements MemberWalletService { - //预存款数据层 - @Autowired - private MemberWalletMapper walletMapper; //预存款日志 @Autowired private WalletLogService walletLogService; @@ -67,7 +64,7 @@ public class MemberWalletServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("member_id", memberId); //执行查询 - MemberWallet memberWallet = this.walletMapper.selectOne(queryWrapper); + MemberWallet memberWallet = this.baseMapper.selectOne(queryWrapper); //如果没有钱包，则创建钱包 if (memberWallet == null) { memberWallet = this.save(memberId, memberService.getById(memberId).getUsername()); @@ -83,7 +80,7 @@ public class MemberWalletServiceImpl extends ServiceImpl().eq("member_id", memberId)); + MemberWallet memberWallet = this.getOne(new QueryWrapper().eq("member_id", memberId)); //如果会员预存款信息不存在则同步重新建立预存款信息 if (memberWallet == null) { Member member = memberService.getById(memberId); @@ -184,11 +181,11 @@ public class MemberWalletServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("member_id", member.getId()); - MemberWallet memberWallet = this.walletMapper.selectOne(queryWrapper); + MemberWallet memberWallet = this.getOne(queryWrapper); //如果 预存款信息不为空 执行设置密码 if (memberWallet != null) { memberWallet.setWalletPassword(pwd); - this.walletMapper.updateById(memberWallet); + this.updateById(memberWallet); } } @@ -200,7 +197,7 @@ public class MemberWalletServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("member_id", authUser.getId()); - MemberWallet wallet = this.walletMapper.selectOne(queryWrapper); + MemberWallet wallet = this.getOne(queryWrapper); return wallet != null && !StringUtils.isEmpty(wallet.getWalletPassword()); } @@ -211,7 +208,7 @@ public class MemberWalletServiceImpl extends ServiceImpl implements MemberWithdrawApplyService { - //提现申请数据层 - @Autowired - private MemberWithdrawApplyMapper memberWithdrawApplyMapper; + //会员余额 @Autowired private MemberWalletService memberWalletService; @@ -43,7 +41,7 @@ public class MemberWithdrawApplyServiceImpl extends ServiceImpl implements StoreCollectionService { - @Autowired - private StoreCollectionMapper storeCollectionMapper; @Override public IPage storeCollection(PageVO pageVo) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("sc.member_id", UserContext.getCurrentUser().getId()); queryWrapper.orderByDesc("sc.create_time"); - return storeCollectionMapper.storeCollectionVOList(PageUtil.initPage(pageVo), queryWrapper); + return this.baseMapper.storeCollectionVOList(PageUtil.initPage(pageVo), queryWrapper); } @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 c7fe0d3cf..69d2246be 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 @@ -14,7 +14,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.elasticsearch.ResourceNotFoundException; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -29,15 +28,12 @@ import java.util.List; @Service @Transactional public class StoreMessageServiceImpl extends ServiceImpl implements StoreMessageService { - @Autowired - private StoreMessageMapper storeMessageMapper; @Override public boolean deleteByMessageId(String messageId) { StoreMessage storeMessage = this.getById(messageId); if (storeMessage != null) { - int result = storeMessageMapper.deleteById(messageId); - return result > 0; + return this.removeById(messageId); } return false; @@ -60,7 +56,7 @@ public class StoreMessageServiceImpl extends ServiceImpl 0; + return this.updateById(storeMessage); } return false; } 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 43328053f..a6f8b1074 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 @@ -36,8 +36,6 @@ import java.util.Map; @Transactional(rollbackFor = Exception.class) public class WechatMPMessageServiceImpl extends ServiceImpl implements WechatMPMessageService { - @Autowired - private WechatMPMessageMapper wechatMPMessageMapper; @Autowired private WechatAccessTokenUtil wechatAccessTokenUtil; @@ -53,7 +51,7 @@ public class WechatMPMessageServiceImpl extends ServiceImpl implements WechatMessageService { - @Autowired - private WechatMessageMapper wechatMessageMapper; + @Autowired private WechatAccessTokenUtil wechatAccessTokenUtil; @@ -50,7 +48,7 @@ public class WechatMessageServiceImpl extends ServiceImpl implements OrderItemService { - @Autowired - private OrderItemMapper orderItemMapper; - @Override public void updateCommentStatus(String orderItemSn, CommentStatusEnum commentStatusEnum) { LambdaUpdateWrapper lambdaUpdateWrapper = Wrappers.lambdaUpdate(); @@ -89,6 +84,6 @@ public class OrderItemServiceImpl extends ServiceImpl implements private static final String ORDER_SN_COLUMN = "order_sn"; - //订单数据层 - @Autowired - private OrderMapper orderMapper; //延时任务 @Autowired private TimeTrigger timeTrigger; @@ -479,7 +476,7 @@ public class OrderServiceImpl extends ServiceImpl implements queryWrapper.eq("o.delete_flag", false); queryWrapper.groupBy("o.id"); queryWrapper.orderByDesc("o.id"); - return orderMapper.queryByParams(PageUtil.initPage(pageVO), queryWrapper); + return this.baseMapper.queryByParams(PageUtil.initPage(pageVO), queryWrapper); } @Override 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 ed967f1ff..c5073fd21 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 @@ -2,21 +2,17 @@ package cn.lili.modules.order.order.serviceimpl; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; -import cn.lili.common.security.context.UserContext; import cn.lili.common.utils.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.modules.order.order.entity.dos.Receipt; import cn.lili.modules.order.order.entity.dto.OrderReceiptDTO; import cn.lili.modules.order.order.entity.dto.ReceiptSearchParams; -import cn.lili.modules.order.order.mapper.OrderItemMapper; import cn.lili.modules.order.order.mapper.ReceiptMapper; import cn.lili.modules.order.order.service.ReceiptService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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; @@ -30,14 +26,9 @@ import org.springframework.transaction.annotation.Transactional; @Transactional public class ReceiptServiceImpl extends ServiceImpl implements ReceiptService { - //发票mapper - @Autowired - private ReceiptMapper receiptMapper; - - @Override public IPage getReceiptData(ReceiptSearchParams searchParams, PageVO pageVO) { - return receiptMapper.getReceipt(PageUtil.initPage(pageVO), searchParams.wrapper()); + return this.baseMapper.getReceipt(PageUtil.initPage(pageVO), searchParams.wrapper()); } @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 6114d3c7b..c0b8684ad 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 @@ -18,7 +18,6 @@ import cn.lili.modules.order.trade.service.RechargeService; 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; @@ -35,9 +34,6 @@ import java.util.Date; @Transactional public class RechargeServiceImpl extends ServiceImpl implements RechargeService { - //预存款 - @Autowired - private RechargeMapper rechargeMapper; //会员预存款 @Autowired private MemberWalletService memberWalletService; @@ -51,7 +47,7 @@ public class RechargeServiceImpl extends ServiceImpl i //整合充值订单数据 Recharge recharge = new Recharge(sn, authUser.getId(), authUser.getUsername(), price); //添加预存款充值账单 - this.rechargeMapper.insert(recharge); + this.save(recharge); //返回预存款 return recharge; } @@ -75,20 +71,20 @@ public class RechargeServiceImpl extends ServiceImpl i queryWrapper.between("pay_time", start, end); } //查询返回数据 - return this.rechargeMapper.selectPage(PageUtil.initPage(page), queryWrapper); + return this.page(PageUtil.initPage(page), queryWrapper); } @Override public void paySuccess(String sn, String receivableNo) { //根据sn获取支付账单 - Recharge recharge = this.rechargeMapper.selectOne(new QueryWrapper().eq("recharge_sn", sn)); + Recharge recharge = this.getOne(new QueryWrapper().eq("recharge_sn", sn)); //如果支付账单不为空则进行一下逻辑 if (recharge != null) { //将此账单支付状态更改为已支付 recharge.setPayStatus(PayStatusEnum.PAID.name()); recharge.setReceivableNo(receivableNo); //执行保存操作 - this.rechargeMapper.updateById(recharge); + this.updateById(recharge); //增加预存款余额 memberWalletService.increase(recharge.getRechargeMoney(), recharge.getMemberId(), "会员余额充值，充值单号为：" + recharge.getRechargeSn(), DepositServiceTypeEnum.WALLET_RECHARGE.name()); } @@ -96,7 +92,7 @@ public class RechargeServiceImpl extends ServiceImpl i @Override public Recharge getRecharge(String sn) { - Recharge recharge = this.rechargeMapper.selectOne(new QueryWrapper().eq("recharge_sn", sn)); + Recharge recharge = this.getOne(new QueryWrapper().eq("recharge_sn", sn)); if (recharge != null) { return recharge; } 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 a1b69f8ea..9aa465c4a 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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -26,9 +25,6 @@ import java.util.Date; @Transactional public class WalletLogServiceImpl extends ServiceImpl implements WalletLogService { - @Autowired - private WalletLogMapper walletLogMapper; - @Override public IPage depositLogPage(PageVO page, DepositQueryVO depositQueryVO) { //构建查询条件 @@ -44,6 +40,6 @@ public class WalletLogServiceImpl extends ServiceImpl implements ArticleService { - @Autowired - private ArticleMapper articleMapper; - @Override public IPage articlePage(ArticleSearchParams articleSearchParams) { articleSearchParams.setSort("a.sort"); 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 afe8386be..92165a49a 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 @@ -1,7 +1,7 @@ package cn.lili.modules.page.serviceimpl; -import cn.lili.common.enums.SwitchEnum; import cn.lili.common.enums.ResultCode; +import cn.lili.common.enums.SwitchEnum; import cn.lili.common.exception.ServiceException; import cn.lili.common.utils.PageUtil; import cn.lili.common.vo.PageVO; @@ -18,8 +18,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; /** @@ -30,8 +28,6 @@ import org.springframework.stereotype.Service; */ @Service public class PageDataServiceImpl extends ServiceImpl implements PageDataService { - @Autowired - private PageDataMapper pageDataMapper; @Override public void addStorePageData(String storeId) { @@ -116,7 +112,7 @@ public class PageDataServiceImpl extends ServiceImpl i queryWrapper.eq(pageData.getNum() != null, "num", pageData.getNum()); } //判断是否为唯一的页面 - if (pageDataMapper.getPageDataNum(queryWrapper) == 1) { + if (this.baseMapper.getPageDataNum(queryWrapper) == 1) { throw new ServiceException(ResultCode.PAGE_DELETE_ERROR); } return this.removeById(id); @@ -136,7 +132,7 @@ public class PageDataServiceImpl extends ServiceImpl i queryWrapper.eq("page_client_type", pageDataDTO.getPageClientType()); - return pageDataMapper.getPageData(queryWrapper); + return this.baseMapper.getPageData(queryWrapper); } @Override @@ -146,7 +142,7 @@ public class PageDataServiceImpl extends ServiceImpl i queryWrapper.eq(pageDataDTO.getNum() != null, "num", pageDataDTO.getNum()); queryWrapper.eq(pageDataDTO.getPageClientType() != null, "page_client_type", pageDataDTO.getPageClientType()); - return pageDataMapper.getPageDataList(PageUtil.initPage(pageVO), queryWrapper); + return this.baseMapper.getPageDataList(PageUtil.initPage(pageVO), queryWrapper); } } \ No newline at end of file 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 85a19ed7d..09b6a4f8e 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 @@ -18,9 +18,6 @@ import org.springframework.stereotype.Service; @Service public class SpecialServiceImpl extends ServiceImpl implements SpecialService { - //专题 - @Autowired - private SpecialMapper specialMapper; //页面数据 @Autowired private PageDataService pageDataService; 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 3c577f45c..255e0eaa9 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 @@ -5,8 +5,6 @@ import cn.lili.modules.permission.mapper.DepartmentRoleMapper; import cn.lili.modules.permission.service.DepartmentRoleService; 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; @@ -21,21 +19,20 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) public class DepartmentRoleServiceImpl extends ServiceImpl implements DepartmentRoleService { - @Autowired - private DepartmentRoleMapper departmentRoleMapper; + @Override public List listByDepartmentId(String departmentId) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("department_id", departmentId); - return departmentRoleMapper.selectList(queryWrapper); + return this.baseMapper.selectList(queryWrapper); } @Override public void updateByDepartmentId(String departmentId, List departmentRoles) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("department_id", departmentId); - departmentRoleMapper.delete(queryWrapper); + this.remove(queryWrapper); this.saveBatch(departmentRoles); } @@ -44,6 +41,6 @@ public class DepartmentRoleServiceImpl extends ServiceImpl ids) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.in("department_id", ids); - departmentRoleMapper.delete(queryWrapper); + this.remove(queryWrapper); } } \ No newline at end of file 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 a463f6eef..900a24a13 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 @@ -1,6 +1,5 @@ package cn.lili.modules.permission.serviceimpl; -import cn.lili.common.enums.MessageCode; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.security.AuthUser; @@ -8,16 +7,15 @@ import cn.lili.common.security.context.UserContext; import cn.lili.common.utils.PageUtil; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.SearchVO; -import cn.lili.modules.permission.entity.dto.MenuSearchParams; import cn.lili.modules.permission.entity.dos.Menu; import cn.lili.modules.permission.entity.dos.RoleMenu; +import cn.lili.modules.permission.entity.dto.MenuSearchParams; import cn.lili.modules.permission.entity.vo.MenuVO; import cn.lili.modules.permission.mapper.MenuMapper; import cn.lili.modules.permission.service.MenuService; import cn.lili.modules.permission.service.RoleMenuService; 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; @@ -35,9 +33,6 @@ import java.util.List; @Service @Transactional public class MenuServiceImpl extends ServiceImpl implements MenuService { - //菜单 - @Autowired - private MenuMapper menuMapper; //菜单角色 @Autowired private RoleMenuService roleMenuService; @@ -62,13 +57,13 @@ public class MenuServiceImpl extends ServiceImpl implements Me if (authUser.getIsSuper()) { return this.tree(); } - List userMenus = menuMapper.findByUserId(authUser.getId()); + List userMenus = this.baseMapper.findByUserId(authUser.getId()); return this.tree(userMenus); } @Override public List findUserList(String userId) { - return menuMapper.findByUserId(userId); + return this.baseMapper.findByUserId(userId); } @Override @@ -91,7 +86,7 @@ public class MenuServiceImpl extends ServiceImpl implements Me queryWrapper.like("title", title); } queryWrapper.orderByDesc("sort_order"); - return menuMapper.selectList(queryWrapper); + return this.baseMapper.selectList(queryWrapper); } 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 5e28fc3b1..e582a8730 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 @@ -7,7 +7,6 @@ import cn.lili.modules.permission.mapper.RoleMenuMapper; import cn.lili.modules.permission.service.RoleMenuService; 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; @@ -27,15 +26,12 @@ public class RoleMenuServiceImpl extends ServiceImpl i //菜单 @Autowired private MenuMapper menuMapper; - //角色菜单 - @Autowired - private RoleMenuMapper roleMenuMapper; @Override public List findByRoleId(String roleId) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("role_id", roleId); - return roleMenuMapper.selectList(queryWrapper); + return this.baseMapper.selectList(queryWrapper); } @Override @@ -61,13 +57,13 @@ public class RoleMenuServiceImpl extends ServiceImpl i //删除 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("role_id", roleId); - roleMenuMapper.delete(queryWrapper); + this.remove(queryWrapper); } @Override public void deleteRoleMenu(List roleId) { //删除 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.in("role_id", roleId); - roleMenuMapper.delete(queryWrapper); + this.remove(queryWrapper); } } \ No newline at end of file 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 434b387e4..8046084b7 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 @@ -22,14 +22,12 @@ import java.util.List; @Service @Transactional public class UserRoleServiceImpl extends ServiceImpl implements UserRoleService { - @Autowired - private UserRoleMapper userRoleMapper; @Override public List listByUserId(String userId) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("user_id", userId); - return userRoleMapper.selectList(queryWrapper); + return this.baseMapper.selectList(queryWrapper); } @Override @@ -46,7 +44,7 @@ public class UserRoleServiceImpl extends ServiceImpl i //删除 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("user_id", userId); - userRoleMapper.delete(queryWrapper); + this.remove(queryWrapper); //保存 this.saveBatch(userRoles); 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 c97a7495d..06e9081c9 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 @@ -27,7 +27,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.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; @@ -57,9 +56,6 @@ public class FullDiscountServiceImpl extends ServiceImpl queryWrapper = PromotionTools.checkActiveTime(statTime, endTime, PromotionTypeEnum.FULL_DISCOUNT, storeId, id); - Integer sameNum = this.fullDiscountMapper.selectCount(queryWrapper); + Integer sameNum = this.count(queryWrapper); if (sameNum > 0) { throw new ServiceException("当前时间内已存在同类活动"); } 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 8dbdd847f..cb7d3833e 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 @@ -25,8 +25,6 @@ import java.util.List; @Service @Transactional public class PurchaseQuotedServiceImpl extends ServiceImpl implements PurchaseQuotedService { - @Autowired - private PurchaseQuotedMapper purchaseQuotedMapper; @Autowired private PurchaseQuotedItemService purchaseQuotedItemService; diff --git a/framework/src/main/java/cn/lili/modules/search/serviceimpl/CustomWordsServiceImpl.java b/framework/src/main/java/cn/lili/modules/search/serviceimpl/CustomWordsServiceImpl.java index a4185096f..b5514bccc 100644 --- a/framework/src/main/java/cn/lili/modules/search/serviceimpl/CustomWordsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/search/serviceimpl/CustomWordsServiceImpl.java @@ -24,7 +24,6 @@ import java.util.List; @Service public class CustomWordsServiceImpl extends ServiceImpl implements CustomWordsService { - @Override public String deploy() { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper().eq(CustomWords::getDisabled, 1); 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 d8d65ddb4..03aa6a917 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 @@ -30,12 +30,6 @@ import java.util.List; @Service public class GoodsStatisticsDataServiceImpl extends ServiceImpl implements GoodsStatisticsDataService { - /** - * 商品统计 - */ - @Autowired - private GoodsStatisticsDataMapper goodsStatisticsDataMapper; - @Override public List getGoodsStatisticsData(GoodsStatisticsQueryParam goodsStatisticsQueryParam, Integer num) { //获取查询条件 @@ -47,7 +41,7 @@ public class GoodsStatisticsDataServiceImpl extends ServiceImpl(1, num); - return goodsStatisticsDataMapper.getGoodsStatisticsData(page, queryWrapper); + return this.baseMapper.getGoodsStatisticsData(page, queryWrapper); } @Override @@ -56,7 +50,7 @@ public class GoodsStatisticsDataServiceImpl extends ServiceImpl implements MemberStatisticsDataService { - /** - * 会员统计 - */ - @Autowired - private MemberStatisticsDataMapper memberStatisticsDataMapper; - @Override public Integer getMemberCount() { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("disabled", true); - return memberStatisticsDataMapper.customSqlQuery(queryWrapper); + return this.baseMapper.customSqlQuery(queryWrapper); } @Override public Integer todayMemberNum() { QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.gt("create_time", DateUtil.beginOfDay(new Date())); - return memberStatisticsDataMapper.customSqlQuery(queryWrapper); + return this.baseMapper.customSqlQuery(queryWrapper); } @Override public Integer memberCount(Date endTime) { QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.lt("create_time", endTime); - return memberStatisticsDataMapper.customSqlQuery(queryWrapper); + return this.baseMapper.customSqlQuery(queryWrapper); } @Override @@ -56,14 +49,14 @@ public class MemberStatisticsDataServiceImpl extends ServiceImpl implements OrderStatisticsDataService { - - //订单统计 - @Autowired - private OrderStatisticsDataMapper orderStatisticsDataMapper; //平台PV统计 @Autowired private PlatformViewDataService platformViewDataService; @@ -215,7 +211,7 @@ public class OrderStatisticsDataServiceImpl extends ServiceImpl orderStatisticsDataVOS = orderStatisticsDataMapper.getOrderStatisticsData(queryWrapper); + List orderStatisticsDataVOS = this.baseMapper.getOrderStatisticsData(queryWrapper); Calendar calendar = Calendar.getInstance(); calendar.setTime(dates[0]); 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 723faf2ef..836ecc1fb 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 @@ -21,7 +21,6 @@ import cn.lili.modules.statistics.util.StatisticsSuffix; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -49,9 +48,6 @@ public class PlatformViewDataServiceImpl extends ServiceImpl implements RefundOrderStatisticsService { - //退款统计 - @Autowired - private RefundOrderStatisticsDataMapper refundOrderStatisticsDataMapper; - @Override public IPage getRefundOrderStatisticsData(PageVO pageVO, StatisticsQueryParam statisticsQueryParam) { QueryWrapper queryWrapper = getQueryWrapper(statisticsQueryParam); - return refundOrderStatisticsDataMapper.getRefundStatisticsData(PageUtil.initPage(pageVO), queryWrapper); + return this.baseMapper.getRefundStatisticsData(PageUtil.initPage(pageVO), queryWrapper); } @Override 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 248e7c075..36a2f95c4 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 @@ -49,9 +49,6 @@ public class BillServiceImpl extends ServiceImpl implements Bi //商家流水 @Autowired private StoreFlowService storeFlowService; - //结算单 - @Autowired - private BillMapper billMapper; @Override public void createBill(String storeId, Date startTime) { @@ -77,7 +74,7 @@ public class BillServiceImpl extends ServiceImpl implements Bi bill.setSn(SnowFlake.createStr("B")); //入账结算信息 - Bill orderBill = billMapper.getOrderBill(storeId, FlowTypeEnum.PAY.name()); + Bill orderBill = this.baseMapper.getOrderBill(storeId, FlowTypeEnum.PAY.name()); Double orderPrice = 0D; if (orderBill != null) { bill.setOrderPrice(orderBill.getOrderPrice()); @@ -89,7 +86,7 @@ public class BillServiceImpl extends ServiceImpl implements Bi //退款结算信息 - Bill refundBill = billMapper.getRefundBill(storeId, FlowTypeEnum.REFUND.name()); + Bill refundBill = this.baseMapper.getRefundBill(storeId, FlowTypeEnum.REFUND.name()); Double refundPrice = 0D; if(refundBill!=null){ bill.setRefundPrice(refundBill.getRefundPrice()); @@ -152,7 +149,7 @@ public class BillServiceImpl extends ServiceImpl implements Bi @Override public IPage billPage(BillSearchParams billSearchParams) { QueryWrapper queryWrapper = billSearchParams.queryWrapper(); - return billMapper.queryBillPage(PageUtil.initPage(billSearchParams), queryWrapper); + return this.baseMapper.queryBillPage(PageUtil.initPage(billSearchParams), queryWrapper); } @Override 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 764f34ec2..462247909 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 @@ -6,8 +6,6 @@ import cn.lili.modules.store.service.FreightTemplateChildService; 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,15 +21,11 @@ import java.util.List; @Transactional(rollbackFor = Exception.class) public class FreightTemplateServiceChildImpl extends ServiceImpl implements FreightTemplateChildService { - //配送子模板数据层 - @Autowired - private FreightTemplateChildMapper freightTemplateChildMapper; - @Override public List getFreightTemplateChild(String freightTemplateId) { LambdaQueryWrapper lambdaQueryWrapper = Wrappers.lambdaQuery(); lambdaQueryWrapper.eq(FreightTemplateChild::getFreightTemplateId, freightTemplateId); - return freightTemplateChildMapper.selectList(lambdaQueryWrapper); + return this.baseMapper.selectList(lambdaQueryWrapper); } @Override 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 40771f630..11e1b0bcc 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 @@ -19,7 +19,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -37,10 +36,6 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) public class FreightTemplateServiceImpl extends ServiceImpl implements FreightTemplateService { - - //配送模板 - @Autowired - private FreightTemplateMapper freightTemplateMapper; //配送子模板 @Autowired private FreightTemplateChildService freightTemplateChildService; @@ -60,7 +55,7 @@ public class FreightTemplateServiceImpl extends ServiceImpl lambdaQueryWrapper = Wrappers.lambdaQuery(); lambdaQueryWrapper.eq(FreightTemplate::getStoreId, UserContext.getCurrentUser().getId()); - List freightTemplates = freightTemplateMapper.selectList(lambdaQueryWrapper); + List freightTemplates = this.baseMapper.selectList(lambdaQueryWrapper); if (!freightTemplates.isEmpty()) { //如果模板不为空则查询子模板信息 for (FreightTemplate freightTemplate : freightTemplates) { @@ -80,18 +75,16 @@ public class FreightTemplateServiceImpl extends ServiceImpl getFreightTemplate(PageVO pageVo) { - //获取当前登录商家账号 - AuthUser tokenUser = UserContext.getCurrentUser(); LambdaQueryWrapper lambdaQueryWrapper = Wrappers.lambdaQuery(); - lambdaQueryWrapper.eq(FreightTemplate::getStoreId, UserContext.getCurrentUser().getId()); - return freightTemplateMapper.selectPage(PageUtil.initPage(pageVo), lambdaQueryWrapper); + lambdaQueryWrapper.eq(FreightTemplate::getStoreId, UserContext.getCurrentUser().getStoreId()); + return this.baseMapper.selectPage(PageUtil.initPage(pageVo), lambdaQueryWrapper); } @Override public FreightTemplateVO getFreightTemplate(String id) { FreightTemplateVO freightTemplateVO = new FreightTemplateVO(); //获取运费模板 - FreightTemplate freightTemplate = freightTemplateMapper.selectById(id); + FreightTemplate freightTemplate = this.getById(id); if (freightTemplate != null) { //复制属性 BeanUtils.copyProperties(freightTemplate, freightTemplateVO); @@ -112,7 +105,7 @@ public class FreightTemplateServiceImpl extends ServiceImpl list = new ArrayList<>(); for (FreightTemplateChild freightTemplateChild : freightTemplateVO.getFreightTemplateChildList()) { @@ -138,7 +131,7 @@ public class FreightTemplateServiceImpl extends ServiceImpl implements StoreAddressService { - @Autowired - private StoreAddressMapper storeAddressMapper; - @Override public IPage getStoreAddress(PageVO pageVo) { //获取当前登录商家账号 - AuthUser tokenUser = UserContext.getCurrentUser(); LambdaQueryWrapper lambdaQueryWrapper = Wrappers.lambdaQuery(); lambdaQueryWrapper.eq(StoreAddress::getStoreId, UserContext.getCurrentUser().getStoreId()); - return storeAddressMapper.selectPage(PageUtil.initPage(pageVo), lambdaQueryWrapper); + return this.page(PageUtil.initPage(pageVo), lambdaQueryWrapper); } @Override public StoreAddress addStoreAddress(StoreAddress storeAddress) { //获取当前登录商家账号 - AuthUser tokenUser = UserContext.getCurrentUser(); - storeAddress.setStoreId(tokenUser.getId()); + storeAddress.setStoreId(UserContext.getCurrentUser().getStoreId()); //添加自提点 - storeAddressMapper.insert(storeAddress); + this.save(storeAddress); return storeAddress; } @@ -54,13 +47,12 @@ public class StoreAddressServiceImpl extends ServiceImpl implements StoreDetailService { - //店铺详情数据层 - @Autowired - private StoreDetailMapper storeDetailMapper; //店铺 @Autowired private StoreService storeService; @@ -49,12 +45,12 @@ public class StoreDetailServiceImpl extends ServiceImpl implements StoreGoodsLabelService { - @Autowired - private StoreGoodsLabelMapper storeGoodsLabelMapper; - @Override public List listByStoreId(String storeId) { //TODO 从缓存获取店铺商品分类列表 @@ -68,7 +63,7 @@ public class StoreGoodsLabelServiceImpl extends ServiceImpl list(String storeId) { LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); queryWrapper.eq(StoreGoodsLabel::getStoreId, storeId); - return storeGoodsLabelMapper.selectList(queryWrapper); + return this.baseMapper.selectList(queryWrapper); } @Override @@ -76,7 +71,7 @@ public class StoreGoodsLabelServiceImpl extends ServiceImpl lambdaUpdateWrapper = Wrappers.lambdaUpdate(); lambdaUpdateWrapper.eq(StoreGoodsLabel::getStoreId, tokenUser.getStoreId()); lambdaUpdateWrapper.eq(StoreGoodsLabel::getId, storeGoodsLabel.getId()); - storeGoodsLabelMapper.update(storeGoodsLabel, lambdaUpdateWrapper); + this.update(storeGoodsLabel, lambdaUpdateWrapper); return storeGoodsLabel; } @Override public void removeStoreGoodsLabel(String storeLabelId) { - storeGoodsLabelMapper.deleteById(storeLabelId); + this.removeById(storeLabelId); } } 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 3f5ba6b27..aab4878d1 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 @@ -2,8 +2,8 @@ package cn.lili.modules.store.serviceimpl; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; -import cn.lili.common.enums.SwitchEnum; import cn.lili.common.enums.ResultCode; +import cn.lili.common.enums.SwitchEnum; import cn.lili.common.exception.ServiceException; import cn.lili.common.security.context.UserContext; import cn.lili.common.utils.BeanUtil; @@ -35,7 +35,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; @@ -52,9 +51,6 @@ import java.util.Optional; @Transactional(rollbackFor = Exception.class) public class StoreServiceImpl extends ServiceImpl implements StoreService { - //店铺 - @Autowired - private StoreMapper storeMapper; //会员 @Autowired private MemberService memberService; @@ -76,12 +72,12 @@ public class StoreServiceImpl extends ServiceImpl implements @Override public IPage findByConditionPage(StoreSearchParams storeSearchParams, PageVO page) { - return storeMapper.getStoreList(PageUtil.initPage(page), storeSearchParams.queryWrapper()); + return this.baseMapper.getStoreList(PageUtil.initPage(page), storeSearchParams.queryWrapper()); } @Override public StoreVO getStoreDetail() { - StoreVO storeVO = storeMapper.getStoreDetail(UserContext.getCurrentUser().getStoreId()); + StoreVO storeVO = this.baseMapper.getStoreDetail(UserContext.getCurrentUser().getStoreId()); storeVO.setNickName(UserContext.getCurrentUser().getNickName()); return storeVO; } @@ -169,7 +165,7 @@ public class StoreServiceImpl extends ServiceImpl implements @Override public boolean audit(String id, Integer passed) { - Store store = storeMapper.selectById(id); + Store store = this.getById(id); if (store == null) { throw new ServiceException(ResultCode.STORE_NOT_EXIST); } 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 95678794e..230296fc8 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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -25,17 +24,14 @@ import java.util.List; public class StoreLogisticsServiceImpl extends ServiceImpl implements StoreLogisticsService { - @Autowired - private StoreLogisticsMapper storeLogisticsMapper; - @Override public List getStoreLogistics() { - return storeLogisticsMapper.getStoreLogistics(UserContext.getCurrentUser().getStoreId()); + return this.baseMapper.getStoreLogistics(UserContext.getCurrentUser().getStoreId()); } @Override public List getStoreSelectedLogistics() { - return storeLogisticsMapper.getSelectedStoreLogistics(UserContext.getCurrentUser().getStoreId()); + return this.baseMapper.getSelectedStoreLogistics(UserContext.getCurrentUser().getStoreId()); }