diff --git a/src/main/java/cn/chjyj/szwh/Interceptor/ChInterceptor.java b/src/main/java/cn/chjyj/szwh/Interceptor/ChInterceptor.java index 795c0a3..2450c0e 100644 --- a/src/main/java/cn/chjyj/szwh/Interceptor/ChInterceptor.java +++ b/src/main/java/cn/chjyj/szwh/Interceptor/ChInterceptor.java @@ -46,9 +46,10 @@ public class ChInterceptor implements HandlerInterceptor { else { // 执行认证 if (token == null) { + log.error("header token为空"); throw new ChException("token为空,token为必须参数"); }else{ - + log.info("token正常"); } //log.info("token:"+token); DecodedJWT decode = JWT.decode(token); diff --git a/src/main/java/cn/chjyj/szwh/job/OrderJob.java b/src/main/java/cn/chjyj/szwh/job/OrderJob.java index 5eef397..0eb7145 100644 --- a/src/main/java/cn/chjyj/szwh/job/OrderJob.java +++ b/src/main/java/cn/chjyj/szwh/job/OrderJob.java @@ -19,6 +19,7 @@ public class OrderJob extends QuartzJobBean { private static Log log = LogFactory.getLog(SzwhRevocationGoodsJob.class); @Autowired private OrderTaskService orderTaskService; + @Override protected void executeInternal(JobExecutionContext context) throws JobExecutionException { Calendar cal = Calendar.getInstance(); @@ -27,5 +28,10 @@ public class OrderJob extends QuartzJobBean { log.info("关闭超时(30min未付款)订单:"+nowstr); // orderTaskService.closeOrderTimeout(); + try{ + Thread.sleep(100); + }catch (Exception ex){ + log.error("订单线程错误:"+ex.getStackTrace()); + } } } diff --git a/src/main/java/cn/chjyj/szwh/service/impl/GoodsTaskServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/GoodsTaskServiceImpl.java index 9d2219f..b0325b4 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/GoodsTaskServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/GoodsTaskServiceImpl.java @@ -5,7 +5,6 @@ import cn.chjyj.szwh.bean.OperationLog; import cn.chjyj.szwh.mapper.GoodsMapper; import cn.chjyj.szwh.mapper.OperationLogMapper; import cn.chjyj.szwh.service.GoodsTaskService; -import cn.chjyj.szwh.utils.RequestUtils; import cn.chjyj.szwh.utils.SzwhApiUtils; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; @@ -25,6 +24,9 @@ public class GoodsTaskServiceImpl implements GoodsTaskService { @Autowired private OperationLogMapper operationLogMapper; + /** + * 获取撤销的商品列表 + */ @Override public void getRevocationGoods() { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -33,8 +35,6 @@ public class GoodsTaskServiceImpl implements GoodsTaskService { //JSONObject dataJson = recvjson.getJSONObject("data"); String datajsonStr= recvjson.getString("data"); if(StringUtils.isNotBlank(datajsonStr)){ - JSONObject dataJson = recvjson.getJSONObject("data"); - //if(!dataJson.isEmpty()){ JSONArray jsonArray = JSONArray.parseArray(datajsonStr); for(int i=0;i