diff --git a/yshop-common/src/main/java/co/yixiang/utils/OrderUtil.java b/yshop-common/src/main/java/co/yixiang/utils/OrderUtil.java index c981523d..a644a5cd 100644 --- a/yshop-common/src/main/java/co/yixiang/utils/OrderUtil.java +++ b/yshop-common/src/main/java/co/yixiang/utils/OrderUtil.java @@ -49,6 +49,15 @@ public class OrderUtil { return res; } + /* + * 将时间戳转换为date + */ + public static Date stampToDateObj(String s){ + long lt = new Long(s) * 1000; + Date date = new Date(lt); + return date; + } + /** * 获取精确到秒的时间戳 diff --git a/yshop-mp/src/main/java/co/yixiang/mp/controller/YxArticleController.java b/yshop-mp/src/main/java/co/yixiang/mp/controller/WechatArticleController.java similarity index 91% rename from yshop-mp/src/main/java/co/yixiang/mp/controller/YxArticleController.java rename to yshop-mp/src/main/java/co/yixiang/mp/controller/WechatArticleController.java index e7e1bcab..90385286 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/controller/YxArticleController.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/controller/WechatArticleController.java @@ -1,15 +1,12 @@ package co.yixiang.mp.controller; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.StrUtil; -import co.yixiang.exception.BadRequestException; import co.yixiang.mp.domain.YxArticle; import co.yixiang.mp.service.YxArticleService; import co.yixiang.mp.service.dto.YxArticleDTO; import co.yixiang.mp.service.dto.YxArticleQueryCriteria; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -23,14 +20,16 @@ import java.util.Date; * @author hupeng * @date 2019-10-07 */ -@Api(tags = "图文管理") +@Api(tags = "商城:微信图文管理") @RestController @RequestMapping("api") -public class YxArticleController { +public class WechatArticleController { - @Autowired - private YxArticleService yxArticleService; + private final YxArticleService yxArticleService; + public WechatArticleController(YxArticleService yxArticleService) { + this.yxArticleService = yxArticleService; + } @ApiOperation(value = "查询") @GetMapping(value = "/yxArticle") diff --git a/yshop-mp/src/main/java/co/yixiang/mp/controller/YxCacheController.java b/yshop-mp/src/main/java/co/yixiang/mp/controller/WechatMenuController.java similarity index 92% rename from yshop-mp/src/main/java/co/yixiang/mp/controller/YxCacheController.java rename to yshop-mp/src/main/java/co/yixiang/mp/controller/WechatMenuController.java index c9a9aa0f..7a00b399 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/controller/YxCacheController.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/controller/WechatMenuController.java @@ -25,15 +25,16 @@ import org.springframework.web.bind.annotation.*; * @author hupeng * @date 2019-10-06 */ -@Api(tags = "微信菜單") +@Api(tags = "商城:微信菜單") @RestController @RequestMapping("api") -public class YxCacheController { - - @Autowired - private YxCacheService yxCacheService; +public class WechatMenuController { + private final YxCacheService yxCacheService; + public WechatMenuController(YxCacheService yxCacheService) { + this.yxCacheService = yxCacheService; + } @ApiOperation(value = "查询菜单") @GetMapping(value = "/yxCache") diff --git a/yshop-mp/src/main/java/co/yixiang/mp/controller/YxWechatReplyController.java b/yshop-mp/src/main/java/co/yixiang/mp/controller/WechatReplyController.java similarity index 88% rename from yshop-mp/src/main/java/co/yixiang/mp/controller/YxWechatReplyController.java rename to yshop-mp/src/main/java/co/yixiang/mp/controller/WechatReplyController.java index 5f0d68ad..00d0afcf 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/controller/YxWechatReplyController.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/controller/WechatReplyController.java @@ -1,8 +1,6 @@ package co.yixiang.mp.controller; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import co.yixiang.exception.BadRequestException; import co.yixiang.mp.domain.YxWechatReply; import co.yixiang.mp.service.YxWechatReplyService; import com.alibaba.fastjson.JSON; @@ -19,14 +17,16 @@ import org.springframework.web.bind.annotation.*; * @author hupeng * @date 2019-10-10 */ -@Api(tags = "微信回復管理") +@Api(tags = "商城:微信回復管理") @RestController @RequestMapping("api") -public class YxWechatReplyController { +public class WechatReplyController { - @Autowired - private YxWechatReplyService yxWechatReplyService; + private final YxWechatReplyService yxWechatReplyService; + public WechatReplyController(YxWechatReplyService yxWechatReplyService) { + this.yxWechatReplyService = yxWechatReplyService; + } @ApiOperation(value = "查询") @GetMapping(value = "/yxWechatReply") diff --git a/yshop-mp/src/main/java/co/yixiang/mp/controller/YxWechatTemplateController.java b/yshop-mp/src/main/java/co/yixiang/mp/controller/WechatTemplateController.java similarity index 89% rename from yshop-mp/src/main/java/co/yixiang/mp/controller/YxWechatTemplateController.java rename to yshop-mp/src/main/java/co/yixiang/mp/controller/WechatTemplateController.java index c58da478..25d5d0d0 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/controller/YxWechatTemplateController.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/controller/WechatTemplateController.java @@ -1,7 +1,5 @@ package co.yixiang.mp.controller; -import cn.hutool.core.util.StrUtil; -import co.yixiang.exception.BadRequestException; import co.yixiang.mp.domain.YxWechatTemplate; import co.yixiang.mp.service.YxWechatTemplateService; import co.yixiang.mp.service.dto.YxWechatTemplateQueryCriteria; @@ -19,13 +17,16 @@ import org.springframework.web.bind.annotation.*; * @author xuwenbo * @date 2019-12-10 */ -@Api(tags = "微信模板管理") +@Api(tags = "商城:微信模板管理") @RestController @RequestMapping("api") -public class YxWechatTemplateController { +public class WechatTemplateController { - @Autowired - private YxWechatTemplateService yxWechatTemplateService; + private final YxWechatTemplateService yxWechatTemplateService; + + public WechatTemplateController(YxWechatTemplateService yxWechatTemplateService) { + this.yxWechatTemplateService = yxWechatTemplateService; + } @ApiOperation(value = "查询") @GetMapping(value = "/yxWechatTemplate") diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxArticleServiceImpl.java b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxArticleServiceImpl.java index bea7fd95..9a99ad8e 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxArticleServiceImpl.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxArticleServiceImpl.java @@ -28,7 +28,6 @@ import me.chanjar.weixin.mp.bean.material.WxMpMaterialNews; import me.chanjar.weixin.mp.bean.material.WxMpMaterialUploadResult; import me.chanjar.weixin.mp.bean.result.WxMpMassSendResult; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -50,12 +49,14 @@ import java.util.Optional; @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) public class YxArticleServiceImpl implements YxArticleService { - @Autowired - private YxArticleRepository yxArticleRepository; + private final YxArticleRepository yxArticleRepository; - @Autowired - private YxArticleMapper yxArticleMapper; + private final YxArticleMapper yxArticleMapper; + public YxArticleServiceImpl(YxArticleRepository yxArticleRepository, YxArticleMapper yxArticleMapper) { + this.yxArticleRepository = yxArticleRepository; + this.yxArticleMapper = yxArticleMapper; + } @Value("${file.path}") private String uploadDirStr; diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxCacheServiceImpl.java b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxCacheServiceImpl.java index ea65a7da..ef742da7 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxCacheServiceImpl.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxCacheServiceImpl.java @@ -10,7 +10,6 @@ import co.yixiang.mp.service.mapper.YxCacheMapper; import co.yixiang.utils.PageUtil; import co.yixiang.utils.QueryHelp; import co.yixiang.utils.ValidationUtil; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -29,11 +28,14 @@ import java.util.Optional; @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) public class YxCacheServiceImpl implements YxCacheService { - @Autowired - private YxCacheRepository yxCacheRepository; + private final YxCacheRepository yxCacheRepository; - @Autowired - private YxCacheMapper yxCacheMapper; + private final YxCacheMapper yxCacheMapper; + + public YxCacheServiceImpl(YxCacheRepository yxCacheRepository, YxCacheMapper yxCacheMapper) { + this.yxCacheRepository = yxCacheRepository; + this.yxCacheMapper = yxCacheMapper; + } @Override public Map queryAll(YxCacheQueryCriteria criteria, Pageable pageable){ diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatReplyServiceImpl.java b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatReplyServiceImpl.java index d9b38044..6135c1f8 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatReplyServiceImpl.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatReplyServiceImpl.java @@ -10,7 +10,6 @@ import co.yixiang.mp.service.mapper.YxWechatReplyMapper; import co.yixiang.utils.PageUtil; import co.yixiang.utils.QueryHelp; import co.yixiang.utils.ValidationUtil; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -29,11 +28,14 @@ import java.util.Optional; @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) public class YxWechatReplyServiceImpl implements YxWechatReplyService { - @Autowired - private YxWechatReplyRepository yxWechatReplyRepository; + private final YxWechatReplyRepository yxWechatReplyRepository; - @Autowired - private YxWechatReplyMapper yxWechatReplyMapper; + private final YxWechatReplyMapper yxWechatReplyMapper; + + public YxWechatReplyServiceImpl(YxWechatReplyRepository yxWechatReplyRepository, YxWechatReplyMapper yxWechatReplyMapper) { + this.yxWechatReplyRepository = yxWechatReplyRepository; + this.yxWechatReplyMapper = yxWechatReplyMapper; + } @Override public Map queryAll(YxWechatReplyQueryCriteria criteria, Pageable pageable){ diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatTemplateServiceImpl.java b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatTemplateServiceImpl.java index 62a42fa3..3b162d42 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatTemplateServiceImpl.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatTemplateServiceImpl.java @@ -27,11 +27,14 @@ import java.util.Map; @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) public class YxWechatTemplateServiceImpl implements YxWechatTemplateService { - @Autowired - private YxWechatTemplateRepository yxWechatTemplateRepository; + private final YxWechatTemplateRepository yxWechatTemplateRepository; - @Autowired - private YxWechatTemplateMapper yxWechatTemplateMapper; + private final YxWechatTemplateMapper yxWechatTemplateMapper; + + public YxWechatTemplateServiceImpl(YxWechatTemplateRepository yxWechatTemplateRepository, YxWechatTemplateMapper yxWechatTemplateMapper) { + this.yxWechatTemplateRepository = yxWechatTemplateRepository; + this.yxWechatTemplateMapper = yxWechatTemplateMapper; + } @Override public YxWechatTemplate findByTempkey(String key) { diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreBargainController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java similarity index 90% rename from yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreBargainController.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java index d274a42c..59fddc0b 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreBargainController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java @@ -1,16 +1,13 @@ package co.yixiang.modules.activity.rest; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import co.yixiang.aop.log.Log; -import co.yixiang.exception.BadRequestException; import co.yixiang.modules.activity.domain.YxStoreBargain; import co.yixiang.modules.activity.service.YxStoreBargainService; import co.yixiang.modules.activity.service.dto.YxStoreBargainQueryCriteria; import co.yixiang.utils.OrderUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -22,13 +19,16 @@ import org.springframework.web.bind.annotation.*; * @author xuwenbo * @date 2019-12-22 */ -@Api(tags = "砍价管理") +@Api(tags = "商城:砍价管理") @RestController @RequestMapping("api") -public class YxStoreBargainController { +public class StoreBargainController { - @Autowired - private YxStoreBargainService yxStoreBargainService; + private final YxStoreBargainService yxStoreBargainService; + + public StoreBargainController(YxStoreBargainService yxStoreBargainService) { + this.yxStoreBargainService = yxStoreBargainService; + } @Log("查询砍价") @ApiOperation(value = "查询砍价") diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCombinationController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java similarity index 91% rename from yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCombinationController.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java index fc1d7a16..7472aeae 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCombinationController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java @@ -1,9 +1,7 @@ package co.yixiang.modules.activity.rest; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import co.yixiang.aop.log.Log; -import co.yixiang.exception.BadRequestException; import co.yixiang.modules.activity.domain.YxStoreCombination; import co.yixiang.modules.activity.service.YxStoreCombinationService; import co.yixiang.modules.activity.service.dto.YxStoreCombinationQueryCriteria; @@ -12,7 +10,6 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -24,13 +21,16 @@ import org.springframework.web.bind.annotation.*; * @author hupeng * @date 2019-11-18 */ -@Api(tags = "拼团管理") +@Api(tags = "商城:拼团管理") @RestController @RequestMapping("api") -public class YxStoreCombinationController { +public class StoreCombinationController { - @Autowired - private YxStoreCombinationService yxStoreCombinationService; + private final YxStoreCombinationService yxStoreCombinationService; + + public StoreCombinationController(YxStoreCombinationService yxStoreCombinationService) { + this.yxStoreCombinationService = yxStoreCombinationService; + } @Log("查询拼团") @ApiOperation(value = "查询拼团") diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponController.java similarity index 89% rename from yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponController.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponController.java index 4c356a9d..8fe49c8b 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponController.java @@ -1,15 +1,12 @@ package co.yixiang.modules.activity.rest; -import cn.hutool.core.util.StrUtil; import co.yixiang.aop.log.Log; -import co.yixiang.exception.BadRequestException; import co.yixiang.modules.activity.domain.YxStoreCoupon; import co.yixiang.modules.activity.service.YxStoreCouponService; import co.yixiang.modules.activity.service.dto.YxStoreCouponQueryCriteria; import co.yixiang.utils.OrderUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -21,13 +18,16 @@ import org.springframework.web.bind.annotation.*; * @author hupeng * @date 2019-11-09 */ -@Api(tags = "优惠券管理") +@Api(tags = "商城:优惠券管理") @RestController @RequestMapping("api") -public class YxStoreCouponController { +public class StoreCouponController { - @Autowired - private YxStoreCouponService yxStoreCouponService; + private final YxStoreCouponService yxStoreCouponService; + + public StoreCouponController(YxStoreCouponService yxStoreCouponService) { + this.yxStoreCouponService = yxStoreCouponService; + } @Log("查询") @ApiOperation(value = "查询") diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponIssueController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponIssueController.java similarity index 91% rename from yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponIssueController.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponIssueController.java index ff3dd877..75df7e19 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponIssueController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponIssueController.java @@ -1,7 +1,6 @@ package co.yixiang.modules.activity.rest; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import co.yixiang.aop.log.Log; import co.yixiang.exception.BadRequestException; import co.yixiang.modules.activity.domain.YxStoreCouponIssue; @@ -10,7 +9,6 @@ import co.yixiang.modules.activity.service.dto.YxStoreCouponIssueQueryCriteria; import co.yixiang.utils.OrderUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -22,13 +20,16 @@ import org.springframework.web.bind.annotation.*; * @author hupeng * @date 2019-11-09 */ -@Api(tags = "发布管理") +@Api(tags = "商城:优惠券发布管理") @RestController @RequestMapping("api") -public class YxStoreCouponIssueController { +public class StoreCouponIssueController { - @Autowired - private YxStoreCouponIssueService yxStoreCouponIssueService; + private final YxStoreCouponIssueService yxStoreCouponIssueService; + + public StoreCouponIssueController(YxStoreCouponIssueService yxStoreCouponIssueService) { + this.yxStoreCouponIssueService = yxStoreCouponIssueService; + } @Log("查询已发布") @ApiOperation(value = "查询已发布") diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponIssueUserController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponIssueUserController.java similarity index 87% rename from yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponIssueUserController.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponIssueUserController.java index ca5f2e67..677bc57b 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponIssueUserController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponIssueUserController.java @@ -1,14 +1,11 @@ package co.yixiang.modules.activity.rest; -import cn.hutool.core.util.StrUtil; import co.yixiang.aop.log.Log; -import co.yixiang.exception.BadRequestException; import co.yixiang.modules.activity.domain.YxStoreCouponIssueUser; import co.yixiang.modules.activity.service.YxStoreCouponIssueUserService; import co.yixiang.modules.activity.service.dto.YxStoreCouponIssueUserQueryCriteria; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -20,13 +17,16 @@ import org.springframework.web.bind.annotation.*; * @author hupeng * @date 2019-11-09 */ -@Api(tags = "优惠券前台用户领取记录管理") +@Api(tags = "商城:优惠券前台用户领取记录管理") @RestController @RequestMapping("api") -public class YxStoreCouponIssueUserController { +public class StoreCouponIssueUserController { - @Autowired - private YxStoreCouponIssueUserService yxStoreCouponIssueUserService; + private final YxStoreCouponIssueUserService yxStoreCouponIssueUserService; + + public StoreCouponIssueUserController(YxStoreCouponIssueUserService yxStoreCouponIssueUserService) { + this.yxStoreCouponIssueUserService = yxStoreCouponIssueUserService; + } @Log("查询") @ApiOperation(value = "查询") diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponUserController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponUserController.java new file mode 100644 index 00000000..dd0fc7f9 --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponUserController.java @@ -0,0 +1,40 @@ +package co.yixiang.modules.activity.rest; + +import co.yixiang.aop.log.Log; +import co.yixiang.modules.activity.domain.YxStoreCouponUser; +import co.yixiang.modules.activity.service.YxStoreCouponUserService; +import co.yixiang.modules.activity.service.dto.YxStoreCouponUserQueryCriteria; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.data.domain.Pageable; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +/** +* @author hupeng +* @date 2019-11-10 +*/ +@Api(tags = "商城:优惠券发放记录管理") +@RestController +@RequestMapping("api") +public class StoreCouponUserController { + + private final YxStoreCouponUserService yxStoreCouponUserService; + + public StoreCouponUserController(YxStoreCouponUserService yxStoreCouponUserService) { + this.yxStoreCouponUserService = yxStoreCouponUserService; + } + + @Log("查询Y") + @ApiOperation(value = "查询") + @GetMapping(value = "/yxStoreCouponUser") + @PreAuthorize("@el.check('admin','YXSTORECOUPONUSER_ALL','YXSTORECOUPONUSER_SELECT')") + public ResponseEntity getYxStoreCouponUsers(YxStoreCouponUserQueryCriteria criteria, Pageable pageable){ + return new ResponseEntity(yxStoreCouponUserService.queryAll(criteria,pageable),HttpStatus.OK); + } + + +} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StorePinkController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StorePinkController.java new file mode 100644 index 00000000..96ed4631 --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StorePinkController.java @@ -0,0 +1,40 @@ +package co.yixiang.modules.activity.rest; + +import co.yixiang.aop.log.Log; +import co.yixiang.modules.activity.domain.YxStorePink; +import co.yixiang.modules.activity.service.YxStorePinkService; +import co.yixiang.modules.activity.service.dto.YxStorePinkQueryCriteria; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.data.domain.Pageable; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +/** +* @author hupeng +* @date 2019-11-18 +*/ +@Api(tags = "商城:拼团记录管理") +@RestController +@RequestMapping("api") +public class StorePinkController { + + private final YxStorePinkService yxStorePinkService; + + public StorePinkController(YxStorePinkService yxStorePinkService) { + this.yxStorePinkService = yxStorePinkService; + } + + @Log("查询记录") + @ApiOperation(value = "查询记录") + @GetMapping(value = "/yxStorePink") + @PreAuthorize("@el.check('admin','YXSTOREPINK_ALL','YXSTOREPINK_SELECT')") + public ResponseEntity getYxStorePinks(YxStorePinkQueryCriteria criteria, Pageable pageable){ + return new ResponseEntity(yxStorePinkService.queryAll(criteria,pageable),HttpStatus.OK); + } + + +} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreSeckillController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java similarity index 82% rename from yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreSeckillController.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java index 2852d564..cad6b1d1 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreSeckillController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java @@ -1,16 +1,13 @@ package co.yixiang.modules.activity.rest; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import co.yixiang.aop.log.Log; -import co.yixiang.exception.BadRequestException; import co.yixiang.modules.activity.domain.YxStoreSeckill; import co.yixiang.modules.activity.service.YxStoreSeckillService; import co.yixiang.modules.activity.service.dto.YxStoreSeckillQueryCriteria; import co.yixiang.utils.OrderUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -22,16 +19,19 @@ import org.springframework.web.bind.annotation.*; * @author xuwenbo * @date 2019-12-14 */ -@Api(tags = "秒杀管理") +@Api(tags = "商城:秒杀管理") @RestController @RequestMapping("api") -public class YxStoreSeckillController { +public class StoreSeckillController { - @Autowired - private YxStoreSeckillService yxStoreSeckillService; + private final YxStoreSeckillService yxStoreSeckillService; - @Log("查询YxStoreSeckill") - @ApiOperation(value = "查询YxStoreSeckill") + public StoreSeckillController(YxStoreSeckillService yxStoreSeckillService) { + this.yxStoreSeckillService = yxStoreSeckillService; + } + + @Log("列表") + @ApiOperation(value = "列表") @GetMapping(value = "/yxStoreSeckill") @PreAuthorize("@el.check('admin','YXSTORESECKILL_ALL','YXSTORESECKILL_SELECT')") public ResponseEntity getYxStoreSeckills(YxStoreSeckillQueryCriteria criteria, Pageable pageable){ @@ -40,8 +40,8 @@ public class YxStoreSeckillController { - @Log("修改YxStoreSeckill") - @ApiOperation(value = "修改YxStoreSeckill") + @Log("发布") + @ApiOperation(value = "发布") @PutMapping(value = "/yxStoreSeckill") @PreAuthorize("@el.check('admin','YXSTORESECKILL_ALL','YXSTORESECKILL_EDIT')") public ResponseEntity update(@Validated @RequestBody YxStoreSeckill resources){ @@ -62,8 +62,8 @@ public class YxStoreSeckillController { } } - @Log("删除YxStoreSeckill") - @ApiOperation(value = "删除YxStoreSeckill") + @Log("删除") + @ApiOperation(value = "删除") @DeleteMapping(value = "/yxStoreSeckill/{id}") @PreAuthorize("@el.check('admin','YXSTORESECKILL_ALL','YXSTORESECKILL_DELETE')") public ResponseEntity delete(@PathVariable Integer id){ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxUserExtractController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/UserExtractController.java similarity index 86% rename from yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxUserExtractController.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/rest/UserExtractController.java index feffd02b..b38363e0 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxUserExtractController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/UserExtractController.java @@ -11,8 +11,8 @@ import co.yixiang.modules.activity.service.dto.YxUserExtractQueryCriteria; import co.yixiang.modules.shop.domain.YxUserBill; import co.yixiang.modules.shop.service.YxUserBillService; import co.yixiang.modules.shop.service.YxUserService; -import co.yixiang.modules.shop.service.dto.YxUserDTO; import co.yixiang.modules.shop.service.YxWechatUserService; +import co.yixiang.modules.shop.service.dto.YxUserDTO; import co.yixiang.modules.shop.service.dto.YxWechatUserDTO; import co.yixiang.utils.OrderUtil; import co.yixiang.utils.RedisUtil; @@ -21,7 +21,6 @@ import com.github.binarywang.wxpay.exception.WxPayException; import com.github.binarywang.wxpay.service.WxPayService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -35,25 +34,26 @@ import java.math.BigDecimal; * @author hupeng * @date 2019-11-14 */ -@Api(tags = "提现管理") +@Api(tags = "商城:提现管理") @RestController @RequestMapping("api") -public class YxUserExtractController { +public class UserExtractController { - @Autowired - private YxUserExtractService yxUserExtractService; + private final YxUserExtractService yxUserExtractService; + private final YxUserService yxUserService; + private final YxUserBillService yxUserBillService; + private final WxPayService wxPayService; + private final YxWechatUserService wechatUserService; - @Autowired - private YxUserService yxUserService; - - @Autowired - private YxUserBillService yxUserBillService; - - @Autowired - private WxPayService wxPayService; - - @Autowired - private YxWechatUserService wechatUserService; + public UserExtractController(YxUserExtractService yxUserExtractService, YxUserService yxUserService, + YxUserBillService yxUserBillService, WxPayService wxPayService, + YxWechatUserService wechatUserService) { + this.yxUserExtractService = yxUserExtractService; + this.yxUserService = yxUserService; + this.yxUserBillService = yxUserBillService; + this.wxPayService = wxPayService; + this.wechatUserService = wechatUserService; + } @Log("查询") @ApiOperation(value = "查询") diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponUserController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponUserController.java deleted file mode 100644 index e7f47612..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponUserController.java +++ /dev/null @@ -1,65 +0,0 @@ -package co.yixiang.modules.activity.rest; - -import cn.hutool.core.util.StrUtil; -import co.yixiang.aop.log.Log; -import co.yixiang.exception.BadRequestException; -import co.yixiang.modules.activity.domain.YxStoreCouponUser; -import co.yixiang.modules.activity.service.YxStoreCouponUserService; -import co.yixiang.modules.activity.service.dto.YxStoreCouponUserQueryCriteria; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -/** -* @author hupeng -* @date 2019-11-10 -*/ -@Api(tags = "优惠券发放记录管理") -@RestController -@RequestMapping("api") -public class YxStoreCouponUserController { - - @Autowired - private YxStoreCouponUserService yxStoreCouponUserService; - - @Log("查询Y") - @ApiOperation(value = "查询") - @GetMapping(value = "/yxStoreCouponUser") - @PreAuthorize("@el.check('admin','YXSTORECOUPONUSER_ALL','YXSTORECOUPONUSER_SELECT')") - public ResponseEntity getYxStoreCouponUsers(YxStoreCouponUserQueryCriteria criteria, Pageable pageable){ - return new ResponseEntity(yxStoreCouponUserService.queryAll(criteria,pageable),HttpStatus.OK); - } - - @Log("新增YxStoreCouponUser") - @ApiOperation(value = "新增YxStoreCouponUser") - @PostMapping(value = "/yxStoreCouponUser") - @PreAuthorize("@el.check('admin','YXSTORECOUPONUSER_ALL','YXSTORECOUPONUSER_CREATE')") - public ResponseEntity create(@Validated @RequestBody YxStoreCouponUser resources){ - return new ResponseEntity(yxStoreCouponUserService.create(resources),HttpStatus.CREATED); - } - - @Log("修改YxStoreCouponUser") - @ApiOperation(value = "修改YxStoreCouponUser") - @PutMapping(value = "/yxStoreCouponUser") - @PreAuthorize("@el.check('admin','YXSTORECOUPONUSER_ALL','YXSTORECOUPONUSER_EDIT')") - public ResponseEntity update(@Validated @RequestBody YxStoreCouponUser resources){ - yxStoreCouponUserService.update(resources); - return new ResponseEntity(HttpStatus.NO_CONTENT); - } - - @Log("删除YxStoreCouponUser") - @ApiOperation(value = "删除YxStoreCouponUser") - @DeleteMapping(value = "/yxStoreCouponUser/{id}") - @PreAuthorize("@el.check('admin','YXSTORECOUPONUSER_ALL','YXSTORECOUPONUSER_DELETE')") - public ResponseEntity delete(@PathVariable Integer id){ - //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作"); - yxStoreCouponUserService.delete(id); - return new ResponseEntity(HttpStatus.OK); - } -} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStorePinkController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStorePinkController.java deleted file mode 100644 index f73fbb59..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStorePinkController.java +++ /dev/null @@ -1,65 +0,0 @@ -package co.yixiang.modules.activity.rest; - -import cn.hutool.core.util.StrUtil; -import co.yixiang.aop.log.Log; -import co.yixiang.exception.BadRequestException; -import co.yixiang.modules.activity.domain.YxStorePink; -import co.yixiang.modules.activity.service.YxStorePinkService; -import co.yixiang.modules.activity.service.dto.YxStorePinkQueryCriteria; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -/** -* @author hupeng -* @date 2019-11-18 -*/ -@Api(tags = "拼团记录管理") -@RestController -@RequestMapping("api") -public class YxStorePinkController { - - @Autowired - private YxStorePinkService yxStorePinkService; - - @Log("查询记录") - @ApiOperation(value = "查询记录") - @GetMapping(value = "/yxStorePink") - @PreAuthorize("@el.check('admin','YXSTOREPINK_ALL','YXSTOREPINK_SELECT')") - public ResponseEntity getYxStorePinks(YxStorePinkQueryCriteria criteria, Pageable pageable){ - return new ResponseEntity(yxStorePinkService.queryAll(criteria,pageable),HttpStatus.OK); - } - - @Log("新增YxStorePink") - @ApiOperation(value = "新增YxStorePink") - @PostMapping(value = "/yxStorePink") - @PreAuthorize("@el.check('admin','YXSTOREPINK_ALL','YXSTOREPINK_CREATE')") - public ResponseEntity create(@Validated @RequestBody YxStorePink resources){ - return new ResponseEntity(yxStorePinkService.create(resources),HttpStatus.CREATED); - } - - @Log("修改YxStorePink") - @ApiOperation(value = "修改YxStorePink") - @PutMapping(value = "/yxStorePink") - @PreAuthorize("@el.check('admin','YXSTOREPINK_ALL','YXSTOREPINK_EDIT')") - public ResponseEntity update(@Validated @RequestBody YxStorePink resources){ - yxStorePinkService.update(resources); - return new ResponseEntity(HttpStatus.NO_CONTENT); - } - - @Log("删除YxStorePink") - @ApiOperation(value = "删除YxStorePink") - @DeleteMapping(value = "/yxStorePink/{id}") - @PreAuthorize("@el.check('admin','YXSTOREPINK_ALL','YXSTOREPINK_DELETE')") - public ResponseEntity delete(@PathVariable Integer id){ - //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作"); - yxStorePinkService.delete(id); - return new ResponseEntity(HttpStatus.OK); - } -} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueDTO.java index 02630e0c..796b52b6 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueDTO.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueDTO.java @@ -3,6 +3,7 @@ package co.yixiang.modules.activity.service.dto; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** @@ -25,6 +26,10 @@ public class YxStoreCouponIssueDTO implements Serializable { // 优惠券领取结束时间 private Integer endTime; + private Date startTimeDate; + + private Date endTimeDate; + // 优惠券领取数量 private Integer totalCount; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java index 2fa34581..52449d23 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java @@ -9,7 +9,6 @@ import co.yixiang.modules.activity.service.mapper.YxStoreBargainMapper; import co.yixiang.utils.PageUtil; import co.yixiang.utils.QueryHelp; import co.yixiang.utils.ValidationUtil; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -28,11 +27,14 @@ import java.util.Optional; @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) public class YxStoreBargainServiceImpl implements YxStoreBargainService { - @Autowired - private YxStoreBargainRepository yxStoreBargainRepository; + private final YxStoreBargainRepository yxStoreBargainRepository; - @Autowired - private YxStoreBargainMapper yxStoreBargainMapper; + private final YxStoreBargainMapper yxStoreBargainMapper; + + public YxStoreBargainServiceImpl(YxStoreBargainRepository yxStoreBargainRepository, YxStoreBargainMapper yxStoreBargainMapper) { + this.yxStoreBargainRepository = yxStoreBargainRepository; + this.yxStoreBargainMapper = yxStoreBargainMapper; + } @Override public Map queryAll(YxStoreBargainQueryCriteria criteria, Pageable pageable){ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java index 8dcd1d48..d6a02023 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java @@ -10,7 +10,6 @@ import co.yixiang.modules.activity.service.dto.YxStoreCombinationQueryCriteria; import co.yixiang.modules.activity.service.mapper.YxStoreCombinationMapper; import co.yixiang.utils.QueryHelp; import co.yixiang.utils.ValidationUtil; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -30,17 +29,19 @@ import java.util.Optional; @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) public class YxStoreCombinationServiceImpl implements YxStoreCombinationService { - @Autowired - private YxStoreCombinationRepository yxStoreCombinationRepository; + private final YxStoreCombinationRepository yxStoreCombinationRepository; + private final YxStorePinkRepository storePinkRepository; + private final YxStoreVisitRepository storeVisitRepository; - @Autowired - private YxStorePinkRepository storePinkRepository; + private final YxStoreCombinationMapper yxStoreCombinationMapper; - @Autowired - private YxStoreVisitRepository storeVisitRepository; - - @Autowired - private YxStoreCombinationMapper yxStoreCombinationMapper; + public YxStoreCombinationServiceImpl(YxStoreCombinationRepository yxStoreCombinationRepository, YxStorePinkRepository storePinkRepository, + YxStoreVisitRepository storeVisitRepository, YxStoreCombinationMapper yxStoreCombinationMapper) { + this.yxStoreCombinationRepository = yxStoreCombinationRepository; + this.storePinkRepository = storePinkRepository; + this.storeVisitRepository = storeVisitRepository; + this.yxStoreCombinationMapper = yxStoreCombinationMapper; + } @Override public Map queryAll(YxStoreCombinationQueryCriteria criteria, Pageable pageable){ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponIssueServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponIssueServiceImpl.java index 53b99bb4..fe48674b 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponIssueServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponIssueServiceImpl.java @@ -9,7 +9,6 @@ import co.yixiang.modules.activity.service.mapper.YxStoreCouponIssueMapper; import co.yixiang.utils.PageUtil; import co.yixiang.utils.QueryHelp; import co.yixiang.utils.ValidationUtil; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -28,11 +27,14 @@ import java.util.Optional; @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) public class YxStoreCouponIssueServiceImpl implements YxStoreCouponIssueService { - @Autowired - private YxStoreCouponIssueRepository yxStoreCouponIssueRepository; + private final YxStoreCouponIssueRepository yxStoreCouponIssueRepository; - @Autowired - private YxStoreCouponIssueMapper yxStoreCouponIssueMapper; + private final YxStoreCouponIssueMapper yxStoreCouponIssueMapper; + + public YxStoreCouponIssueServiceImpl(YxStoreCouponIssueRepository yxStoreCouponIssueRepository, YxStoreCouponIssueMapper yxStoreCouponIssueMapper) { + this.yxStoreCouponIssueRepository = yxStoreCouponIssueRepository; + this.yxStoreCouponIssueMapper = yxStoreCouponIssueMapper; + } @Override public Map queryAll(YxStoreCouponIssueQueryCriteria criteria, Pageable pageable){ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponIssueUserServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponIssueUserServiceImpl.java index 5fa84bb8..31d52535 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponIssueUserServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponIssueUserServiceImpl.java @@ -9,7 +9,6 @@ import co.yixiang.modules.activity.service.mapper.YxStoreCouponIssueUserMapper; import co.yixiang.utils.PageUtil; import co.yixiang.utils.QueryHelp; import co.yixiang.utils.ValidationUtil; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -28,11 +27,14 @@ import java.util.Optional; @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) public class YxStoreCouponIssueUserServiceImpl implements YxStoreCouponIssueUserService { - @Autowired - private YxStoreCouponIssueUserRepository yxStoreCouponIssueUserRepository; + private final YxStoreCouponIssueUserRepository yxStoreCouponIssueUserRepository; - @Autowired - private YxStoreCouponIssueUserMapper yxStoreCouponIssueUserMapper; + private final YxStoreCouponIssueUserMapper yxStoreCouponIssueUserMapper; + + public YxStoreCouponIssueUserServiceImpl(YxStoreCouponIssueUserRepository yxStoreCouponIssueUserRepository, YxStoreCouponIssueUserMapper yxStoreCouponIssueUserMapper) { + this.yxStoreCouponIssueUserRepository = yxStoreCouponIssueUserRepository; + this.yxStoreCouponIssueUserMapper = yxStoreCouponIssueUserMapper; + } @Override public Map queryAll(YxStoreCouponIssueUserQueryCriteria criteria, Pageable pageable){ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponServiceImpl.java index c806d901..ff24f206 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponServiceImpl.java @@ -9,7 +9,6 @@ import co.yixiang.modules.activity.service.mapper.YxStoreCouponMapper; import co.yixiang.utils.PageUtil; import co.yixiang.utils.QueryHelp; import co.yixiang.utils.ValidationUtil; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -28,11 +27,14 @@ import java.util.Optional; @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) public class YxStoreCouponServiceImpl implements YxStoreCouponService { - @Autowired - private YxStoreCouponRepository yxStoreCouponRepository; + private final YxStoreCouponRepository yxStoreCouponRepository; - @Autowired - private YxStoreCouponMapper yxStoreCouponMapper; + private final YxStoreCouponMapper yxStoreCouponMapper; + + public YxStoreCouponServiceImpl(YxStoreCouponRepository yxStoreCouponRepository, YxStoreCouponMapper yxStoreCouponMapper) { + this.yxStoreCouponRepository = yxStoreCouponRepository; + this.yxStoreCouponMapper = yxStoreCouponMapper; + } @Override public Map queryAll(YxStoreCouponQueryCriteria criteria, Pageable pageable){ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java index a4e99fdc..e6f46ab0 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java @@ -9,7 +9,6 @@ import co.yixiang.modules.activity.service.mapper.YxStoreCouponUserMapper; import co.yixiang.modules.shop.service.YxUserService; import co.yixiang.utils.QueryHelp; import co.yixiang.utils.ValidationUtil; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -29,14 +28,17 @@ import java.util.Optional; @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) public class YxStoreCouponUserServiceImpl implements YxStoreCouponUserService { - @Autowired - private YxStoreCouponUserRepository yxStoreCouponUserRepository; + private final YxStoreCouponUserRepository yxStoreCouponUserRepository; - @Autowired - private YxStoreCouponUserMapper yxStoreCouponUserMapper; + private final YxStoreCouponUserMapper yxStoreCouponUserMapper; - @Autowired - private YxUserService userService; + private final YxUserService userService; + + public YxStoreCouponUserServiceImpl(YxStoreCouponUserRepository yxStoreCouponUserRepository, YxStoreCouponUserMapper yxStoreCouponUserMapper, YxUserService userService) { + this.yxStoreCouponUserRepository = yxStoreCouponUserRepository; + this.yxStoreCouponUserMapper = yxStoreCouponUserMapper; + this.userService = userService; + } @Override public Map queryAll(YxStoreCouponUserQueryCriteria criteria, Pageable pageable){ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java index a9650a70..3dd53567 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java @@ -12,7 +12,6 @@ import co.yixiang.modules.shop.service.YxUserService; import co.yixiang.modules.shop.service.dto.YxUserDTO; import co.yixiang.utils.QueryHelp; import co.yixiang.utils.ValidationUtil; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -32,17 +31,20 @@ import java.util.Optional; @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) public class YxStorePinkServiceImpl implements YxStorePinkService { - @Autowired - private YxStorePinkRepository yxStorePinkRepository; + private final YxStorePinkRepository yxStorePinkRepository; - @Autowired - private YxStoreCombinationService combinationService; + private final YxStoreCombinationService combinationService; + private final YxUserService userService; - @Autowired - private YxUserService userService; + private final YxStorePinkMapper yxStorePinkMapper; - @Autowired - private YxStorePinkMapper yxStorePinkMapper; + public YxStorePinkServiceImpl(YxStorePinkRepository yxStorePinkRepository, YxStoreCombinationService combinationService, + YxUserService userService, YxStorePinkMapper yxStorePinkMapper) { + this.yxStorePinkRepository = yxStorePinkRepository; + this.combinationService = combinationService; + this.userService = userService; + this.yxStorePinkMapper = yxStorePinkMapper; + } /** * 参与拼团的人 diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java index eb699372..7b2bddc1 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java @@ -9,7 +9,6 @@ import co.yixiang.modules.activity.service.mapper.YxStoreSeckillMapper; import co.yixiang.utils.OrderUtil; import co.yixiang.utils.QueryHelp; import co.yixiang.utils.ValidationUtil; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -29,11 +28,14 @@ import java.util.Optional; @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) public class YxStoreSeckillServiceImpl implements YxStoreSeckillService { - @Autowired - private YxStoreSeckillRepository yxStoreSeckillRepository; + private final YxStoreSeckillRepository yxStoreSeckillRepository; - @Autowired - private YxStoreSeckillMapper yxStoreSeckillMapper; + private final YxStoreSeckillMapper yxStoreSeckillMapper; + + public YxStoreSeckillServiceImpl(YxStoreSeckillRepository yxStoreSeckillRepository, YxStoreSeckillMapper yxStoreSeckillMapper) { + this.yxStoreSeckillRepository = yxStoreSeckillRepository; + this.yxStoreSeckillMapper = yxStoreSeckillMapper; + } @Override public Map queryAll(YxStoreSeckillQueryCriteria criteria, Pageable pageable){ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreVisitServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreVisitServiceImpl.java index 8acc9ab9..04fef21f 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreVisitServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreVisitServiceImpl.java @@ -9,7 +9,6 @@ import co.yixiang.modules.activity.service.mapper.YxStoreVisitMapper; import co.yixiang.utils.PageUtil; import co.yixiang.utils.QueryHelp; import co.yixiang.utils.ValidationUtil; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -28,11 +27,14 @@ import java.util.Optional; @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) public class YxStoreVisitServiceImpl implements YxStoreVisitService { - @Autowired - private YxStoreVisitRepository yxStoreVisitRepository; + private final YxStoreVisitRepository yxStoreVisitRepository; - @Autowired - private YxStoreVisitMapper yxStoreVisitMapper; + private final YxStoreVisitMapper yxStoreVisitMapper; + + public YxStoreVisitServiceImpl(YxStoreVisitRepository yxStoreVisitRepository, YxStoreVisitMapper yxStoreVisitMapper) { + this.yxStoreVisitRepository = yxStoreVisitRepository; + this.yxStoreVisitMapper = yxStoreVisitMapper; + } @Override public Map queryAll(YxStoreVisitQueryCriteria criteria, Pageable pageable){ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxUserExtractServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxUserExtractServiceImpl.java index 1c92610f..f703c10b 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxUserExtractServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxUserExtractServiceImpl.java @@ -9,7 +9,6 @@ import co.yixiang.modules.activity.service.mapper.YxUserExtractMapper; import co.yixiang.utils.PageUtil; import co.yixiang.utils.QueryHelp; import co.yixiang.utils.ValidationUtil; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -28,11 +27,14 @@ import java.util.Optional; @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) public class YxUserExtractServiceImpl implements YxUserExtractService { - @Autowired - private YxUserExtractRepository yxUserExtractRepository; + private final YxUserExtractRepository yxUserExtractRepository; - @Autowired - private YxUserExtractMapper yxUserExtractMapper; + private final YxUserExtractMapper yxUserExtractMapper; + + public YxUserExtractServiceImpl(YxUserExtractRepository yxUserExtractRepository, YxUserExtractMapper yxUserExtractMapper) { + this.yxUserExtractRepository = yxUserExtractRepository; + this.yxUserExtractMapper = yxUserExtractMapper; + } @Override public Map queryAll(YxUserExtractQueryCriteria criteria, Pageable pageable){ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxExpressServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxExpressServiceImpl.java index 08af5f96..a45d9e46 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxExpressServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxExpressServiceImpl.java @@ -10,7 +10,6 @@ import co.yixiang.modules.shop.service.mapper.YxExpressMapper; import co.yixiang.utils.PageUtil; import co.yixiang.utils.QueryHelp; import co.yixiang.utils.ValidationUtil; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxMaterialGroupServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxMaterialGroupServiceImpl.java index eace1839..d646fed3 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxMaterialGroupServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxMaterialGroupServiceImpl.java @@ -22,10 +22,7 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import java.util.List; import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; + /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxMaterialServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxMaterialServiceImpl.java index 779035ad..da60d443 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxMaterialServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxMaterialServiceImpl.java @@ -22,10 +22,6 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import java.util.List; import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java index fcfb6c5f..a6543721 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java @@ -11,7 +11,6 @@ import co.yixiang.utils.FileUtil; import co.yixiang.utils.PageUtil; import co.yixiang.utils.QueryHelp; import co.yixiang.utils.ValidationUtil; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -32,12 +31,15 @@ import java.util.stream.Collectors; @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) public class YxStoreCategoryServiceImpl implements YxStoreCategoryService { - @Autowired - private YxStoreCategoryRepository yxStoreCategoryRepository; - @Autowired - private YxStoreCategoryMapper yxStoreCategoryMapper; + private final YxStoreCategoryRepository yxStoreCategoryRepository; + private final YxStoreCategoryMapper yxStoreCategoryMapper; + + public YxStoreCategoryServiceImpl(YxStoreCategoryRepository yxStoreCategoryRepository, YxStoreCategoryMapper yxStoreCategoryMapper) { + this.yxStoreCategoryRepository = yxStoreCategoryRepository; + this.yxStoreCategoryMapper = yxStoreCategoryMapper; + } @Override public void download(List queryAll, HttpServletResponse response) throws IOException { diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java index dbc19f12..6459cd39 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java @@ -31,7 +31,6 @@ import com.github.binarywang.wxpay.config.WxPayConfig; import com.github.binarywang.wxpay.exception.WxPayException; import com.github.binarywang.wxpay.service.WxPayService; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -50,32 +49,31 @@ import java.util.*; @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) public class YxStoreOrderServiceImpl implements YxStoreOrderService { - @Autowired - private YxStoreOrderRepository yxStoreOrderRepository; + private final YxStoreOrderRepository yxStoreOrderRepository; + private final YxStoreOrderCartInfoRepository yxStoreOrderCartInfoRepository; + private final YxUserRepository userRepository; + private final YxStorePinkRepository storePinkRepository; - @Autowired - private YxStoreOrderCartInfoRepository yxStoreOrderCartInfoRepository; + private final YxStoreOrderMapper yxStoreOrderMapper; - @Autowired - private YxStoreOrderMapper yxStoreOrderMapper; + private final YxUserBillService yxUserBillService; + private final YxStoreOrderStatusService yxStoreOrderStatusService; + private final YxUserService userService; + private final WxPayService wxPayService; - @Autowired - private YxStoreOrderStatusService yxStoreOrderStatusService; - - @Autowired - private YxUserService userService; - - @Autowired - private YxUserRepository userRepository; - - @Autowired - private YxUserBillService yxUserBillService; - - @Autowired - private YxStorePinkRepository storePinkRepository; - - @Autowired - private WxPayService wxPayService; + public YxStoreOrderServiceImpl(YxStoreOrderRepository yxStoreOrderRepository, YxStoreOrderCartInfoRepository yxStoreOrderCartInfoRepository, YxUserRepository userRepository, + YxStorePinkRepository storePinkRepository, YxStoreOrderMapper yxStoreOrderMapper, YxUserBillService yxUserBillService, + YxStoreOrderStatusService yxStoreOrderStatusService, YxUserService userService, WxPayService wxPayService) { + this.yxStoreOrderRepository = yxStoreOrderRepository; + this.yxStoreOrderCartInfoRepository = yxStoreOrderCartInfoRepository; + this.userRepository = userRepository; + this.storePinkRepository = storePinkRepository; + this.yxStoreOrderMapper = yxStoreOrderMapper; + this.yxUserBillService = yxUserBillService; + this.yxStoreOrderStatusService = yxStoreOrderStatusService; + this.userService = userService; + this.wxPayService = wxPayService; + } @Override public OrderTimeDataDTO getOrderTimeData() { diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderStatusServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderStatusServiceImpl.java index 6b4f14c9..9b548931 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderStatusServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderStatusServiceImpl.java @@ -9,7 +9,6 @@ import co.yixiang.modules.shop.service.mapper.YxStoreOrderStatusMapper; import co.yixiang.utils.PageUtil; import co.yixiang.utils.QueryHelp; import co.yixiang.utils.ValidationUtil; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -28,11 +27,14 @@ import java.util.Optional; @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) public class YxStoreOrderStatusServiceImpl implements YxStoreOrderStatusService { - @Autowired - private YxStoreOrderStatusRepository yxStoreOrderStatusRepository; + private final YxStoreOrderStatusRepository yxStoreOrderStatusRepository; - @Autowired - private YxStoreOrderStatusMapper yxStoreOrderStatusMapper; + private final YxStoreOrderStatusMapper yxStoreOrderStatusMapper; + + public YxStoreOrderStatusServiceImpl(YxStoreOrderStatusRepository yxStoreOrderStatusRepository, YxStoreOrderStatusMapper yxStoreOrderStatusMapper) { + this.yxStoreOrderStatusRepository = yxStoreOrderStatusRepository; + this.yxStoreOrderStatusMapper = yxStoreOrderStatusMapper; + } @Override public Map queryAll(YxStoreOrderStatusQueryCriteria criteria, Pageable pageable){ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java index a95fa26c..a50487dc 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java @@ -10,7 +10,6 @@ import co.yixiang.modules.shop.service.dto.YxStoreProductReplyQueryCriteria; import co.yixiang.modules.shop.service.mapper.YxStoreProductReplyMapper; import co.yixiang.utils.QueryHelp; import co.yixiang.utils.ValidationUtil; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -27,17 +26,20 @@ import java.util.*; @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) public class YxStoreProductReplyServiceImpl implements YxStoreProductReplyService { - @Autowired - private YxStoreProductReplyRepository yxStoreProductReplyRepository; + private final YxStoreProductReplyRepository yxStoreProductReplyRepository; - @Autowired - private YxStoreProductReplyMapper yxStoreProductReplyMapper; + private final YxStoreProductReplyMapper yxStoreProductReplyMapper; - @Autowired - private YxUserService userService; + private final YxUserService userService; + private final YxStoreProductService productService; - @Autowired - private YxStoreProductService productService; + public YxStoreProductReplyServiceImpl(YxStoreProductReplyRepository yxStoreProductReplyRepository, YxStoreProductReplyMapper yxStoreProductReplyMapper, + YxUserService userService, YxStoreProductService productService) { + this.yxStoreProductReplyRepository = yxStoreProductReplyRepository; + this.yxStoreProductReplyMapper = yxStoreProductReplyMapper; + this.userService = userService; + this.productService = productService; + } @Override public Map queryAll(YxStoreProductReplyQueryCriteria criteria, Pageable pageable){ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java index 5d432389..cfc9207f 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java @@ -17,7 +17,6 @@ import co.yixiang.utils.QueryHelp; import co.yixiang.utils.ValidationUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -36,23 +35,24 @@ import java.util.stream.Collectors; @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) public class YxStoreProductServiceImpl implements YxStoreProductService { - @Autowired - private YxStoreProductRepository yxStoreProductRepository; + private final YxStoreProductRepository yxStoreProductRepository; + private final YxStoreCategoryRepository yxStoreCategoryRepository; + private final YxStoreProductAttrRepository yxStoreProductAttrRepository; + private final YxStoreProductAttrValueRepository yxStoreProductAttrValueRepository; + private final YxStoreProductAttrResultRepository yxStoreProductAttrResultRepository; - @Autowired - private YxStoreCategoryRepository yxStoreCategoryRepository; + private final YxStoreProductMapper yxStoreProductMapper; - @Autowired - private YxStoreProductAttrRepository yxStoreProductAttrRepository; - - @Autowired - private YxStoreProductAttrValueRepository yxStoreProductAttrValueRepository; - - @Autowired - private YxStoreProductAttrResultRepository yxStoreProductAttrResultRepository; - - @Autowired - private YxStoreProductMapper yxStoreProductMapper; + public YxStoreProductServiceImpl(YxStoreProductRepository yxStoreProductRepository, YxStoreCategoryRepository yxStoreCategoryRepository, + YxStoreProductAttrRepository yxStoreProductAttrRepository, YxStoreProductAttrValueRepository yxStoreProductAttrValueRepository, + YxStoreProductAttrResultRepository yxStoreProductAttrResultRepository, YxStoreProductMapper yxStoreProductMapper) { + this.yxStoreProductRepository = yxStoreProductRepository; + this.yxStoreCategoryRepository = yxStoreCategoryRepository; + this.yxStoreProductAttrRepository = yxStoreProductAttrRepository; + this.yxStoreProductAttrValueRepository = yxStoreProductAttrValueRepository; + this.yxStoreProductAttrResultRepository = yxStoreProductAttrResultRepository; + this.yxStoreProductMapper = yxStoreProductMapper; + } @Override public Map queryAll(YxStoreProductQueryCriteria criteria, Pageable pageable){ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemConfigServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemConfigServiceImpl.java index 4b9cfc53..3588e3e1 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemConfigServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemConfigServiceImpl.java @@ -9,7 +9,6 @@ import co.yixiang.modules.shop.service.mapper.YxSystemConfigMapper; import co.yixiang.utils.PageUtil; import co.yixiang.utils.QueryHelp; import co.yixiang.utils.ValidationUtil; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -28,11 +27,14 @@ import java.util.Optional; @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) public class YxSystemConfigServiceImpl implements YxSystemConfigService { - @Autowired - private YxSystemConfigRepository yxSystemConfigRepository; + private final YxSystemConfigRepository yxSystemConfigRepository; - @Autowired - private YxSystemConfigMapper yxSystemConfigMapper; + private final YxSystemConfigMapper yxSystemConfigMapper; + + public YxSystemConfigServiceImpl(YxSystemConfigRepository yxSystemConfigRepository, YxSystemConfigMapper yxSystemConfigMapper) { + this.yxSystemConfigRepository = yxSystemConfigRepository; + this.yxSystemConfigMapper = yxSystemConfigMapper; + } @Override public Map queryAll(YxSystemConfigQueryCriteria criteria, Pageable pageable){ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java index 0922a992..8658a37f 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java @@ -9,7 +9,6 @@ import co.yixiang.modules.shop.service.mapper.YxSystemGroupDataMapper; import co.yixiang.utils.QueryHelp; import co.yixiang.utils.ValidationUtil; import com.alibaba.fastjson.JSON; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -26,11 +25,14 @@ import java.util.*; @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) public class YxSystemGroupDataServiceImpl implements YxSystemGroupDataService { - @Autowired - private YxSystemGroupDataRepository yxSystemGroupDataRepository; + private final YxSystemGroupDataRepository yxSystemGroupDataRepository; - @Autowired - private YxSystemGroupDataMapper yxSystemGroupDataMapper; + private final YxSystemGroupDataMapper yxSystemGroupDataMapper; + + public YxSystemGroupDataServiceImpl(YxSystemGroupDataRepository yxSystemGroupDataRepository, YxSystemGroupDataMapper yxSystemGroupDataMapper) { + this.yxSystemGroupDataRepository = yxSystemGroupDataRepository; + this.yxSystemGroupDataMapper = yxSystemGroupDataMapper; + } @Override public Map queryAll(YxSystemGroupDataQueryCriteria criteria, Pageable pageable){ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserLevelServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserLevelServiceImpl.java index d2cef7a2..9a3d27a6 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserLevelServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserLevelServiceImpl.java @@ -28,11 +28,14 @@ import java.util.Optional; @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) public class YxSystemUserLevelServiceImpl implements YxSystemUserLevelService { - @Autowired - private YxSystemUserLevelRepository yxSystemUserLevelRepository; + private final YxSystemUserLevelRepository yxSystemUserLevelRepository; - @Autowired - private YxSystemUserLevelMapper yxSystemUserLevelMapper; + private final YxSystemUserLevelMapper yxSystemUserLevelMapper; + + public YxSystemUserLevelServiceImpl(YxSystemUserLevelRepository yxSystemUserLevelRepository, YxSystemUserLevelMapper yxSystemUserLevelMapper) { + this.yxSystemUserLevelRepository = yxSystemUserLevelRepository; + this.yxSystemUserLevelMapper = yxSystemUserLevelMapper; + } @Override public Map queryAll(YxSystemUserLevelQueryCriteria criteria, Pageable pageable){ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserTaskServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserTaskServiceImpl.java index 8577e80e..ec3ddaaa 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserTaskServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserTaskServiceImpl.java @@ -9,7 +9,6 @@ import co.yixiang.modules.shop.service.dto.YxSystemUserTaskQueryCriteria; import co.yixiang.modules.shop.service.mapper.YxSystemUserTaskMapper; import co.yixiang.utils.QueryHelp; import co.yixiang.utils.ValidationUtil; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -29,14 +28,17 @@ import java.util.Optional; @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) public class YxSystemUserTaskServiceImpl implements YxSystemUserTaskService { - @Autowired - private YxSystemUserTaskRepository yxSystemUserTaskRepository; + private final YxSystemUserTaskRepository yxSystemUserTaskRepository; - @Autowired - private YxSystemUserTaskMapper yxSystemUserTaskMapper; + private final YxSystemUserTaskMapper yxSystemUserTaskMapper; - @Autowired - private YxSystemUserLevelService systemUserLevelService; + private final YxSystemUserLevelService systemUserLevelService; + + public YxSystemUserTaskServiceImpl(YxSystemUserTaskRepository yxSystemUserTaskRepository, YxSystemUserTaskMapper yxSystemUserTaskMapper, YxSystemUserLevelService systemUserLevelService) { + this.yxSystemUserTaskRepository = yxSystemUserTaskRepository; + this.yxSystemUserTaskMapper = yxSystemUserTaskMapper; + this.systemUserLevelService = systemUserLevelService; + } @Override public Map queryAll(YxSystemUserTaskQueryCriteria criteria, Pageable pageable){ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserBillServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserBillServiceImpl.java index 8c627484..994d8f4c 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserBillServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserBillServiceImpl.java @@ -8,7 +8,6 @@ import co.yixiang.modules.shop.service.dto.YxUserBillQueryCriteria; import co.yixiang.modules.shop.service.mapper.YxUserBillMapper; import co.yixiang.utils.QueryHelp; import co.yixiang.utils.ValidationUtil; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -28,11 +27,14 @@ import java.util.Optional; @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) public class YxUserBillServiceImpl implements YxUserBillService { - @Autowired - private YxUserBillRepository yxUserBillRepository; + private final YxUserBillRepository yxUserBillRepository; - @Autowired - private YxUserBillMapper yxUserBillMapper; + private final YxUserBillMapper yxUserBillMapper; + + public YxUserBillServiceImpl(YxUserBillRepository yxUserBillRepository, YxUserBillMapper yxUserBillMapper) { + this.yxUserBillRepository = yxUserBillRepository; + this.yxUserBillMapper = yxUserBillMapper; + } @Override public Map queryAll(YxUserBillQueryCriteria criteria, Pageable pageable){ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserServiceImpl.java index d68b049a..e2067c29 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserServiceImpl.java @@ -14,7 +14,6 @@ import co.yixiang.utils.OrderUtil; import co.yixiang.utils.PageUtil; import co.yixiang.utils.QueryHelp; import co.yixiang.utils.ValidationUtil; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -34,14 +33,17 @@ import java.util.Optional; @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) public class YxUserServiceImpl implements YxUserService { - @Autowired - private YxUserRepository yxUserRepository; + private final YxUserRepository yxUserRepository; - @Autowired - private YxUserMapper yxUserMapper; + private final YxUserMapper yxUserMapper; - @Autowired - private YxUserBillService yxUserBillService; + private final YxUserBillService yxUserBillService; + + public YxUserServiceImpl(YxUserRepository yxUserRepository, YxUserMapper yxUserMapper, YxUserBillService yxUserBillService) { + this.yxUserRepository = yxUserRepository; + this.yxUserMapper = yxUserMapper; + this.yxUserBillService = yxUserBillService; + } @Override @Transactional(rollbackFor = Exception.class) diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxWechatUserServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxWechatUserServiceImpl.java index 933d4569..68fdda5f 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxWechatUserServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxWechatUserServiceImpl.java @@ -9,7 +9,6 @@ import co.yixiang.modules.shop.service.mapper.YxWechatUserMapper; import co.yixiang.utils.PageUtil; import co.yixiang.utils.QueryHelp; import co.yixiang.utils.ValidationUtil; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -28,11 +27,14 @@ import java.util.Optional; @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) public class YxWechatUserServiceImpl implements YxWechatUserService { - @Autowired - private YxWechatUserRepository yxWechatUserRepository; + private final YxWechatUserRepository yxWechatUserRepository; - @Autowired - private YxWechatUserMapper yxWechatUserMapper; + private final YxWechatUserMapper yxWechatUserMapper; + + public YxWechatUserServiceImpl(YxWechatUserRepository yxWechatUserRepository, YxWechatUserMapper yxWechatUserMapper) { + this.yxWechatUserRepository = yxWechatUserRepository; + this.yxWechatUserMapper = yxWechatUserMapper; + } @Override public Map queryAll(YxWechatUserQueryCriteria criteria, Pageable pageable){