cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

redssion move

Browse Source
This commit is contained in:
hupeng
2019-12-08 20:24:36 +08:00
parent 907c0e7d97
commit 8dcfbd0a7a
5 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
View File

@ -1,10 +1,7 @@
package co.yixiang.modules.order.service.impl;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.*;
import co.yixiang.common.constant.CacheKey;
import co.yixiang.common.constant.CommonConstant;
import co.yixiang.exception.ErrorRequestException;
import co.yixiang.modules.activity.service.YxStoreCombinationService;
@ -40,17 +37,13 @@ import co.yixiang.modules.shop.service.YxStoreProductService;
import co.yixiang.modules.shop.service.YxSystemConfigService;
import co.yixiang.modules.shop.web.vo.YxStoreCartQueryVo;
//import co.yixiang.modules.task.CancelOrderService;
import co.yixiang.modules.task.CancelOrderService;
import co.yixiang.modules.user.entity.*;
import co.yixiang.modules.user.mapper.YxUserMapper;
import co.yixiang.modules.user.service.*;
import co.yixiang.modules.user.web.controller.UserAddressController;
import co.yixiang.modules.user.web.vo.YxUserAddressQueryVo;
import co.yixiang.modules.user.web.vo.YxUserQueryVo;
import co.yixiang.modules.user.web.vo.YxWechatUserQueryVo;
//import co.yixiang.redisson.DelayJob;
//import co.yixiang.redisson.DelayJobService;
import co.yixiang.redisson.DelayJobService;
import co.yixiang.modules.task.DelayJobService;
import co.yixiang.utils.OrderUtil;
import co.yixiang.utils.RedisUtil;
import com.alibaba.fastjson.JSON;
@ -67,8 +60,6 @@ import lombok.extern.slf4j.Slf4j;
//import org.redisson.api.RQueue;
//import org.redisson.api.RedissonClient;
//import org.apache.webservice.config.annotation.Service;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.beans.factory.annotation.Autowired;
@ -77,13 +68,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import javax.jws.WebService;
import java.io.Serializable;
import java.lang.reflect.Array;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.*;
import java.util.concurrent.TimeUnit;
/**

1
yshop-api/src/main/java/co/yixiang/modules/task/CancelOrderService.java
View File

@ -3,7 +3,6 @@ package co.yixiang.modules.task;
import cn.hutool.core.util.ObjectUtil;
import co.yixiang.modules.order.entity.YxStoreOrder;
import co.yixiang.modules.order.service.YxStoreOrderService;
import co.yixiang.redisson.ExecuteJob;
import co.yixiang.utils.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j;

3
yshop-common/src/main/java/co/yixiang/redisson/DelayJobService.java → yshop-api/src/main/java/co/yixiang/modules/task/DelayJobService.java
View File

@ -1,6 +1,5 @@
package co.yixiang.redisson;
package co.yixiang.modules.task;
import org.redisson.api.RBlockingQueue;
import org.redisson.api.RDelayedQueue;
import org.redisson.api.RQueue;
import org.redisson.api.RedissonClient;

2
yshop-common/src/main/java/co/yixiang/redisson/ExecuteJob.java → yshop-api/src/main/java/co/yixiang/modules/task/ExecuteJob.java
View File

@ -1,4 +1,4 @@
package co.yixiang.redisson;
package co.yixiang.modules.task;
import java.util.Map;

2
yshop-common/src/main/java/co/yixiang/redisson/JobTimer.java → yshop-api/src/main/java/co/yixiang/modules/task/JobTimer.java
View File

@ -1,4 +1,4 @@
package co.yixiang.redisson;
package co.yixiang.modules.task;
import org.redisson.api.RBlockingQueue;
import org.redisson.api.RDelayedQueue;