冲突类名修改

shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/DeliveryService.java → shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/DeliveryServiceImpl.java

@@ -31,7 +31,7 @@ import java.util.List;
 import java.util.Objects;
 
 @Service
-public class DeliveryService {
+public class DeliveryServiceImpl {
 
     @Autowired
     private CustomerManager customerManager;

shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/PlatformAddGoodsService.java

@@ -9,8 +9,6 @@ import cn.freemud.demo.entities.bo.store.GetStoreBO;
 import cn.freemud.demo.manager.customer.CustomerManager;
 import cn.freemud.demo.manager.product.ProductManager;
 import cn.freemud.demo.manager.store.StoreManager;
-import cn.freemud.demo.service.impl.AbstractAddGoodsService;
-import cn.freemud.demo.service.impl.DeliveryService;
 import cn.freemud.entities.dto.CheckSpqInfoRequestDto;
 import cn.freemud.entities.dto.CheckSpqInfoResponseDto;
 import cn.freemud.entities.vo.*;
@@ -41,7 +39,7 @@ public class PlatformAddGoodsService extends AbstractAddGoodsService {
     private ProductManager productManager;
 
     @Autowired
-    private DeliveryService deliveryService;
+    private DeliveryServiceImpl deliveryService;
     @Autowired
     private CouponService couponService;
 

shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/PlatformApportionService.java

@@ -7,15 +7,12 @@ import cn.freemud.demo.entities.bo.goods.*;
 import cn.freemud.demo.entities.bo.promotion.GetCalculationDiscountBO;
 import cn.freemud.demo.entities.bo.store.GetStoreBO;
 import cn.freemud.demo.manager.product.ProductManager;
-import cn.freemud.demo.service.impl.AbstractApportionService;
-import cn.freemud.demo.service.impl.DeliveryService;
 import cn.freemud.entities.dto.CheckSpqInfoRequestDto;
 import cn.freemud.entities.dto.CheckSpqInfoResponseDto;
 import cn.freemud.entities.vo.ActivityClassifyCouponBean;
 import cn.freemud.entities.vo.CartGoods;
 import cn.freemud.entities.vo.ShoppingCartInfoRequestVo;
 import cn.freemud.enums.*;
-import cn.freemud.interceptor.ServiceException;
 import cn.freemud.service.CouponService;
 import cn.freemud.utils.PropertyConvertUtil;
 import com.freemud.application.sdk.api.log.ApiLog;
@@ -44,7 +41,7 @@ public class PlatformApportionService extends AbstractApportionService {
 
 
     @Autowired
-    private DeliveryService deliveryService;
+    private DeliveryServiceImpl deliveryService;
 
     @Autowired
     private CouponAdapter couponAdapter;

shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/PlatformListCartGoodsService.java

@@ -11,9 +11,6 @@ import cn.freemud.demo.entities.bo.store.GetStoreBO;
 import cn.freemud.demo.manager.customer.CustomerManager;
 import cn.freemud.demo.manager.product.ProductManager;
 import cn.freemud.demo.manager.store.StoreManager;
-import cn.freemud.demo.service.impl.AbstractListCartGoodsService;
-import cn.freemud.demo.service.impl.DeliveryService;
-import cn.freemud.entities.dto.ActivityCalculationDiscountResponseDto;
 import cn.freemud.entities.dto.CheckSpqInfoRequestDto;
 import cn.freemud.entities.dto.CheckSpqInfoResponseDto;
 import cn.freemud.entities.vo.ActivityClassifyCouponBean;
@@ -21,7 +18,6 @@ import cn.freemud.entities.vo.CartGoods;
 import cn.freemud.entities.vo.CouponPromotionVO;
 import cn.freemud.entities.vo.ShoppingCartInfoRequestVo;
 import cn.freemud.enums.*;
-import cn.freemud.interceptor.ServiceException;
 import cn.freemud.service.CouponService;
 import cn.freemud.utils.PropertyConvertUtil;
 import com.freemud.application.sdk.api.log.ApiLog;
@@ -57,7 +53,7 @@ public class PlatformListCartGoodsService extends AbstractListCartGoodsService {
 
 
     @Autowired
-    private DeliveryService deliveryService;
+    private DeliveryServiceImpl deliveryService;
 
     @Autowired
     private CouponAdapter couponAdapter;