diff --git a/yshop-api/src/main/java/co/yixiang/common/constant/CommonConstant.java b/yshop-api/src/main/java/co/yixiang/common/constant/CommonConstant.java index fb011ea0..718fd6fb 100644 --- a/yshop-api/src/main/java/co/yixiang/common/constant/CommonConstant.java +++ b/yshop-api/src/main/java/co/yixiang/common/constant/CommonConstant.java @@ -3,11 +3,6 @@ package co.yixiang.common.constant; public interface CommonConstant { - - /** - * 订单超时未支付时间 默认30分钟 - */ - Long ORDER_OUTTIME_UNPAY = 1000* 1800L; /** * 默认页码为1 */ diff --git a/yshop-api/src/main/java/co/yixiang/common/rocketmq/MqConsumer.java b/yshop-api/src/main/java/co/yixiang/common/rocketmq/MqConsumer.java index 16cfba4b..d560e528 100644 --- a/yshop-api/src/main/java/co/yixiang/common/rocketmq/MqConsumer.java +++ b/yshop-api/src/main/java/co/yixiang/common/rocketmq/MqConsumer.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil; import co.yixiang.modules.order.entity.YxStoreOrder; import co.yixiang.modules.order.service.YxStoreOrderService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; import org.apache.rocketmq.spring.core.RocketMQListener; @@ -15,17 +16,17 @@ import org.springframework.stereotype.Component; * @Author hupeng <610796224@qq.com> * @Date 2020/1/1 **/ -@Component -@RocketMQMessageListener( - topic = "yshop-topic", - consumerGroup = "yshop-group", - selectorExpression = "*" -) +//@Component +//@RocketMQMessageListener( +// topic = "yshop-topic", +// consumerGroup = "yshop-group", +// selectorExpression = "*" +//) @Slf4j +@AllArgsConstructor public class MqConsumer implements RocketMQListener { - @Autowired - private YxStoreOrderService storeOrderService; + private final YxStoreOrderService storeOrderService; @Override public void onMessage(String msg) { diff --git a/yshop-api/src/main/java/co/yixiang/common/rocketmq/MqProducer.java b/yshop-api/src/main/java/co/yixiang/common/rocketmq/MqProducer.java index cbb4ca90..8ad13c2c 100644 --- a/yshop-api/src/main/java/co/yixiang/common/rocketmq/MqProducer.java +++ b/yshop-api/src/main/java/co/yixiang/common/rocketmq/MqProducer.java @@ -1,6 +1,7 @@ package co.yixiang.common.rocketmq; import co.yixiang.exception.ErrorRequestException; +import lombok.AllArgsConstructor; import org.apache.rocketmq.client.exception.MQBrokerException; import org.apache.rocketmq.client.exception.MQClientException; import org.apache.rocketmq.client.producer.DefaultMQProducer; @@ -15,11 +16,11 @@ import org.springframework.stereotype.Component; * @Author hupeng <610796224@qq.com> * @Date 2020/1/1 **/ -@Component +//@Component +@AllArgsConstructor public class MqProducer { //注入rocketMQ的模板 - @Autowired - private RocketMQTemplate rocketMQTemplate; + private final RocketMQTemplate rocketMQTemplate; /** diff --git a/yshop-api/src/main/java/co/yixiang/common/service/impl/BaseServiceImpl.java b/yshop-api/src/main/java/co/yixiang/common/service/impl/BaseServiceImpl.java index ee84ee48..abe25f04 100644 --- a/yshop-api/src/main/java/co/yixiang/common/service/impl/BaseServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/common/service/impl/BaseServiceImpl.java @@ -17,6 +17,7 @@ import java.util.List; * @author hupeng * @since 2019-10-16 */ +@SuppressWarnings("unchecked") public abstract class BaseServiceImpl, T> extends ServiceImpl implements BaseService { protected Page setPageParam(QueryParam queryParam) { @@ -26,9 +27,9 @@ public abstract class BaseServiceImpl, T> extends Servic protected Page setPageParam(QueryParam queryParam, OrderItem defaultOrder) { Page page = new Page(); // 设置当前页码 - page.setCurrent(queryParam.getCurrent()); + page.setCurrent(queryParam.getPage()); // 设置页大小 - page.setSize(queryParam.getSize()); + page.setSize(queryParam.getLimit()); /** * 如果是queryParam是OrderQueryParam，并且不为空，则使用前端排序 * 否则使用默认排序 diff --git a/yshop-api/src/main/java/co/yixiang/common/web/param/QueryParam.java b/yshop-api/src/main/java/co/yixiang/common/web/param/QueryParam.java index fa3b25ba..93ae1811 100644 --- a/yshop-api/src/main/java/co/yixiang/common/web/param/QueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/common/web/param/QueryParam.java @@ -14,25 +14,25 @@ public abstract class QueryParam implements Serializable{ private static final long serialVersionUID = -3263921252635611410L; @ApiModelProperty(value = "页码,默认为1") - private Integer current = CommonConstant.DEFAULT_PAGE_INDEX; + private Integer page = CommonConstant.DEFAULT_PAGE_INDEX; @ApiModelProperty(value = "页大小,默认为10") - private Integer size = CommonConstant.DEFAULT_PAGE_SIZE; + private Integer limit = CommonConstant.DEFAULT_PAGE_SIZE; @ApiModelProperty(value = "搜索字符串") private String keyword; public void setCurrent(Integer current) { if (current == null || current <= 0){ - this.current = CommonConstant.DEFAULT_PAGE_INDEX; + this.page = CommonConstant.DEFAULT_PAGE_INDEX; }else{ - this.current = current; + this.page = current; } } public void setSize(Integer size) { if (size == null || size <= 0){ - this.size = CommonConstant.DEFAULT_PAGE_SIZE; + this.limit = CommonConstant.DEFAULT_PAGE_SIZE; }else{ - this.size = size; + this.limit = size; } } diff --git a/yshop-api/src/main/java/co/yixiang/config/RedisConfigProperties.java b/yshop-api/src/main/java/co/yixiang/config/RedisConfigProperties.java new file mode 100644 index 00000000..58099bc2 --- /dev/null +++ b/yshop-api/src/main/java/co/yixiang/config/RedisConfigProperties.java @@ -0,0 +1,31 @@ +/** + * Copyright (C) 2018-2019 + * All rights reserved, Designed By www.yixiang.co + * 注意： + * 本软件为www.yixiang.co开发研制，未经购买不得使用 + * 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台） + * 一经发现盗用、分享等行为，将追究法律责任，后果自负 + */ +package co.yixiang.config; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Configuration; + + +/** + * reids相关配置 + * @author hupeng + * @since 2020-02-27 + */ +@Data +@Configuration +@ConfigurationProperties(prefix = "spring.redis") +public class RedisConfigProperties { + + private String host = "host"; + private String port = "port"; + private String password = "password"; + private String database = "database"; + +} diff --git a/yshop-api/src/main/java/co/yixiang/config/RedisListenerConfig.java b/yshop-api/src/main/java/co/yixiang/config/RedisListenerConfig.java new file mode 100644 index 00000000..f74b2e5a --- /dev/null +++ b/yshop-api/src/main/java/co/yixiang/config/RedisListenerConfig.java @@ -0,0 +1,46 @@ +/** + * Copyright (C) 2018-2019 + * All rights reserved, Designed By www.yixiang.co + * 注意： + * 本软件为www.yixiang.co开发研制，未经购买不得使用 + * 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台） + * 一经发现盗用、分享等行为，将追究法律责任，后果自负 + */ +package co.yixiang.config; + +import cn.hutool.core.util.StrUtil; +import co.yixiang.listener.RedisKeyExpirationListener; +import co.yixiang.modules.order.service.YxStoreOrderService; +import lombok.AllArgsConstructor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.listener.PatternTopic; +import org.springframework.data.redis.listener.RedisMessageListenerContainer; + +/** + * redis监听配置 + * @author hupeng + * @since 2020-02-27 + */ + +@Configuration +@AllArgsConstructor +public class RedisListenerConfig { + + private final RedisTemplate redisTemplate; + private final RedisConfigProperties redisConfigProperties; + private final YxStoreOrderService storeOrderService; + + @Bean + RedisMessageListenerContainer container(RedisConnectionFactory factory) { + String topic =StrUtil.format("__keyevent@{}__:expired", redisConfigProperties.getDatabase()); + RedisMessageListenerContainer container = new RedisMessageListenerContainer(); + container.setConnectionFactory(factory); + container.addMessageListener(new RedisKeyExpirationListener(redisTemplate,redisConfigProperties + ,storeOrderService), new PatternTopic(topic)); + return container; + } +} + diff --git a/yshop-api/src/main/java/co/yixiang/listener/RedisKeyExpirationListener.java b/yshop-api/src/main/java/co/yixiang/listener/RedisKeyExpirationListener.java new file mode 100644 index 00000000..8c1b57a7 --- /dev/null +++ b/yshop-api/src/main/java/co/yixiang/listener/RedisKeyExpirationListener.java @@ -0,0 +1,81 @@ +/** + * Copyright (C) 2018-2019 + * All rights reserved, Designed By www.yixiang.co + * 注意： + * 本软件为www.yixiang.co开发研制，未经购买不得使用 + * 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台） + * 一经发现盗用、分享等行为，将追究法律责任，后果自负 + */ +package co.yixiang.listener; + +import cn.hutool.core.util.StrUtil; +import co.yixiang.constant.ShopConstants; +import co.yixiang.config.RedisConfigProperties; +import co.yixiang.modules.order.entity.YxStoreOrder; +import co.yixiang.modules.order.service.YxStoreOrderService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.data.redis.connection.Message; +import org.springframework.data.redis.connection.MessageListener; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.serializer.RedisSerializer; +import org.springframework.stereotype.Component; + +/** + * redis过期监听 + * @author hupeng + * @since 2020-02-27 + */ +@Component +@Slf4j +public class RedisKeyExpirationListener implements MessageListener { + + private RedisTemplate redisTemplate; + private RedisConfigProperties redisConfigProperties; + private YxStoreOrderService storeOrderService; + + public RedisKeyExpirationListener(RedisTemplate redisTemplate, + RedisConfigProperties redisConfigProperties, + YxStoreOrderService storeOrderService){ + this.redisTemplate = redisTemplate; + this.redisConfigProperties = redisConfigProperties; + this.storeOrderService = storeOrderService; + } + @Override + public void onMessage(Message message, byte[] bytes) { + RedisSerializer serializer = redisTemplate.getValueSerializer(); + String channel = String.valueOf(serializer.deserialize(message.getChannel())); + String body = String.valueOf(serializer.deserialize(message.getBody())); + //key过期监听 + if(StrUtil.format("__keyevent@{}__:expired", redisConfigProperties.getDatabase()).equals(channel)){ + //订单自动取消 + if(body.contains(ShopConstants.REDIS_ORDER_OUTTIME_UNPAY)) { + body = body.replace(ShopConstants.REDIS_ORDER_OUTTIME_UNPAY, ""); + log.info("body:{}",body); + String orderId = body; + YxStoreOrder order = storeOrderService.getOne(new QueryWrapper() + .eq("id", orderId).eq("is_del",0).eq("paid",0)); + //只有待支付的订单能取消 + if(order != null){ + storeOrderService.cancelOrderByTask(Integer.valueOf(orderId)); + + log.info("订单id:{},未在规定时间支付取消成功",body); + } + } + //订单自动收货 + if(body.contains(ShopConstants.REDIS_ORDER_OUTTIME_UNCONFIRM)) { + body = body.replace(ShopConstants.REDIS_ORDER_OUTTIME_UNCONFIRM, ""); + log.info("body:{}",body); + String orderId = body; + YxStoreOrder order = storeOrderService.getOne(new QueryWrapper() + .eq("id", orderId).eq("is_del",0).eq("paid",1).eq("status",1)); + //只有待收货的订单能收货 + if(order != null){ + storeOrderService.takeOrder(order.getOrderId(),0); + log.info("订单id:{},自动收货成功",body); + } + } + } + + } +} diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java index 5662d5fb..1b322adf 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java @@ -34,6 +34,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.AllArgsConstructor; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -58,19 +60,15 @@ public class YxStoreBargainServiceImpl extends BaseServiceImpl implements YxStoreSeckillService { - @Autowired - private YxStoreSeckillMapper yxStoreSeckillMapper; + private final YxStoreSeckillMapper yxStoreSeckillMapper; + private final StoreSeckillMap storeSeckillMap; - @Autowired - private StoreSeckillMap storeSeckillMap; - - @Autowired - private YxStoreProductReplyService replyService; + private final YxStoreProductReplyService replyService; /** * 退回库存减少销量 diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreBargainController.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreBargainController.java index 3e0482a6..9af5899d 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreBargainController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreBargainController.java @@ -24,6 +24,8 @@ import co.yixiang.modules.activity.entity.YxStoreBargainUserHelp; import co.yixiang.modules.activity.service.YxStoreBargainService; import co.yixiang.modules.activity.service.YxStoreBargainUserHelpService; import co.yixiang.modules.activity.service.YxStoreBargainUserService; +import co.yixiang.modules.activity.web.param.YxStoreBargainQueryParam; +import co.yixiang.modules.activity.web.param.YxStoreBargainUserQueryParam; import co.yixiang.modules.activity.web.vo.YxStoreBargainQueryVo; import co.yixiang.modules.activity.web.vo.YxStoreBargainUserQueryVo; import co.yixiang.modules.shop.service.YxSystemConfigService; @@ -67,6 +69,7 @@ import java.util.concurrent.locks.ReentrantLock; @RequestMapping @Api(value = "砍价商品", tags = "砍价商品", description = "砍价商品") @RequiredArgsConstructor(onConstructor = @__(@Autowired)) +@SuppressWarnings("unchecked") public class StoreBargainController extends BaseController { private final YxStoreBargainService storeBargainService; @@ -89,9 +92,9 @@ public class StoreBargainController extends BaseController { @AnonymousAccess @GetMapping("/bargain/list") @ApiOperation(value = "砍价产品列表",notes = "砍价产品列表",response = YxStoreBargainQueryVo.class) - public ApiResult getYxStoreBargainPageList(@RequestParam(value = "page", defaultValue = "1") int page, - @RequestParam(value = "limit", defaultValue = "10") int limit){ - return ApiResult.ok(storeBargainService.getList(page,limit)); + public ApiResult getYxStoreBargainPageList(YxStoreBargainQueryParam queryParam){ + return ApiResult.ok(storeBargainService.getList(queryParam.getPage().intValue(), + queryParam.getLimit().intValue())); } /** @@ -447,11 +450,10 @@ public class StoreBargainController extends BaseController { */ @GetMapping("/bargain/user/list") @ApiOperation(value = "砍价列表(已参与)",notes = "砍价列表(已参与)") - public ApiResult bargainUserList(@RequestParam(value = "page", defaultValue = "1") int page, - @RequestParam(value = "limit", defaultValue = "10") int limit){ + public ApiResult bargainUserList(YxStoreBargainUserQueryParam queryParam){ int uid = SecurityUtils.getUserId().intValue(); List yxStoreBargainUserQueryVos = storeBargainUserService - .bargainUserList(uid,page,limit); + .bargainUserList(uid,queryParam.getPage().intValue(),queryParam.getLimit().intValue()); if(yxStoreBargainUserQueryVos.isEmpty()) return ApiResult.fail("暂无参与砍价"); return ApiResult.ok(yxStoreBargainUserQueryVos); } diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreCombinationController.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreCombinationController.java index 55a2b088..78f06c78 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreCombinationController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreCombinationController.java @@ -21,6 +21,7 @@ import co.yixiang.common.web.controller.BaseController; import co.yixiang.modules.activity.entity.YxStorePink; import co.yixiang.modules.activity.service.YxStoreCombinationService; import co.yixiang.modules.activity.service.YxStorePinkService; +import co.yixiang.modules.activity.web.param.YxStoreCombinationQueryParam; import co.yixiang.modules.activity.web.vo.YxStoreCombinationQueryVo; import co.yixiang.modules.shop.service.YxSystemConfigService; import co.yixiang.modules.user.entity.YxSystemAttachment; @@ -76,10 +77,9 @@ public class StoreCombinationController extends BaseController { @AnonymousAccess @GetMapping("/combination/list") @ApiOperation(value = "拼团产品列表",notes = "拼团产品列表",response = YxStoreCombinationQueryVo.class) - public ApiResult getList(@RequestParam(value = "page",defaultValue = "1") int page, - @RequestParam(value = "limit",defaultValue = "10") int limit){ - - return ApiResult.ok(storeCombinationService.getList(page,limit)); + public ApiResult getList(YxStoreCombinationQueryParam queryParam){ + return ApiResult.ok(storeCombinationService.getList(queryParam.getPage().intValue(), + queryParam.getLimit().intValue())); } /** diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreSeckillController.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreSeckillController.java index 9255f7cd..bf82439a 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreSeckillController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreSeckillController.java @@ -17,6 +17,7 @@ import co.yixiang.common.web.controller.BaseController; import co.yixiang.modules.activity.service.YxStoreSeckillService; import co.yixiang.modules.activity.web.dto.SeckillConfigDTO; import co.yixiang.modules.activity.web.dto.SeckillTimeDTO; +import co.yixiang.modules.activity.web.param.YxStoreSeckillQueryParam; import co.yixiang.modules.activity.web.vo.YxStoreSeckillQueryVo; import co.yixiang.modules.shop.entity.YxSystemGroupData; import co.yixiang.modules.shop.service.YxSystemGroupDataService; @@ -53,7 +54,6 @@ import java.util.concurrent.atomic.AtomicInteger; public class StoreSeckillController extends BaseController { private final YxStoreSeckillService yxStoreSeckillService; - private final YxSystemGroupDataService yxSystemGroupDataService; /** @@ -63,8 +63,7 @@ public class StoreSeckillController extends BaseController { @GetMapping("/seckill/list/{time}") @ApiOperation(value = "秒杀产品列表", notes = "秒杀产品列表", response = YxStoreSeckillQueryVo.class) public ApiResult getYxStoreSeckillPageList(@PathVariable String time, - @RequestParam(value = "page", defaultValue = "1") int page, - @RequestParam(value = "limit", defaultValue = "10") int limit) throws Exception { + YxStoreSeckillQueryParam queryParam) throws Exception { if (StrUtil.isBlank(time)) return ApiResult.fail("参数错误"); YxSystemGroupData systemGroupData = yxSystemGroupDataService .findData(Integer.valueOf(time)); @@ -75,7 +74,8 @@ public class StoreSeckillController extends BaseController { int endTime = today + ((jsonObject.getInteger("time") + jsonObject.getInteger("continued")) * 3600); - return ApiResult.ok(yxStoreSeckillService.getList(page, limit, startTime, endTime)); + return ApiResult.ok(yxStoreSeckillService.getList(queryParam.getPage().intValue(), + queryParam.getLimit().intValue(), startTime, endTime)); } @@ -84,7 +84,7 @@ public class StoreSeckillController extends BaseController { */ @AnonymousAccess @GetMapping("/seckill/detail/{id}") - @ApiOperation(value = "获取YxStoreSeckill对象详情", notes = "查看商品秒杀产品表", response = YxStoreSeckillQueryVo.class) + @ApiOperation(value = "秒杀产品详情", notes = "秒杀产品详情", response = YxStoreSeckillQueryVo.class) public ApiResult getYxStoreSeckill(@PathVariable Integer id) throws Exception { return ApiResult.ok(yxStoreSeckillService.getDetail(id)); } diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreBargainQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreBargainQueryParam.java index ea846ddd..33230922 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreBargainQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreBargainQueryParam.java @@ -16,7 +16,7 @@ import co.yixiang.common.web.param.QueryParam; */ @Data @EqualsAndHashCode(callSuper = true) -@ApiModel(value="YxStoreBargainQueryParam对象", description="砍价表查询参数") +@ApiModel(value="砍价表查询参数", description="砍价表查询参数") public class YxStoreBargainQueryParam extends QueryParam { private static final long serialVersionUID = 1L; } diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreBargainUserHelpQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreBargainUserHelpQueryParam.java index d1ce095a..f1e1d715 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreBargainUserHelpQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreBargainUserHelpQueryParam.java @@ -16,7 +16,7 @@ import co.yixiang.common.web.param.QueryParam; */ @Data @EqualsAndHashCode(callSuper = true) -@ApiModel(value="YxStoreBargainUserHelpQueryParam对象", description="砍价用户帮助表查询参数") +@ApiModel(value="砍价用户帮助表查询参数", description="砍价用户帮助表查询参数") public class YxStoreBargainUserHelpQueryParam extends QueryParam { private static final long serialVersionUID = 1L; } diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreBargainUserQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreBargainUserQueryParam.java index ca624128..446bba95 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreBargainUserQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreBargainUserQueryParam.java @@ -16,7 +16,7 @@ import co.yixiang.common.web.param.QueryParam; */ @Data @EqualsAndHashCode(callSuper = true) -@ApiModel(value="YxStoreBargainUserQueryParam对象", description="用户参与砍价表查询参数") +@ApiModel(value="用户参与砍价表查询参数", description="用户参与砍价表查询参数") public class YxStoreBargainUserQueryParam extends QueryParam { private static final long serialVersionUID = 1L; } diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreCombinationQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreCombinationQueryParam.java index e57ac329..8f831f72 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreCombinationQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreCombinationQueryParam.java @@ -16,7 +16,7 @@ import co.yixiang.common.web.param.QueryParam; */ @Data @EqualsAndHashCode(callSuper = true) -@ApiModel(value="YxStoreCombinationQueryParam对象", description="拼团产品表查询参数") +@ApiModel(value="拼团产品表查询参数", description="拼团产品表查询参数") public class YxStoreCombinationQueryParam extends QueryParam { private static final long serialVersionUID = 1L; } diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStorePinkQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStorePinkQueryParam.java index f0e7c367..4d1d0d38 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStorePinkQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStorePinkQueryParam.java @@ -16,7 +16,7 @@ import co.yixiang.common.web.param.QueryParam; */ @Data @EqualsAndHashCode(callSuper = true) -@ApiModel(value="YxStorePinkQueryParam对象", description="拼团表查询参数") +@ApiModel(value="拼团表查询参数", description="拼团表查询参数") public class YxStorePinkQueryParam extends QueryParam { private static final long serialVersionUID = 1L; } diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreSeckillQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreSeckillQueryParam.java index 5ca65f29..c67b55b0 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreSeckillQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreSeckillQueryParam.java @@ -16,7 +16,7 @@ import co.yixiang.common.web.param.QueryParam; */ @Data @EqualsAndHashCode(callSuper = true) -@ApiModel(value="YxStoreSeckillQueryParam对象", description="商品秒杀产品表查询参数") +@ApiModel(value="商品秒杀产品表查询参数", description="商品秒杀产品表查询参数") public class YxStoreSeckillQueryParam extends QueryParam { private static final long serialVersionUID = 1L; } diff --git a/yshop-api/src/main/java/co/yixiang/modules/manage/service/impl/YxExpressServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/manage/service/impl/YxExpressServiceImpl.java index be8fe797..dcb1673b 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/manage/service/impl/YxExpressServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/manage/service/impl/YxExpressServiceImpl.java @@ -15,10 +15,10 @@ import co.yixiang.modules.manage.web.param.YxExpressQueryParam; import co.yixiang.modules.manage.web.vo.YxExpressQueryVo; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.web.vo.Paging; +import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; @@ -36,11 +36,11 @@ import java.io.Serializable; */ @Slf4j @Service +@AllArgsConstructor @Transactional(rollbackFor = Exception.class) public class YxExpressServiceImpl extends BaseServiceImpl implements YxExpressService { - @Autowired - private YxExpressMapper yxExpressMapper; + private final YxExpressMapper yxExpressMapper; @Override public YxExpressQueryVo getYxExpressById(Serializable id){ diff --git a/yshop-api/src/main/java/co/yixiang/modules/manage/web/controller/ShoperController.java b/yshop-api/src/main/java/co/yixiang/modules/manage/web/controller/ShoperController.java index 4a623129..a9d92ad3 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/manage/web/controller/ShoperController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/manage/web/controller/ShoperController.java @@ -18,6 +18,7 @@ import co.yixiang.modules.manage.web.dto.OrderTimeDataDTO; import co.yixiang.modules.manage.web.param.OrderDeliveryParam; import co.yixiang.modules.manage.web.param.OrderPriceParam; import co.yixiang.modules.manage.web.param.OrderRefundParam; +import co.yixiang.modules.manage.web.param.ShoperQueryParam; import co.yixiang.modules.order.service.YxStoreOrderService; import co.yixiang.modules.order.web.dto.OrderCountDTO; import co.yixiang.modules.order.web.vo.YxStoreOrderQueryVo; @@ -45,7 +46,6 @@ import java.util.Map; public class ShoperController extends BaseController { private final YxStoreOrderService storeOrderService; - //private final YxUserService yxUserService; private final YxExpressService expressService; /** @@ -54,7 +54,6 @@ public class ShoperController extends BaseController { @GetMapping("/admin/order/statistics") @ApiOperation(value = "订单数据统计",notes = "订单数据统计") public ApiResult statistics(){ - OrderCountDTO orderCountDTO = storeOrderService.orderData(0); OrderTimeDataDTO orderTimeDataDTO = storeOrderService.getOrderTimeData(); @@ -69,11 +68,9 @@ public class ShoperController extends BaseController { */ @GetMapping("/admin/order/data") @ApiOperation(value = "订单每月统计数据",notes = "订单每月统计数据") - public ApiResult data(@RequestParam(value = "page",defaultValue = "1") int page, - @RequestParam(value = "limit",defaultValue = "10") int limit){ - int uid = SecurityUtils.getUserId().intValue(); - - return ApiResult.ok(storeOrderService.getOrderDataPriceCount(page,limit)); + public ApiResult data(ShoperQueryParam queryParam){ + return ApiResult.ok(storeOrderService.getOrderDataPriceCount(queryParam.getPage().intValue(), + queryParam.getLimit().intValue())); } @@ -82,12 +79,9 @@ public class ShoperController extends BaseController { */ @GetMapping("/admin/order/list") @ApiOperation(value = "订单列表",notes = "订单列表") - public ApiResult orderList(@RequestParam(value = "status",defaultValue = "0") int type, - @RequestParam(value = "page",defaultValue = "1") int page, - @RequestParam(value = "limit",defaultValue = "10") int limit){ - int uid = SecurityUtils.getUserId().intValue(); - - return ApiResult.ok(storeOrderService.orderList(0,type,page,limit)); + public ApiResult orderList(ShoperQueryParam queryParam) { + return ApiResult.ok(storeOrderService.orderList(0, queryParam.getStatus().intValue(), + queryParam.getPage().intValue(), queryParam.getLimit().intValue())); } /** @@ -96,7 +90,6 @@ public class ShoperController extends BaseController { @GetMapping("/admin/order/detail/{key}") @ApiOperation(value = "订单详情",notes = "订单详情") public ApiResult orderDetail(@PathVariable String key){ - if(StrUtil.isEmpty(key)) return ApiResult.fail("参数错误"); YxStoreOrderQueryVo storeOrder = storeOrderService.getOrderInfo(key,0); if(ObjectUtil.isNull(storeOrder)){ @@ -112,9 +105,7 @@ public class ShoperController extends BaseController { @PostMapping("/admin/order/price") @ApiOperation(value = "订单改价",notes = "订单改价") public ApiResult orderPrice(@Validated @RequestBody OrderPriceParam param){ - storeOrderService.editOrderPrice(param); - return ApiResult.ok("ok"); } @@ -125,7 +116,6 @@ public class ShoperController extends BaseController { @GetMapping("/logistics") @ApiOperation(value = "快递公司",notes = "快递公司") public ApiResult express(){ - return ApiResult.ok(expressService.list()); } @@ -136,9 +126,7 @@ public class ShoperController extends BaseController { @PostMapping("/admin/order/delivery/keep") @ApiOperation(value = "订单发货",notes = "订单发货") public ApiResult orderDelivery(@Validated @RequestBody OrderDeliveryParam param){ - storeOrderService.orderDelivery(param); - return ApiResult.ok("ok"); } @@ -148,9 +136,7 @@ public class ShoperController extends BaseController { @PostMapping("/admin/order/refund") @ApiOperation(value = "订单退款",notes = "订单退款") public ApiResult orderRefund(@Validated @RequestBody OrderRefundParam param){ - storeOrderService.orderRefund(param); - return ApiResult.ok("ok"); } @@ -160,10 +146,9 @@ public class ShoperController extends BaseController { */ @GetMapping("/admin/order/time") @ApiOperation(value = "chart统计",notes = "chart统计") - public ApiResult chartCount(@RequestParam(value = "cate",defaultValue = "1") int cate, - @RequestParam(value = "type",defaultValue = "1") int type){ - - return ApiResult.ok(storeOrderService.chartCount(cate,type)); + public ApiResult chartCount(ShoperQueryParam queryParam){ + return ApiResult.ok(storeOrderService.chartCount(queryParam.getCate().intValue(), + queryParam.getType().intValue())); } diff --git a/yshop-api/src/main/java/co/yixiang/modules/manage/web/param/ShoperQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/manage/web/param/ShoperQueryParam.java new file mode 100644 index 00000000..37379c24 --- /dev/null +++ b/yshop-api/src/main/java/co/yixiang/modules/manage/web/param/ShoperQueryParam.java @@ -0,0 +1,23 @@ +package co.yixiang.modules.manage.web.param; + +import co.yixiang.common.web.param.QueryParam; +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * @author hupeng + * @date 2019-02-27 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@ApiModel(value="商户查询参数", description="商户查询参数") +public class ShoperQueryParam extends QueryParam { + private static final long serialVersionUID = 1L; + + private Integer status = 0; + + private Integer cate = 1; + + private Integer type = 1; +} diff --git a/yshop-api/src/main/java/co/yixiang/modules/monitor/service/RedisService.java b/yshop-api/src/main/java/co/yixiang/modules/monitor/service/RedisService.java index 7bd3e676..2ed8bee6 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/monitor/service/RedisService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/monitor/service/RedisService.java @@ -1,13 +1,16 @@ +/** + * Copyright (C) 2018-2019 + * All rights reserved, Designed By www.yixiang.co + * 注意： + * 本软件为www.yixiang.co开发研制，未经购买不得使用 + * 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台） + * 一经发现盗用、分享等行为，将追究法律责任，后果自负 + */ package co.yixiang.modules.monitor.service; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -/** - * 可自行扩展 - * @author Zheng Jie - * @date 2018-12-10 - */ public interface RedisService { /** diff --git a/yshop-api/src/main/java/co/yixiang/modules/monitor/service/VisitsService.java b/yshop-api/src/main/java/co/yixiang/modules/monitor/service/VisitsService.java index 730b3c74..9e89ada1 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/monitor/service/VisitsService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/monitor/service/VisitsService.java @@ -1,13 +1,18 @@ +/** + * Copyright (C) 2018-2019 + * All rights reserved, Designed By www.yixiang.co + * 注意： + * 本软件为www.yixiang.co开发研制，未经购买不得使用 + * 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台） + * 一经发现盗用、分享等行为，将追究法律责任，后果自负 + */ package co.yixiang.modules.monitor.service; import org.springframework.scheduling.annotation.Async; import javax.servlet.http.HttpServletRequest; -/** - * @author Zheng Jie - * @date 2018-12-13 - */ + public interface VisitsService { /** diff --git a/yshop-api/src/main/java/co/yixiang/modules/monitor/service/impl/RedisServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/monitor/service/impl/RedisServiceImpl.java index 2d208d4e..74974904 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/monitor/service/impl/RedisServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/monitor/service/impl/RedisServiceImpl.java @@ -1,8 +1,18 @@ +/** + * Copyright (C) 2018-2019 + * All rights reserved, Designed By www.yixiang.co + * 注意： + * 本软件为www.yixiang.co开发研制，未经购买不得使用 + * 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台） + * 一经发现盗用、分享等行为，将追究法律责任，后果自负 + */ package co.yixiang.modules.monitor.service.impl; import co.yixiang.modules.monitor.domain.vo.RedisVo; import co.yixiang.modules.monitor.service.RedisService; import co.yixiang.utils.PageUtil; +import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.Page; @@ -15,15 +25,11 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; -/** - * @author Zheng Jie - * @date 2018-12-10 - */ @Service +@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class RedisServiceImpl implements RedisService { - @Autowired - RedisTemplate redisTemplate; + private final RedisTemplate redisTemplate; @Value("${loginCode.expiration}") private Long expiration; diff --git a/yshop-api/src/main/java/co/yixiang/modules/monitor/service/impl/VisitsServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/monitor/service/impl/VisitsServiceImpl.java index a9d4f4e7..d4dfda9e 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/monitor/service/impl/VisitsServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/monitor/service/impl/VisitsServiceImpl.java @@ -1,8 +1,17 @@ +/** + * Copyright (C) 2018-2019 + * All rights reserved, Designed By www.yixiang.co + * 注意： + * 本软件为www.yixiang.co开发研制，未经购买不得使用 + * 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台） + * 一经发现盗用、分享等行为，将追究法律责任，后果自负 + */ package co.yixiang.modules.monitor.service.impl; import co.yixiang.modules.monitor.domain.Visits; import co.yixiang.modules.monitor.repository.VisitsRepository; import co.yixiang.modules.monitor.service.VisitsService; +import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import co.yixiang.repository.LogRepository; import co.yixiang.utils.StringUtils; @@ -18,20 +27,14 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -/** - * @author Zheng Jie - * @date 2018-12-13 - */ @Slf4j @Service +@AllArgsConstructor @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) public class VisitsServiceImpl implements VisitsService { - @Autowired - private VisitsRepository visitsRepository; - - @Autowired - private LogRepository logRepository; + private final VisitsRepository visitsRepository; + private final LogRepository logRepository; @Override public void save() { diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderCartInfoServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderCartInfoServiceImpl.java index 072b35c0..2e714e4a 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderCartInfoServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderCartInfoServiceImpl.java @@ -16,10 +16,10 @@ import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.modules.shop.web.vo.YxStoreCartQueryVo; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; import java.util.ArrayList; @@ -36,11 +36,11 @@ import java.util.List; */ @Slf4j @Service +@AllArgsConstructor @Transactional(rollbackFor = Exception.class) public class YxStoreOrderCartInfoServiceImpl extends BaseServiceImpl implements YxStoreOrderCartInfoService { - @Autowired - private YxStoreOrderCartInfoMapper yxStoreOrderCartInfoMapper; + private final YxStoreOrderCartInfoMapper yxStoreOrderCartInfoMapper; @Override diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java index b4be6bcb..561b9529 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java @@ -13,7 +13,8 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import co.yixiang.common.rocketmq.MqProducer; +//import co.yixiang.common.rocketmq.MqProducer; +import co.yixiang.constant.ShopConstants; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.web.vo.Paging; import co.yixiang.domain.AlipayConfig; @@ -81,12 +82,14 @@ 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.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; import java.math.BigDecimal; import java.util.*; +import java.util.concurrent.TimeUnit; /** @@ -105,83 +108,64 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl redisTemplate; - @Autowired - private YxStoreCombinationService combinationService; - - @Autowired - private YxStoreSeckillService storeSeckillService; - - @Autowired - private YxStoreBargainService storeBargainService; - - @Autowired - private YxStoreBargainUserService storeBargainUserService; - - @Autowired - private YxStorePinkService pinkService; - - @Autowired - private WxMpTemplateMessageService templateMessageService; - - @Autowired - private YxWechatTemplateService yxWechatTemplateService; - - @Autowired - private YxExpressService expressService; - - @Autowired - private AlipayService alipayService; - - - @Autowired - private MqProducer mqProducer; /** @@ -322,7 +306,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl @@ -28,11 +28,11 @@ import org.springframework.beans.factory.annotation.Autowired; */ @Slf4j @Service +@AllArgsConstructor @Transactional(rollbackFor = Exception.class) public class YxStoreOrderStatusServiceImpl extends BaseServiceImpl implements YxStoreOrderStatusService { - @Autowired - private YxStoreOrderStatusMapper yxStoreOrderStatusMapper; + private final YxStoreOrderStatusMapper yxStoreOrderStatusMapper; @Override public void create(int oid, String changetype, String changeMessage) { diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/web/controller/StoreOrderController.java b/yshop-api/src/main/java/co/yixiang/modules/order/web/controller/StoreOrderController.java index 3e650b02..cce30d0c 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/web/controller/StoreOrderController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/web/controller/StoreOrderController.java @@ -25,10 +25,7 @@ import co.yixiang.modules.order.service.YxStoreOrderCartInfoService; import co.yixiang.modules.order.service.YxStoreOrderService; import co.yixiang.modules.order.service.YxStoreOrderStatusService; import co.yixiang.modules.order.web.dto.*; -import co.yixiang.modules.order.web.param.ExpressParam; -import co.yixiang.modules.order.web.param.OrderParam; -import co.yixiang.modules.order.web.param.PayParam; -import co.yixiang.modules.order.web.param.RefundParam; +import co.yixiang.modules.order.web.param.*; import co.yixiang.modules.order.web.vo.YxStoreOrderQueryVo; import co.yixiang.modules.shop.entity.YxStoreProductReply; import co.yixiang.modules.shop.service.YxStoreCartService; @@ -387,12 +384,10 @@ public class StoreOrderController extends BaseController { @Log(value = "查看订单列表",type = 1) @GetMapping("/order/list") @ApiOperation(value = "订单列表",notes = "订单列表") - public ApiResult> orderList(@RequestParam(value = "type",defaultValue = "0") int type, - @RequestParam(value = "page",defaultValue = "1") int page, - @RequestParam(value = "limit",defaultValue = "10") int limit){ + public ApiResult> orderList(YxStoreOrderQueryParam queryParam){ int uid = SecurityUtils.getUserId().intValue(); - - return ApiResult.ok(storeOrderService.orderList(uid,type,page,limit)); + return ApiResult.ok(storeOrderService.orderList(uid,queryParam.getType().intValue(), + queryParam.getPage().intValue(),queryParam.getLimit().intValue())); } diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/web/param/YxStoreOrderQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/order/web/param/YxStoreOrderQueryParam.java index f45909b1..d369c6fd 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/web/param/YxStoreOrderQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/web/param/YxStoreOrderQueryParam.java @@ -19,4 +19,6 @@ import co.yixiang.common.web.param.QueryParam; @ApiModel(value="YxStoreOrderQueryParam对象", description="订单表查询参数") public class YxStoreOrderQueryParam extends QueryParam { private static final long serialVersionUID = 1L; + + private Integer type = 1; } diff --git a/yshop-api/src/main/java/co/yixiang/modules/security/rest/AuthController.java b/yshop-api/src/main/java/co/yixiang/modules/security/rest/AuthController.java index d363ee2f..db210002 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/security/rest/AuthController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/security/rest/AuthController.java @@ -48,12 +48,13 @@ import com.aliyuncs.CommonResponse; import com.vdurmont.emoji.EmojiParser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken; import me.chanjar.weixin.mp.bean.result.WxMpUser; -import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; @@ -65,7 +66,6 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; -import javax.sound.midi.SoundbankResource; import java.math.BigDecimal; import java.util.Date; import java.util.HashMap; @@ -79,6 +79,7 @@ import java.util.Map; @Slf4j @RestController @Api(tags = "用户授权中心") +@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class AuthController { @Value("${single.login:false}") @@ -98,25 +99,6 @@ public class AuthController { private final WxMaService wxMaService; private final NotifyService notifyService; - public AuthController(SecurityProperties properties, RedisUtils redisUtils, - UserDetailsService userDetailsService, - OnlineUserService onlineUserService, TokenProvider tokenProvider, - AuthenticationManagerBuilder authenticationManagerBuilder, - YxUserService userService, PasswordEncoder passwordEncoder, - YxWechatUserService wechatUserService, - WxMaService wxMaService,NotifyService notifyService) { - this.properties = properties; - this.redisUtils = redisUtils; - this.userDetailsService = userDetailsService; - this.onlineUserService = onlineUserService; - this.tokenProvider = tokenProvider; - this.authenticationManagerBuilder = authenticationManagerBuilder; - this.userService = userService; - this.passwordEncoder = passwordEncoder; - this.wechatUserService = wechatUserService; - this.wxMaService = wxMaService; - this.notifyService = notifyService; - } @Log("H5用户登录") @ApiOperation("H5登录授权") diff --git a/yshop-api/src/main/java/co/yixiang/modules/security/service/UserDetailsServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/security/service/UserDetailsServiceImpl.java index 46b48f4b..7584ae63 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/security/service/UserDetailsServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/security/service/UserDetailsServiceImpl.java @@ -13,20 +13,19 @@ import co.yixiang.exception.ErrorRequestException; import co.yixiang.modules.security.security.vo.JwtUser; import co.yixiang.modules.user.entity.YxUser; import co.yixiang.modules.user.service.YxUserService; +import lombok.AllArgsConstructor; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.Optional; - /** * @author hupeng * @date 2020/01/12 */ @Service("userDetailsService") +@AllArgsConstructor @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) public class UserDetailsServiceImpl implements UserDetailsService { @@ -34,11 +33,6 @@ public class UserDetailsServiceImpl implements UserDetailsService { private final JwtPermissionService permissionService; - public UserDetailsServiceImpl(YxUserService userService,JwtPermissionService permissionService) { - this.userService = userService; - this.permissionService = permissionService; - } - @Override public UserDetails loadUserByUsername(String username){ YxUser user = userService.findByName(username); diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreCategoryService.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreCategoryService.java index 52a14d36..26ea2957 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreCategoryService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreCategoryService.java @@ -33,9 +33,9 @@ public interface YxStoreCategoryService extends BaseService { */ YxStoreCategoryQueryVo getYxStoreCategoryById(Serializable id) throws Exception; - public List getList(); + List getList(); - public List getAllChilds(int catid); + List getAllChilds(int catid); diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/ArticleServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/ArticleServiceImpl.java index 24707e0a..e5c2b1c8 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/ArticleServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/ArticleServiceImpl.java @@ -18,8 +18,8 @@ import co.yixiang.modules.shop.web.vo.YxArticleQueryVo; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,11 +36,11 @@ import java.io.Serializable; */ @Slf4j @Service +@AllArgsConstructor @Transactional(rollbackFor = Exception.class) public class ArticleServiceImpl extends BaseServiceImpl implements ArticleService { - @Autowired - private YxArticleMapper yxArticleMapper; + private final YxArticleMapper yxArticleMapper; @Override public YxArticleQueryVo getYxArticleById(Serializable id) throws Exception{ diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxArticleServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxArticleServiceImpl.java deleted file mode 100644 index a3fc06c5..00000000 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxArticleServiceImpl.java +++ /dev/null @@ -1,61 +0,0 @@ -/** - * Copyright (C) 2018-2019 - * All rights reserved, Designed By www.yixiang.co - * 注意： - * 本软件为www.yixiang.co开发研制，未经购买不得使用 - * 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台） - * 一经发现盗用、分享等行为，将追究法律责任，后果自负 - */ -package co.yixiang.modules.shop.service.impl; - -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.common.web.vo.Paging; -import co.yixiang.modules.shop.entity.YxArticle; -import co.yixiang.modules.shop.mapper.YxArticleMapper; -import co.yixiang.modules.shop.web.param.YxArticleQueryParam; -import co.yixiang.modules.shop.web.vo.YxArticleQueryVo; -import co.yixiang.modules.shop.service.YxArticleService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import java.io.Serializable; - - -/** - *

- * 文章管理表 服务实现类 - *

- * - * @author hupeng - * @since 2019-10-02 - */ -@Slf4j -//@Service -@Transactional(rollbackFor = Exception.class) -public class YxArticleServiceImpl extends BaseServiceImpl implements YxArticleService { - - @Autowired - private YxArticleMapper yxArticleMapper; - - @Override - public YxArticleQueryVo getYxArticleById(Serializable id) throws Exception{ - return yxArticleMapper.getYxArticleById(id); - } - - @Override - public Paging getYxArticlePageList(YxArticleQueryParam yxArticleQueryParam){ - Page page = setPageParam(yxArticleQueryParam,OrderItem.desc("add_time")); - IPage iPage = yxArticleMapper.getYxArticlePageList(page,yxArticleQueryParam); - return new Paging(iPage); - } - - @Override - public void incVisitNum(int id) { - yxArticleMapper.incVisitNum(id); - } -} diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCartServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCartServiceImpl.java index 2a6ff9e1..602c210d 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCartServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCartServiceImpl.java @@ -10,6 +10,7 @@ package co.yixiang.modules.shop.service.impl; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.exception.ErrorRequestException; import co.yixiang.modules.activity.entity.YxStoreBargain; import co.yixiang.modules.activity.entity.YxStoreCombination; @@ -29,28 +30,18 @@ import co.yixiang.modules.shop.mapping.CartMap; import co.yixiang.modules.shop.service.YxStoreCartService; import co.yixiang.modules.shop.service.YxStoreProductAttrService; import co.yixiang.modules.shop.service.YxStoreProductService; -import co.yixiang.modules.shop.web.param.YxStoreCartQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreCartQueryVo; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.common.web.vo.Paging; import co.yixiang.modules.shop.web.vo.YxStoreProductQueryVo; import co.yixiang.modules.user.service.YxUserService; import co.yixiang.utils.OrderUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.util.StringUtil; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import javax.validation.Valid; import java.io.Serializable; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; @@ -68,44 +59,24 @@ import java.util.Map; @Slf4j @Service @Builder +@AllArgsConstructor @Transactional(rollbackFor = Exception.class) public class YxStoreCartServiceImpl extends BaseServiceImpl implements YxStoreCartService { - @Autowired - private YxStoreCartMapper yxStoreCartMapper; + private final YxStoreCartMapper yxStoreCartMapper; + private final YxStoreSeckillMapper storeSeckillMapper; + private final YxStoreBargainMapper yxStoreBargainMapper; + private final YxStoreCombinationMapper storeCombinationMapper; - @Autowired - private YxStoreProductService productService; + private final YxStoreProductService productService; + private final YxStoreProductAttrService productAttrService; + private final YxStoreCombinationService storeCombinationService; + private final YxStoreSeckillService storeSeckillService; + private final YxStoreBargainService storeBargainService; + private final YxStoreOrderService storeOrderService; + private final YxUserService userService; - @Autowired - private YxStoreProductAttrService productAttrService; - - @Autowired - private YxStoreCombinationService storeCombinationService; - - @Autowired - private YxStoreCombinationMapper storeCombinationMapper; - - @Autowired - private YxStoreSeckillService storeSeckillService; - - @Autowired - private YxStoreBargainService storeBargainService; - - @Autowired - private YxStoreOrderService storeOrderService; - - @Autowired - private YxStoreSeckillMapper storeSeckillMapper; - - @Autowired - private YxStoreBargainMapper yxStoreBargainMapper; - - @Autowired - private YxUserService userService; - - @Autowired - private CartMap cartMap; + private final CartMap cartMap; /** * 删除购物车 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java index 619da99b..d7c20607 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java @@ -17,8 +17,8 @@ import co.yixiang.modules.shop.web.vo.YxStoreCategoryQueryVo; import co.yixiang.utils.CateDTO; import co.yixiang.utils.TreeUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,14 +36,13 @@ import java.util.List; */ @Slf4j @Service +@AllArgsConstructor @Transactional(rollbackFor = Exception.class) public class YxStoreCategoryServiceImpl extends BaseServiceImpl implements YxStoreCategoryService { - @Autowired - private YxStoreCategoryMapper yxStoreCategoryMapper; + private final YxStoreCategoryMapper yxStoreCategoryMapper; - @Autowired - private CategoryMap categoryMap; + private final CategoryMap categoryMap; @Override public YxStoreCategoryQueryVo getYxStoreCategoryById(Serializable id) throws Exception{ diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponIssueServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponIssueServiceImpl.java index 0669daa1..c6a5b1db 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponIssueServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponIssueServiceImpl.java @@ -22,10 +22,10 @@ import co.yixiang.modules.shop.web.vo.YxStoreCouponIssueQueryVo; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.web.vo.Paging; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; @@ -44,20 +44,15 @@ import java.util.List; */ @Slf4j @Service +@AllArgsConstructor @Transactional(rollbackFor = Exception.class) public class YxStoreCouponIssueServiceImpl extends BaseServiceImpl implements YxStoreCouponIssueService { - @Autowired - private YxStoreCouponIssueMapper yxStoreCouponIssueMapper; + private final YxStoreCouponIssueMapper yxStoreCouponIssueMapper; + private final YxStoreCouponIssueUserMapper storeCouponIssueUserMapper; - @Autowired - private YxStoreCouponIssueUserMapper storeCouponIssueUserMapper; - - @Autowired - private YxStoreCouponUserService storeCouponUserService; - - @Autowired - private YxStoreCouponIssueUserService storeCouponIssueUserService; + private final YxStoreCouponUserService storeCouponUserService; + private final YxStoreCouponIssueUserService storeCouponIssueUserService; /** * 领取优惠券 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponIssueUserServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponIssueUserServiceImpl.java index 30e21b91..56a798d3 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponIssueUserServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponIssueUserServiceImpl.java @@ -16,10 +16,10 @@ import co.yixiang.modules.shop.web.vo.YxStoreCouponIssueUserQueryVo; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.web.vo.Paging; import co.yixiang.utils.OrderUtil; +import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; @@ -37,11 +37,11 @@ import java.io.Serializable; */ @Slf4j @Service +@AllArgsConstructor @Transactional(rollbackFor = Exception.class) public class YxStoreCouponIssueUserServiceImpl extends BaseServiceImpl implements YxStoreCouponIssueUserService { - @Autowired - private YxStoreCouponIssueUserMapper yxStoreCouponIssueUserMapper; + private final YxStoreCouponIssueUserMapper yxStoreCouponIssueUserMapper; @Override diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponServiceImpl.java index d0ee8c67..a24d8f1c 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponServiceImpl.java @@ -15,10 +15,10 @@ import co.yixiang.modules.shop.web.param.YxStoreCouponQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreCouponQueryVo; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.web.vo.Paging; +import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; @@ -36,11 +36,11 @@ import java.io.Serializable; */ @Slf4j @Service +@AllArgsConstructor @Transactional(rollbackFor = Exception.class) public class YxStoreCouponServiceImpl extends BaseServiceImpl implements YxStoreCouponService { - @Autowired - private YxStoreCouponMapper yxStoreCouponMapper; + private final YxStoreCouponMapper yxStoreCouponMapper; @Override public YxStoreCouponQueryVo getYxStoreCouponById(Serializable id){ diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponUserServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponUserServiceImpl.java index dd479fb0..86c78e86 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponUserServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponUserServiceImpl.java @@ -22,10 +22,10 @@ import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.web.vo.Paging; import co.yixiang.utils.OrderUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; @@ -45,17 +45,15 @@ import java.util.List; */ @Slf4j @Service +@AllArgsConstructor @Transactional(rollbackFor = Exception.class) public class YxStoreCouponUserServiceImpl extends BaseServiceImpl implements YxStoreCouponUserService { - @Autowired - private YxStoreCouponUserMapper yxStoreCouponUserMapper; + private final YxStoreCouponUserMapper yxStoreCouponUserMapper; - @Autowired - private YxStoreCouponService storeCouponService; + private final YxStoreCouponService storeCouponService; - @Autowired - private CouponMap couponMap; + private final CouponMap couponMap; @Override public int getUserValidCouponCount(int uid) { diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrResultServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrResultServiceImpl.java index c358bdbb..416cce3c 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrResultServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrResultServiceImpl.java @@ -15,10 +15,10 @@ import co.yixiang.modules.shop.web.param.YxStoreProductAttrResultQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreProductAttrResultQueryVo; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.web.vo.Paging; +import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; @@ -36,11 +36,11 @@ import java.io.Serializable; */ @Slf4j @Service +@AllArgsConstructor @Transactional(rollbackFor = Exception.class) public class YxStoreProductAttrResultServiceImpl extends BaseServiceImpl implements YxStoreProductAttrResultService { - @Autowired - private YxStoreProductAttrResultMapper yxStoreProductAttrResultMapper; + private final YxStoreProductAttrResultMapper yxStoreProductAttrResultMapper; @Override public YxStoreProductAttrResultQueryVo getYxStoreProductAttrResultById(Serializable id) throws Exception{ diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrServiceImpl.java index 39f6bef5..49f7e530 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrServiceImpl.java @@ -8,6 +8,7 @@ */ package co.yixiang.modules.shop.service.impl; +import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.modules.shop.entity.YxStoreProductAttr; import co.yixiang.modules.shop.entity.YxStoreProductAttrValue; import co.yixiang.modules.shop.mapper.YxStoreProductAttrMapper; @@ -15,23 +16,13 @@ import co.yixiang.modules.shop.mapper.YxStoreProductAttrValueMapper; import co.yixiang.modules.shop.mapping.ProductAttrMap; import co.yixiang.modules.shop.service.YxStoreProductAttrService; import co.yixiang.modules.shop.web.dto.AttrValueDTO; -import co.yixiang.modules.shop.web.param.YxStoreProductAttrQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreProductAttrQueryVo; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.common.web.vo.Paging; -import co.yixiang.modules.shop.web.vo.YxStoreProductAttrValueQueryVo; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.springframework.util.LinkedCaseInsensitiveMap; - -import java.io.Serializable; import java.util.*; @@ -45,17 +36,14 @@ import java.util.*; */ @Slf4j @Service +@AllArgsConstructor @Transactional(rollbackFor = Exception.class) public class YxStoreProductAttrServiceImpl extends BaseServiceImpl implements YxStoreProductAttrService { - @Autowired - private YxStoreProductAttrMapper yxStoreProductAttrMapper; + private final YxStoreProductAttrMapper yxStoreProductAttrMapper; + private final YxStoreProductAttrValueMapper yxStoreProductAttrValueMapper; - @Autowired - private YxStoreProductAttrValueMapper yxStoreProductAttrValueMapper; - - @Autowired - private ProductAttrMap productAttrMap; + private final ProductAttrMap productAttrMap; @Override public void incProductAttrStock(int num, int productId, String unique) { diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrValueServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrValueServiceImpl.java index da90e876..313085c1 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrValueServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrValueServiceImpl.java @@ -15,10 +15,10 @@ import co.yixiang.modules.shop.web.param.YxStoreProductAttrValueQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreProductAttrValueQueryVo; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.web.vo.Paging; +import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; @@ -36,11 +36,11 @@ import java.io.Serializable; */ @Slf4j @Service +@AllArgsConstructor @Transactional(rollbackFor = Exception.class) public class YxStoreProductAttrValueServiceImpl extends BaseServiceImpl implements YxStoreProductAttrValueService { - @Autowired - private YxStoreProductAttrValueMapper yxStoreProductAttrValueMapper; + private final YxStoreProductAttrValueMapper yxStoreProductAttrValueMapper; @Override public YxStoreProductAttrValueQueryVo getYxStoreProductAttrValueById(Serializable id) throws Exception{ diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductRelationServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductRelationServiceImpl.java index 69b6b9cb..845876aa 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductRelationServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductRelationServiceImpl.java @@ -19,10 +19,10 @@ import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.web.vo.Paging; import co.yixiang.utils.OrderUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; @@ -41,11 +41,11 @@ import java.util.List; */ @Slf4j @Service +@AllArgsConstructor @Transactional(rollbackFor = Exception.class) public class YxStoreProductRelationServiceImpl extends BaseServiceImpl implements YxStoreProductRelationService { - @Autowired - private YxStoreProductRelationMapper yxStoreProductRelationMapper; + private final YxStoreProductRelationMapper yxStoreProductRelationMapper; @Override public YxStoreProductRelationQueryVo getYxStoreProductRelationById(Serializable id) throws Exception{ diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java index d0ec5690..bacfc15e 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java @@ -25,9 +25,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -48,11 +48,11 @@ import java.util.stream.Collectors; */ @Slf4j @Service +@AllArgsConstructor @Transactional(rollbackFor = Exception.class) public class YxStoreProductReplyServiceImpl extends BaseServiceImpl implements YxStoreProductReplyService { - @Autowired - private YxStoreProductReplyMapper yxStoreProductReplyMapper; + private final YxStoreProductReplyMapper yxStoreProductReplyMapper; /** * 评价数据 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java index 2245867c..b418fc64 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java @@ -10,33 +10,32 @@ package co.yixiang.modules.shop.service.impl; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.web.vo.Paging; import co.yixiang.exception.ErrorRequestException; -import co.yixiang.modules.shop.entity.YxStoreCategory; import co.yixiang.modules.shop.entity.YxStoreProduct; import co.yixiang.modules.shop.entity.YxStoreProductAttrValue; -import co.yixiang.modules.shop.mapper.YxStoreCategoryMapper; import co.yixiang.modules.shop.mapper.YxStoreProductAttrValueMapper; import co.yixiang.modules.shop.mapper.YxStoreProductMapper; import co.yixiang.modules.shop.mapping.YxStoreProductMap; -import co.yixiang.modules.shop.service.*; +import co.yixiang.modules.shop.service.YxStoreProductAttrService; +import co.yixiang.modules.shop.service.YxStoreProductRelationService; +import co.yixiang.modules.shop.service.YxStoreProductReplyService; +import co.yixiang.modules.shop.service.YxStoreProductService; import co.yixiang.modules.shop.web.dto.ProductDTO; import co.yixiang.modules.shop.web.param.YxStoreProductQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreProductAttrQueryVo; import co.yixiang.modules.shop.web.vo.YxStoreProductQueryVo; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.common.web.vo.Paging; import co.yixiang.modules.user.service.YxUserService; -import co.yixiang.utils.CateDTO; -import co.yixiang.utils.TreeUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + import java.io.Serializable; import java.math.BigDecimal; import java.util.List; @@ -53,29 +52,20 @@ import java.util.Map; */ @Slf4j @Service +@AllArgsConstructor @Transactional(rollbackFor = Exception.class) public class YxStoreProductServiceImpl extends BaseServiceImpl implements YxStoreProductService { - @Autowired - private YxStoreProductMapper yxStoreProductMapper; + private final YxStoreProductMapper yxStoreProductMapper; + private final YxStoreProductAttrValueMapper storeProductAttrValueMapper; - @Autowired - private YxStoreProductMap storeProductMap; + private final YxStoreProductAttrService storeProductAttrService; + private final YxStoreProductRelationService relationService; + private final YxStoreProductReplyService replyService; + private final YxUserService userService; - @Autowired - private YxStoreProductAttrService storeProductAttrService; + private final YxStoreProductMap storeProductMap; - @Autowired - private YxStoreProductRelationService relationService; - - @Autowired - private YxStoreProductReplyService replyService; - - @Autowired - private YxUserService userService; - - @Autowired - private YxStoreProductAttrValueMapper storeProductAttrValueMapper; /** @@ -165,6 +155,7 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl getGoodsList(YxStoreProductQueryParam productQueryParam) { QueryWrapper wrapper = new QueryWrapper<>(); diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemConfigServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemConfigServiceImpl.java index 1d16b82a..6d9d17d2 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemConfigServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemConfigServiceImpl.java @@ -8,23 +8,15 @@ */ package co.yixiang.modules.shop.service.impl; +import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.modules.shop.entity.YxSystemConfig; import co.yixiang.modules.shop.mapper.YxSystemConfigMapper; import co.yixiang.modules.shop.service.YxSystemConfigService; -import co.yixiang.modules.shop.web.param.YxSystemConfigQueryParam; -import co.yixiang.modules.shop.web.vo.YxSystemConfigQueryVo; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.common.web.vo.Paging; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import java.io.Serializable; /** @@ -37,11 +29,11 @@ import java.io.Serializable; */ @Slf4j @Service +@AllArgsConstructor @Transactional(rollbackFor = Exception.class) public class YxSystemConfigServiceImpl extends BaseServiceImpl implements YxSystemConfigService { - @Autowired - private YxSystemConfigMapper yxSystemConfigMapper; + private final YxSystemConfigMapper yxSystemConfigMapper; @Override public String getData(String name) { diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java index f6848b66..77566dd1 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java @@ -8,27 +8,17 @@ */ package co.yixiang.modules.shop.service.impl; +import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.modules.shop.entity.YxSystemGroupData; import co.yixiang.modules.shop.mapper.YxSystemGroupDataMapper; import co.yixiang.modules.shop.service.YxSystemGroupDataService; -import co.yixiang.modules.shop.web.param.YxSystemGroupDataQueryParam; -import co.yixiang.modules.shop.web.vo.YxSystemGroupDataQueryVo; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.common.web.vo.Paging; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import java.io.Serializable; import java.util.ArrayList; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/ArticleController.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/ArticleController.java index 7c409222..39bf73b5 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/ArticleController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/ArticleController.java @@ -17,6 +17,7 @@ import co.yixiang.modules.shop.web.param.YxArticleQueryParam; import co.yixiang.modules.shop.web.vo.YxArticleQueryVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -31,12 +32,12 @@ import org.springframework.web.bind.annotation.*; */ @Slf4j @RestController +@RequiredArgsConstructor(onConstructor = @__(@Autowired)) @RequestMapping("/article") @Api(value = "文章模块", tags = "文章模块", description = "文章模块") public class ArticleController extends BaseController { - @Autowired - private ArticleService articleService; + private final ArticleService articleService; /** @@ -57,15 +58,8 @@ public class ArticleController extends BaseController { @AnonymousAccess @GetMapping("/list") @ApiOperation(value = "文章列表",notes = "文章列表",response = YxArticleQueryVo.class) - public ApiResult> getYxArticlePageList( - @RequestParam(value = "page",defaultValue = "1") int page, - @RequestParam(value = "limit",defaultValue = "10") int limit - ){ - // throw new ErrorRequestException("error"); - YxArticleQueryParam yxArticleQueryParam = new YxArticleQueryParam(); - yxArticleQueryParam.setCurrent(page); - yxArticleQueryParam.setSize(limit); - Paging paging = articleService.getYxArticlePageList(yxArticleQueryParam); + public ApiResult> getYxArticlePageList(YxArticleQueryParam queryParam){ + Paging paging = articleService.getYxArticlePageList(queryParam); return ApiResult.ok(paging.getRecords()); } diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/CouponController.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/CouponController.java index fe1451e1..93d69346 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/CouponController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/CouponController.java @@ -14,6 +14,7 @@ import co.yixiang.common.api.ApiResult; import co.yixiang.common.web.controller.BaseController; import co.yixiang.modules.shop.service.YxStoreCouponIssueService; import co.yixiang.modules.shop.service.YxStoreCouponUserService; +import co.yixiang.modules.shop.web.param.YxStoreCouponQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreCouponUserQueryVo; import co.yixiang.utils.SecurityUtils; import com.alibaba.fastjson.JSON; @@ -50,13 +51,10 @@ public class CouponController extends BaseController { @Log(value = "查看优惠券",type = 1) @GetMapping("/coupons") @ApiOperation(value = "可领取优惠券列表",notes = "可领取优惠券列表") - public ApiResult getList( - @RequestParam(value = "page",defaultValue = "1") int page, - @RequestParam(value = "limit",defaultValue = "10") int limit - ){ - + public ApiResult getList(YxStoreCouponQueryParam queryParam){ int uid = SecurityUtils.getUserId().intValue(); - return ApiResult.ok(couponIssueService.getCouponList(page,limit,uid)); + return ApiResult.ok(couponIssueService.getCouponList(queryParam.getPage().intValue(), + queryParam.getLimit().intValue(),uid)); } /** diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/IndexController.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/IndexController.java index 91bf9737..91eb94d7 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/IndexController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/IndexController.java @@ -13,7 +13,6 @@ import cn.hutool.core.io.resource.ClassPathResource; import co.yixiang.annotation.AnonymousAccess; import co.yixiang.common.api.ApiResult; import co.yixiang.modules.shop.service.YxStoreProductService; -import co.yixiang.modules.shop.service.YxSystemConfigService; import co.yixiang.modules.shop.service.YxSystemGroupDataService; import co.yixiang.utils.FileUtil; import com.alibaba.fastjson.JSON; @@ -44,7 +43,6 @@ import java.util.Map; public class IndexController { private final YxSystemGroupDataService systemGroupDataService; - private final YxSystemConfigService systemConfigService; private final YxStoreProductService storeProductService; @@ -99,7 +97,6 @@ public class IndexController { @ApiOperation(value = "获取图片base64",notes = "获取图片base64") @Deprecated public ApiResult> imageBase64(){ - return ApiResult.ok(null); } diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreCartController.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreCartController.java index 760eb966..b01f016f 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreCartController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreCartController.java @@ -14,6 +14,7 @@ import co.yixiang.common.api.ApiResult; import co.yixiang.common.web.controller.BaseController; import co.yixiang.modules.shop.service.YxStoreCartService; import co.yixiang.modules.shop.web.param.CartIdsParm; +import co.yixiang.modules.shop.web.param.YxStoreCartQueryParam; import co.yixiang.utils.SecurityUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -49,10 +50,10 @@ public class StoreCartController extends BaseController { */ @GetMapping("/cart/count") @ApiOperation(value = "获取数量",notes = "获取数量") - public ApiResult> count(@RequestParam(value = "numType",defaultValue = "0") int numType){ + public ApiResult> count(YxStoreCartQueryParam queryParam){ Map map = new LinkedHashMap<>(); int uid = SecurityUtils.getUserId().intValue(); - map.put("count",storeCartService.getUserCartNum(uid,"product",numType)); + map.put("count",storeCartService.getUserCartNum(uid,"product",queryParam.getNumType().intValue())); return ApiResult.ok(map); } @@ -144,10 +145,6 @@ public class StoreCartController extends BaseController { @ApiOperation(value = "购物车删除产品",notes = "购物车删除产品") public ApiResult cartDel(@Validated @RequestBody CartIdsParm parm){ int uid = SecurityUtils.getUserId().intValue(); -// JSONObject jsonObject = JSON.parseObject(jsonStr); -// if(ObjectUtil.isNull(jsonObject.get("ids"))){ -// ApiResult.fail("参数错误"); -// } storeCartService.removeUserCart(uid, parm.getIds()); return ApiResult.ok("ok"); diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreCategoryController.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreCategoryController.java index e35ef529..e3014c4c 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreCategoryController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreCategoryController.java @@ -16,6 +16,7 @@ import co.yixiang.modules.shop.service.YxStoreCategoryService; import co.yixiang.modules.shop.web.vo.YxStoreCategoryQueryVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -32,10 +33,10 @@ import org.springframework.web.bind.annotation.RestController; @Slf4j @RestController @Api(value = "商品分类", tags = "商品分类", description = "商品分类") +@RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class StoreCategoryController extends BaseController { - @Autowired - private YxStoreCategoryService yxStoreCategoryService; + private final YxStoreCategoryService yxStoreCategoryService; /** @@ -45,7 +46,6 @@ public class StoreCategoryController extends BaseController { @GetMapping("/category") @ApiOperation(value = "商品分类列表",notes = "商品分类列表") public ApiResult> getYxStoreCategoryPageList(){ - return ApiResult.ok(yxStoreCategoryService.getList()); } diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreProductController.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreProductController.java index 3cd9114a..04d4943b 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreProductController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreProductController.java @@ -76,7 +76,6 @@ public class StoreProductController extends BaseController { @GetMapping("/groom/list/{type}") @ApiOperation(value = "获取首页更多产品",notes = "获取首页更多产品") public ApiResult> moreGoodsList(@PathVariable Integer type){ - Map map = new LinkedHashMap<>(); if(type == 1){//TODO 精品推荐 map.put("list",storeProductService.getList(1,20,1)); @@ -98,7 +97,6 @@ public class StoreProductController extends BaseController { @GetMapping("/products") @ApiOperation(value = "商品列表",notes = "商品列表") public ApiResult> goodsList(YxStoreProductQueryParam productQueryParam){ - return ApiResult.ok(storeProductService.getGoodsList(productQueryParam)); } @@ -108,11 +106,9 @@ public class StoreProductController extends BaseController { @AnonymousAccess @GetMapping("/product/hot") @ApiOperation(value = "为你推荐",notes = "为你推荐") - public ApiResult> productRecommend( - @RequestParam(value = "page",defaultValue = "1") int page, - @RequestParam(value = "limit",defaultValue = "10") int limit){ - - return ApiResult.ok(storeProductService.getList(page,limit,1)); + public ApiResult> productRecommend(YxStoreProductQueryParam queryParam){ + return ApiResult.ok(storeProductService.getList(queryParam.getPage().intValue(), + queryParam.getLimit().intValue(),1)); } /** @@ -215,10 +211,9 @@ public class StoreProductController extends BaseController { @GetMapping("/reply/list/{id}") @ApiOperation(value = "获取产品评论",notes = "获取产品评论") public ApiResult replyList(@PathVariable Integer id, - @RequestParam(value = "type",defaultValue = "0") int type, - @RequestParam(value = "page",defaultValue = "1") int page, - @RequestParam(value = "limit",defaultValue = "10") int limit){ - return ApiResult.ok(replyService.getReplyList(id,type,page,limit)); + YxStoreProductQueryParam queryParam){ + return ApiResult.ok(replyService.getReplyList(id,queryParam.getType(), + queryParam.getPage().intValue(),queryParam.getLimit().intValue())); } /** diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreCartQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreCartQueryParam.java index f8d6a732..81c160a8 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreCartQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreCartQueryParam.java @@ -16,4 +16,5 @@ import lombok.Data; public class YxStoreCartQueryParam { private static final long serialVersionUID = 1L; + private Integer numType = 0; } diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductQueryParam.java index 2be521d2..4d16d294 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductQueryParam.java @@ -20,8 +20,7 @@ import co.yixiang.common.web.param.QueryParam; public class YxStoreProductQueryParam extends QueryParam { private static final long serialVersionUID = 1L; - private int page; - private int limit; + private int type; private int sid; private int cid; private int news; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxSystemAttachmentServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxSystemAttachmentServiceImpl.java index 25505233..c683106b 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxSystemAttachmentServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxSystemAttachmentServiceImpl.java @@ -17,10 +17,10 @@ import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.web.vo.Paging; import co.yixiang.utils.OrderUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; @@ -38,11 +38,11 @@ import java.io.Serializable; */ @Slf4j @Service +@AllArgsConstructor @Transactional(rollbackFor = Exception.class) public class YxSystemAttachmentServiceImpl extends BaseServiceImpl implements YxSystemAttachmentService { - @Autowired - private YxSystemAttachmentMapper yxSystemAttachmentMapper; + private final YxSystemAttachmentMapper yxSystemAttachmentMapper; @Override public YxSystemAttachment getInfo(String name) { diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserLevelServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserLevelServiceImpl.java index 576c40db..b216850b 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserLevelServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserLevelServiceImpl.java @@ -23,10 +23,12 @@ import co.yixiang.modules.user.web.vo.YxSystemUserLevelQueryVo; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.web.vo.Paging; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import lombok.AllArgsConstructor; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; @@ -50,13 +52,10 @@ public class YxSystemUserLevelServiceImpl extends BaseServiceImpl implements YxSystemUserTaskService { - @Autowired - private YxSystemUserTaskMapper yxSystemUserTaskMapper; + private final YxSystemUserTaskMapper yxSystemUserTaskMapper; + private final YxUserTaskFinishMapper yxUserTaskFinishMapper; + private final YxUserBillMapper userBillMapper; + private final YxStoreOrderMapper storeOrderMapper; - @Autowired - private SystemUserTaskMap systemUserTaskMap; + private final YxUserTaskFinishService userTaskFinishService; + private final YxUserBillService userBillService; - @Autowired - private YxSystemUserLevelService systemUserLevelService; - - @Autowired - private YxUserTaskFinishMapper yxUserTaskFinishMapper; - - @Autowired - private YxUserBillMapper userBillMapper; - - @Autowired - private YxStoreOrderMapper storeOrderMapper; - - @Autowired - private YxUserTaskFinishService userTaskFinishService; - - @Autowired - private YxUserBillService userBillService; + private final SystemUserTaskMap systemUserTaskMap; /** * 设置任务内容完成情况 diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserAddressServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserAddressServiceImpl.java index 3aaa3547..f8b3abce 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserAddressServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserAddressServiceImpl.java @@ -16,10 +16,10 @@ import co.yixiang.modules.user.web.vo.YxUserAddressQueryVo; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.web.vo.Paging; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; @@ -37,11 +37,11 @@ import java.io.Serializable; */ @Slf4j @Service +@AllArgsConstructor @Transactional(rollbackFor = Exception.class) public class YxUserAddressServiceImpl extends BaseServiceImpl implements YxUserAddressService { - @Autowired - private YxUserAddressMapper yxUserAddressMapper; + private final YxUserAddressMapper yxUserAddressMapper; @Override public YxUserAddressQueryVo getYxUserAddressById(Serializable id){ diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserBillServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserBillServiceImpl.java index 80bd28da..ec00b7df 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserBillServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserBillServiceImpl.java @@ -20,19 +20,16 @@ import co.yixiang.modules.user.web.vo.YxUserBillQueryVo; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.web.vo.Paging; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.io.Serializable; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** @@ -45,14 +42,13 @@ import java.util.Map; */ @Slf4j @Service +@AllArgsConstructor @Transactional(rollbackFor = Exception.class) public class YxUserBillServiceImpl extends BaseServiceImpl implements YxUserBillService { - @Autowired - private YxUserBillMapper yxUserBillMapper; + private final YxUserBillMapper yxUserBillMapper; - @Autowired - private BiillMap biillMap; + private final BiillMap biillMap; /** @@ -110,7 +106,7 @@ public class YxUserBillServiceImpl extends BaseServiceImpl billDTOList = yxUserBillMapper.getBillList(wrapper,pageModel); for (BillDTO billDTO : billDTOList) { QueryWrapper wrapperT = new QueryWrapper<>(); - wrapperT.in("id",billDTO.getIds().split(",")); + wrapperT.in("id",Arrays.asList(billDTO.getIds().split(","))); billDTO.setList(yxUserBillMapper.getUserBillList(wrapperT)); } diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserExtractServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserExtractServiceImpl.java index 0d0e5467..9d7b8864 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserExtractServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserExtractServiceImpl.java @@ -25,10 +25,10 @@ import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.web.vo.Paging; import co.yixiang.modules.user.web.vo.YxUserQueryVo; import co.yixiang.utils.OrderUtil; +import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; @@ -47,17 +47,14 @@ import java.math.BigDecimal; */ @Slf4j @Service +@AllArgsConstructor @Transactional(rollbackFor = Exception.class) public class YxUserExtractServiceImpl extends BaseServiceImpl implements YxUserExtractService { - @Autowired - private YxUserExtractMapper yxUserExtractMapper; + private final YxUserExtractMapper yxUserExtractMapper; - @Autowired - private YxUserService userService; - - @Autowired - private YxUserBillService billService; + private final YxUserService userService; + private final YxUserBillService billService; /** * 开始提现 diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserLevelServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserLevelServiceImpl.java index fe6884b4..370c87c1 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserLevelServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserLevelServiceImpl.java @@ -9,8 +9,8 @@ package co.yixiang.modules.user.service.impl; import cn.hutool.core.util.ObjectUtil; -import co.yixiang.exception.ErrorRequestException; -import co.yixiang.modules.user.entity.YxSystemUserTask; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.web.vo.Paging; import co.yixiang.modules.user.entity.YxUser; import co.yixiang.modules.user.entity.YxUserLevel; import co.yixiang.modules.user.mapper.YxSystemUserTaskMapper; @@ -23,21 +23,19 @@ import co.yixiang.modules.user.web.dto.UserLevelInfoDTO; import co.yixiang.modules.user.web.param.YxUserLevelQueryParam; import co.yixiang.modules.user.web.vo.YxSystemUserLevelQueryVo; import co.yixiang.modules.user.web.vo.YxUserLevelQueryVo; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.common.web.vo.Paging; import co.yixiang.modules.user.web.vo.YxUserQueryVo; import co.yixiang.utils.OrderUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + import java.io.Serializable; -import java.util.List; /** @@ -55,16 +53,13 @@ public class YxUserLevelServiceImpl extends BaseServiceImpl implements YxUserRechargeService { - @Autowired - private YxUserRechargeMapper yxUserRechargeMapper; + private final YxUserRechargeMapper yxUserRechargeMapper; /** diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java index 236ddd22..c6c82c88 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java @@ -63,19 +63,17 @@ public class YxUserServiceImpl extends BaseServiceImpl imp @Autowired private YxStoreOrderService orderService; - @Autowired private YxSystemConfigService systemConfigService; - @Autowired private YxUserBillService billService; - @Autowired private YxUserLevelService userLevelService; - @Autowired private YxStoreCouponUserService storeCouponUserService; + + /** * 返回会员价 * @param price @@ -420,7 +418,7 @@ public class YxUserServiceImpl extends BaseServiceImpl imp @Override public YxUserQueryVo getYxUserById(Serializable id){ YxUserQueryVo userQueryVo = yxUserMapper.getYxUserById(id); - //userQueryVo.setOrderStatusNum(orderService.orderData((int)id)); + userQueryVo.setOrderStatusNum(orderService.orderData((int)id)); return userQueryVo; } diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserSignServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserSignServiceImpl.java index 7533b570..d4c4146c 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserSignServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserSignServiceImpl.java @@ -32,8 +32,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -54,23 +54,19 @@ import java.util.Map; */ @Slf4j @Service +@AllArgsConstructor @Transactional(rollbackFor = Exception.class) public class YxUserSignServiceImpl extends BaseServiceImpl implements YxUserSignService { - @Autowired private YxUserSignMapper yxUserSignMapper; + private YxUserBillMapper userBillMapper; - @Autowired private YxSystemGroupDataService systemGroupDataService; - - @Autowired private YxUserService yxUserService; - - @Autowired private YxUserBillService billService; - @Autowired - private YxUserBillMapper userBillMapper; + + /** diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserTaskFinishServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserTaskFinishServiceImpl.java index aaefc3ce..ebe5ea26 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserTaskFinishServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserTaskFinishServiceImpl.java @@ -17,10 +17,10 @@ import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.web.vo.Paging; import co.yixiang.utils.OrderUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; @@ -38,11 +38,11 @@ import java.io.Serializable; */ @Slf4j @Service +@AllArgsConstructor @Transactional(rollbackFor = Exception.class) public class YxUserTaskFinishServiceImpl extends BaseServiceImpl implements YxUserTaskFinishService { - @Autowired - private YxUserTaskFinishMapper yxUserTaskFinishMapper; + private final YxUserTaskFinishMapper yxUserTaskFinishMapper; /** diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxWechatUserServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxWechatUserServiceImpl.java index 26f6add7..aed04a6b 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxWechatUserServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxWechatUserServiceImpl.java @@ -16,10 +16,10 @@ import co.yixiang.modules.user.web.vo.YxWechatUserQueryVo; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.web.vo.Paging; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; @@ -37,11 +37,11 @@ import java.io.Serializable; */ @Slf4j @Service +@AllArgsConstructor @Transactional(rollbackFor = Exception.class) public class YxWechatUserServiceImpl extends BaseServiceImpl implements YxWechatUserService { - @Autowired - private YxWechatUserMapper yxWechatUserMapper; + private final YxWechatUserMapper yxWechatUserMapper; @Override public YxWechatUser getUserAppInfo(String openid) { diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserAddressController.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserAddressController.java index c885964e..f61f8083 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserAddressController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserAddressController.java @@ -125,16 +125,11 @@ public class UserAddressController extends BaseController { @Log(value = "查看地址",type = 1) @GetMapping("/address/list") @ApiOperation(value = "用户地址列表",notes = "用户地址列表",response = YxUserAddressQueryVo.class) - public ApiResult> getYxUserAddressPageList( - @RequestParam(value = "page",defaultValue = "1") int page, - @RequestParam(value = "limit",defaultValue = "10") int limit){ + public ApiResult> getYxUserAddressPageList(YxUserAddressQueryParam queryParam){ int uid = SecurityUtils.getUserId().intValue(); - YxUserAddressQueryParam yxUserAddressQueryParam = new YxUserAddressQueryParam(); - yxUserAddressQueryParam.setCurrent(page); - yxUserAddressQueryParam.setSize(limit); - yxUserAddressQueryParam.setUid(uid); - yxUserAddressQueryParam.setIsDel(0); - Paging paging = userAddressService.getYxUserAddressPageList(yxUserAddressQueryParam); + queryParam.setUid(uid); + queryParam.setIsDel(0); + Paging paging = userAddressService.getYxUserAddressPageList(queryParam); return ApiResult.ok(paging.getRecords()); } diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserBillController.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserBillController.java index 74490c2e..7a058aa6 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserBillController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserBillController.java @@ -23,6 +23,7 @@ import co.yixiang.modules.user.service.YxUserBillService; import co.yixiang.modules.user.service.YxUserExtractService; import co.yixiang.modules.user.service.YxUserService; import co.yixiang.modules.user.web.param.PromParam; +import co.yixiang.modules.user.web.param.YxUserBillQueryParam; import co.yixiang.modules.user.web.vo.YxUserQueryVo; import co.yixiang.utils.SecurityUtils; import com.alibaba.fastjson.JSON; @@ -110,10 +111,10 @@ public class UserBillController extends BaseController { @Log(value = "查看积分流水",type = 1) @GetMapping("/integral/list") @ApiOperation(value = "积分记录",notes = "积分记录") - public ApiResult userInfo(@RequestParam(value = "page",defaultValue = "1") int page, - @RequestParam(value = "limit",defaultValue = "10") int limit){ + public ApiResult userInfo(YxUserBillQueryParam queryParam){ int uid = SecurityUtils.getUserId().intValue(); - return ApiResult.ok(userBillService.userBillList(uid,page,limit,"integral")); + return ApiResult.ok(userBillService.userBillList(uid,queryParam.getPage().intValue(), + queryParam.getLimit().intValue(),"integral")); } @@ -261,12 +262,11 @@ public class UserBillController extends BaseController { @Log(value = "查看佣金",type = 1) @GetMapping("/spread/commission/{type}") @ApiOperation(value = "推广佣金明细",notes = "推广佣金明细") - public ApiResult spreadCommission(@RequestParam(value = "page",defaultValue = "1") int page, - @RequestParam(value = "limit",defaultValue = "10") int limit, + public ApiResult spreadCommission(YxUserBillQueryParam queryParam, @PathVariable int type){ int uid = SecurityUtils.getUserId().intValue(); - - return ApiResult.ok(userBillService.getUserBillList(page,limit,uid,type)); + return ApiResult.ok(userBillService.getUserBillList(queryParam.getPage().intValue(), + queryParam.getLimit().intValue(),uid,type)); } diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserController.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserController.java index 6e86c9ca..d66abac7 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserController.java @@ -21,6 +21,7 @@ import co.yixiang.modules.user.service.YxUserBillService; import co.yixiang.modules.user.service.YxUserService; import co.yixiang.modules.user.service.YxUserSignService; import co.yixiang.modules.user.web.param.UserEditParam; +import co.yixiang.modules.user.web.param.YxUserSignQueryParam; import co.yixiang.modules.user.web.vo.YxSystemUserLevelQueryVo; import co.yixiang.modules.user.web.vo.YxUserQueryVo; import co.yixiang.utils.SecurityUtils; @@ -70,6 +71,8 @@ public class UserController extends BaseController { @ApiOperation(value = "获取用户信息",notes = "获取用户信息",response = YxUserQueryVo.class) public ApiResult userInfo(){ int uid = SecurityUtils.getUserId().intValue(); + + System.out.println("aa:"+uid); //update count yxUserService.setUserSpreadCount(uid); return ApiResult.ok(yxUserService.getYxUserById(uid)); @@ -149,6 +152,7 @@ public class UserController extends BaseController { @AnonymousAccess @GetMapping("/user/activity") @ApiOperation(value = "获取活动状态",notes = "获取活动状态") + @Deprecated public ApiResult activity(){ Map map = new LinkedHashMap<>(); map.put("is_bargin",false); @@ -190,10 +194,10 @@ public class UserController extends BaseController { */ @GetMapping("/sign/list") @ApiOperation(value = "签到列表",notes = "签到列表") - public ApiResult signList(@RequestParam(value = "page",defaultValue = "1") int page, - @RequestParam(value = "limit",defaultValue = "10") int limit){ + public ApiResult signList(YxUserSignQueryParam queryParam){ int uid = SecurityUtils.getUserId().intValue(); - return ApiResult.ok(userSignService.getSignList(uid,page,limit)); + return ApiResult.ok(userSignService.getSignList(uid,queryParam.getPage().intValue(), + queryParam.getLimit().intValue())); } /** @@ -201,10 +205,10 @@ public class UserController extends BaseController { */ @GetMapping("/sign/month") @ApiOperation(value = "签到列表（年月）",notes = "签到列表（年月）") - public ApiResult signMonthList(@RequestParam(value = "page",defaultValue = "1") int page, - @RequestParam(value = "limit",defaultValue = "10") int limit){ + public ApiResult signMonthList(YxUserSignQueryParam queryParam){ int uid = SecurityUtils.getUserId().intValue(); - return ApiResult.ok(userBillService.getUserBillList(page,limit,uid,5)); + return ApiResult.ok(userBillService.getUserBillList(queryParam.getPage().intValue(), + queryParam.getLimit().intValue(),uid,5)); } /** diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserExtractController.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserExtractController.java index 96bf2464..419099bf 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserExtractController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserExtractController.java @@ -47,7 +47,6 @@ import java.util.Map; @Api(value = "用户提现", tags = "用户提现", description = "用户提现") public class UserExtractController extends BaseController { - private final YxUserExtractService userExtractService; private final YxUserService userService; private final YxSystemConfigService systemConfigService; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserLevelController.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserLevelController.java index 9075fa59..22264c07 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserLevelController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserLevelController.java @@ -38,7 +38,6 @@ import org.springframework.web.bind.annotation.RestController; @Api(value = "用户等级", tags = "用户等级", description = "用户等级") public class UserLevelController extends BaseController { - private final YxUserLevelService userLevelService; private final YxSystemUserLevelService systemUserLevelService; private final YxSystemUserTaskService systemUserTaskService; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserRechargeController.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserRechargeController.java index 8b18a5af..beb1d975 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserRechargeController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserRechargeController.java @@ -40,7 +40,6 @@ import java.util.Map; @Api(value = "用户充值", tags = "用户充值", description = "用户充值") public class UserRechargeController extends BaseController { - private final YxUserRechargeService userRechargeService; /** diff --git a/yshop-api/src/main/java/co/yixiang/modules/wechat/service/impl/WechatTemplateServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/wechat/service/impl/WechatTemplateServiceImpl.java index a63965af..00783cea 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/wechat/service/impl/WechatTemplateServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/wechat/service/impl/WechatTemplateServiceImpl.java @@ -18,8 +18,8 @@ import co.yixiang.modules.wechat.web.vo.YxWechatTemplateQueryVo; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,11 +36,11 @@ import java.io.Serializable; */ @Slf4j @Service +@AllArgsConstructor @Transactional(rollbackFor = Exception.class) public class WechatTemplateServiceImpl extends BaseServiceImpl implements YxWechatTemplateService { - @Autowired - private YxWechatTemplateMapper yxWechatTemplateMapper; + private final YxWechatTemplateMapper yxWechatTemplateMapper; @Override public YxWechatTemplateQueryVo getYxWechatTemplateById(Serializable id) throws Exception{ diff --git a/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java b/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java index 346bd62e..83e9cc98 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java @@ -150,7 +150,7 @@ public class WechatController extends BaseController { * 微信验证消息 */ @AnonymousAccess - @GetMapping("/wechat/serve") + @GetMapping( value = "/wechat/serve",produces = "text/plain;charset=utf-8") @ApiOperation(value = "微信验证消息",notes = "微信验证消息") public String authGet(@RequestParam(name = "signature", required = false) String signature, @RequestParam(name = "timestamp", required = false) String timestamp, diff --git a/yshop-api/src/main/resources/config/application.yml b/yshop-api/src/main/resources/config/application.yml index 58ed5c2d..b8ed6108 100644 --- a/yshop-api/src/main/resources/config/application.yml +++ b/yshop-api/src/main/resources/config/application.yml @@ -30,11 +30,11 @@ spring: open-in-view: true #配置rocketmq -rocketmq: - nameServer: localhost:9876 - producer: - group: yshop-group - sendMessageTimeout: 300000 +#rocketmq: +# nameServer: localhost:9876 +# producer: +# group: yshop-group +# sendMessageTimeout: 300000 diff --git a/yshop-common/src/main/java/co/yixiang/constant/ShopConstants.java b/yshop-common/src/main/java/co/yixiang/constant/ShopConstants.java new file mode 100644 index 00000000..4eb91964 --- /dev/null +++ b/yshop-common/src/main/java/co/yixiang/constant/ShopConstants.java @@ -0,0 +1,27 @@ +package co.yixiang.constant; + +/** + * 商城统一常量 + * @author hupeng + * @since 2020-02-27 + */ +public interface ShopConstants { + + /** + * 订单自动取消时间（分钟） + */ + long ORDER_OUTTIME_UNPAY = 30; + /** + * 订单自动收货时间（天） + */ + long ORDER_OUTTIME_UNCONFIRM = 7; + /** + * redis订单未付款key + */ + String REDIS_ORDER_OUTTIME_UNPAY = "order:unpay:"; + /** + * redis订单收货key + */ + String REDIS_ORDER_OUTTIME_UNCONFIRM = "order:unconfirm:"; + +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreOrderController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreOrderController.java index b3ea1a69..9d024378 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreOrderController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreOrderController.java @@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.annotation.AnonymousAccess; import co.yixiang.aop.log.Log; +import co.yixiang.constant.ShopConstants; import co.yixiang.exception.BadRequestException; import co.yixiang.modules.shop.domain.YxStoreOrder; import co.yixiang.modules.shop.domain.YxStoreOrderStatus; @@ -26,6 +27,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Pageable; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -34,6 +36,7 @@ import org.springframework.web.bind.annotation.*; import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; /** * @author hupeng @@ -52,16 +55,19 @@ public class StoreOrderController { private final YxWechatUserService wechatUserService; private final WxMpTemplateMessageService templateMessageService; private final YxWechatTemplateService yxWechatTemplateService; + private final RedisTemplate redisTemplate; public StoreOrderController(YxStoreOrderService yxStoreOrderService, YxStoreOrderStatusService yxStoreOrderStatusService, YxExpressService yxExpressService, YxWechatUserService wechatUserService, WxMpTemplateMessageService templateMessageService, - YxWechatTemplateService yxWechatTemplateService) { + YxWechatTemplateService yxWechatTemplateService, + RedisTemplate redisTemplate) { this.yxStoreOrderService = yxStoreOrderService; this.yxStoreOrderStatusService = yxStoreOrderStatusService; this.yxExpressService = yxExpressService; this.wechatUserService = wechatUserService; this.templateMessageService = templateMessageService; this.yxWechatTemplateService = yxWechatTemplateService; + this.redisTemplate = redisTemplate; } @GetMapping(value = "/data/count") @@ -211,6 +217,12 @@ public class StoreOrderController { log.info("当前用户不是微信用户不能发送模板消息哦!"); } + //加入redis，7天后自动确认收货 + String redisKey = String.valueOf(StrUtil.format("{}{}", + ShopConstants.REDIS_ORDER_OUTTIME_UNCONFIRM,resources.getId())); + redisTemplate.opsForValue().set(redisKey, resources.getOrderId(), + ShopConstants.ORDER_OUTTIME_UNCONFIRM, TimeUnit.DAYS); + return new ResponseEntity(HttpStatus.NO_CONTENT); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/.idea/misc.xml b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/.idea/misc.xml new file mode 100644 index 00000000..ef004d16 --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/.idea/modules.xml b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/.idea/modules.xml new file mode 100644 index 00000000..3aa62952 --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/.idea/vcs.xml b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/.idea/vcs.xml new file mode 100644 index 00000000..9b0f552c --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/.idea/workspace.xml b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/.idea/workspace.xml new file mode 100644 index 00000000..1fcd9dd7 --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/.idea/workspace.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +