diff --git a/dxhy-consumer/src/main/java/com/dxhy/entrance/dxhyconsumer/aop/SimsOrderSysLogAspect.java b/dxhy-consumer/src/main/java/com/dxhy/entrance/dxhyconsumer/aop/SimsOrderSysLogAspect.java index 3f5096b..a4cf938 100644 --- a/dxhy-consumer/src/main/java/com/dxhy/entrance/dxhyconsumer/aop/SimsOrderSysLogAspect.java +++ b/dxhy-consumer/src/main/java/com/dxhy/entrance/dxhyconsumer/aop/SimsOrderSysLogAspect.java @@ -9,6 +9,7 @@ import com.dxhy.base.thirdservice.module.thirdservice.itax.model.SysLogEntity; import com.dxhy.order.baseservice.annotation.SysLog; import com.dxhy.order.baseservice.constant.NsrQueueEnum; import com.dxhy.order.baseservice.constant.OrderEnum; +import com.dxhy.order.consumer.modules.bespoke.config.datasource.config.DynamicContextHolder; import com.dxhy.order.invoice.module.rabbitmq.model.RabbitMqCommonMessage; import com.dxhy.order.invoice.module.rabbitmq.service.RabbitMqSendMessageService; import lombok.extern.slf4j.Slf4j; @@ -59,6 +60,7 @@ public class SimsOrderSysLogAspect { public Object around(ProceedingJoinPoint point) throws Throwable { long beginTime = System.currentTimeMillis(); + DynamicContextHolder.push(com.dxhy.management.common.constant.ConfigureConstant.MAIN); //执行方法 Object result = point.proceed(); //执行时长(毫秒) diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/controller/OrderHandleController.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/controller/OrderHandleController.java index 27b10b1..deef661 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/controller/OrderHandleController.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/controller/OrderHandleController.java @@ -192,6 +192,8 @@ public class OrderHandleController { } catch (Exception e){ log.error("{}保存订单异常", LOGGER_MSG, e); return R.error("保存订单异常请联系运维人员"); + }finally { + DynamicContextHolder.push(com.dxhy.management.common.constant.ConfigureConstant.MAIN); } diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java index f2ff18b..dde8dea 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java @@ -93,26 +93,34 @@ public class SkOrderServiceImpl implements OrderService { public R orderRead(ReqParam reqParam) { - DynamicContextHolder.push(reqParam.getNsrsbh()); - List skOrderInfoList = skOrderMapper.findOrderHeadList(reqParam); - log.debug("查询到订单数据:{}", JSON.toJSONString(skOrderInfoList)); - int count = ConfigureConstant.INT_0; - if (CollectionUtils.isNotEmpty(skOrderInfoList)) { - for (SkOrderInfo skOrderInfo : skOrderInfoList) { + try { + DynamicContextHolder.push(reqParam.getNsrsbh()); + List skOrderInfoList = skOrderMapper.findOrderHeadList(reqParam); + log.debug("查询到订单数据:{}", JSON.toJSONString(skOrderInfoList)); - DynamicContextHolder.push(reqParam.getNsrsbh()); - List skOrderItemInfoList = skOrderMapper.findOrderDetailList(skOrderInfo.getXsddm()); - log.debug("查询到订单明细数据:{}", JSON.toJSONString(skOrderItemInfoList)); + if (CollectionUtils.isNotEmpty(skOrderInfoList)) { + for (SkOrderInfo skOrderInfo : skOrderInfoList) { - if (CollectionUtils.isNotEmpty(skOrderItemInfoList)) { - DynamicContextHolder.push(ConfigureConstant.MAIN); - count += saveOrder(skOrderInfo, skOrderItemInfoList, reqParam); + DynamicContextHolder.push(reqParam.getNsrsbh()); + List skOrderItemInfoList = skOrderMapper.findOrderDetailList(skOrderInfo.getXsddm()); + log.debug("查询到订单明细数据:{}", JSON.toJSONString(skOrderItemInfoList)); - } + if (CollectionUtils.isNotEmpty(skOrderItemInfoList)) { + DynamicContextHolder.push(ConfigureConstant.MAIN); + count += saveOrder(skOrderInfo, skOrderItemInfoList, reqParam); + } + + } } + }catch (Exception e) { + log.error("订单读取异常", e); + return R.error("订单读取异常"); + } finally { + DynamicContextHolder.push(ConfigureConstant.MAIN); } + return R.ok("成功读取" + count + "条订单数据"); } diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceDataServiceImpl.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceDataServiceImpl.java index f7500c4..b47104d 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceDataServiceImpl.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceDataServiceImpl.java @@ -112,9 +112,9 @@ public class InvoiceDataServiceImpl implements InvoiceDataService { commonTsMqData.setNsrsbh(orderInvoiceInfo.getXhfNsrsbh()); commonTsMqData.setEntId(orderInvoiceInfo.getEntId()); commonTsMqData.setFpTsMqData(fpTsMqData); -// rabbitMqSendMessageService.autoSendRabbitMqMessageForBusiness(NsrQueueEnum.PUSH_MESSAGE.getValue(), JsonUtils.getInstance().toJsonString(commonTsMqData)); + rabbitMqSendMessageService.autoSendRabbitMqMessageForBusiness(NsrQueueEnum.PUSH_MESSAGE.getValue(), JsonUtils.getInstance().toJsonString(commonTsMqData)); - orderHandleService.backMsg(JSON.toJSONString(commonTsMqData)); +// orderHandleService.backMsg(JSON.toJSONString(commonTsMqData)); successCount++; }