Commit 3a04bfb5 by 张洪旺

Merge remote-tracking branch 'origin/qa' into qa

parents bab92061 f98ef596
...@@ -413,7 +413,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -413,7 +413,7 @@ public class OrderServiceImpl implements Orderservice {
dto.setPartnerId(partnerId); dto.setPartnerId(partnerId);
dto.setStoreId(storeId); dto.setStoreId(storeId);
dto.setTrackingNo(LogThreadLocal.getTrackingNo()); dto.setTrackingNo(LogThreadLocal.getTrackingNo());
paymentQueueService.paymentCallback(dto); //paymentQueueService.paymentCallback(dto);
} catch (Exception e) { } catch (Exception e) {
log.info("paymentQueueService.paymentCallback" + dto + " error" + e); log.info("paymentQueueService.paymentCallback" + dto + " error" + e);
} }
...@@ -435,7 +435,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -435,7 +435,7 @@ public class OrderServiceImpl implements Orderservice {
dto.setStoreId(storeId); dto.setStoreId(storeId);
dto.setPayChannelType(payChanelType); dto.setPayChannelType(payChanelType);
dto.setTrackingNo(LogThreadLocal.getTrackingNo()); dto.setTrackingNo(LogThreadLocal.getTrackingNo());
paymentQueueService.paymentCallback(dto); //paymentQueueService.paymentCallback(dto);
} catch (Exception e) { } catch (Exception e) {
log.info("paymentQueueService.paymentCallback" + dto + " error" + e); log.info("paymentQueueService.paymentCallback" + dto + " error" + e);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment