Commit 376e8862 by 查志伟

Merge branch 'feature/v1.0.14' into develop

parents 6d834bcd e4f15ceb
...@@ -44,6 +44,7 @@ import org.apache.commons.collections4.MapUtils; ...@@ -44,6 +44,7 @@ import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.text.MessageFormat; import java.text.MessageFormat;
...@@ -140,6 +141,7 @@ public class OrderAdapterServiceImpl { ...@@ -140,6 +141,7 @@ public class OrderAdapterServiceImpl {
private SellCouponOrderServiceImpl sellCouponOrderServiceImpl; private SellCouponOrderServiceImpl sellCouponOrderServiceImpl;
@Autowired @Autowired
private ApolloVariableConfig apolloVariable; private ApolloVariableConfig apolloVariable;
@Lazy
@Autowired @Autowired
private CashierOrderService cashierOrderService; private CashierOrderService cashierOrderService;
@Autowired @Autowired
......
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