Skip to content

O
order-group
Commit 750cfbf0 by 查志伟
Options

合并冲突解决

parent 94506312
Showing with 0 additions and 3 deletions
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
...@@ -75,7 +75,6 @@ import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustome ...@@ -75,7 +75,6 @@ import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustome
import com.freemud.api.assortment.datamanager.meal.MealCacheManager; import com.freemud.api.assortment.datamanager.meal.MealCacheManager;
import com.freemud.application.sdk.api.constant.ResponseConstant; import com.freemud.application.sdk.api.constant.ResponseConstant;
import com.freemud.application.sdk.api.constant.ResponseResultEnum; import com.freemud.application.sdk.api.constant.ResponseResultEnum;
import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.application.sdk.api.log.ErrorLog; import com.freemud.application.sdk.api.log.ErrorLog;
import com.freemud.application.sdk.api.log.LogThreadLocal; import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.ordercenter.common.OrderAndShoppingCommonRedisKey; import com.freemud.application.sdk.api.ordercenter.common.OrderAndShoppingCommonRedisKey;
...@@ -263,8 +262,6 @@ public class OrderServiceImpl implements Orderservice { ...@@ -263,8 +262,6 @@ public class OrderServiceImpl implements Orderservice {
@Autowired @Autowired
private PayServiceImpl payServiceImpl; private PayServiceImpl payServiceImpl;
@Autowired @Autowired
private ComPayClient comPayClient;
@Autowired
private MicroOpenplatformClient microOpenplatformClient; private MicroOpenplatformClient microOpenplatformClient;
......
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