循环依赖test

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/BillingOrderServiceImpl.java

@@ -26,7 +26,7 @@ import com.gic.enterprise.service.BillingOrderService;
 import com.gic.enterprise.utils.CreateRandomUtils;
 import com.github.pagehelper.Page;
 
-@Service
+@Service("billingOrderService")
 public class BillingOrderServiceImpl implements BillingOrderService {
 
     private Logger logger = LogManager.getLogger(BillingOrderServiceImpl.class);

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/BillingRechargeRecordServiceImpl.java

@@ -24,7 +24,7 @@ import com.github.pagehelper.PageHelper;
  * @author zhiwj
  * @date 2019/8/15 17:05
  */
-@Service
+@Service("billingRechargeRecordService")
 public class BillingRechargeRecordServiceImpl implements BillingRechargeRecordService {
 
     @Autowired

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/BillingAccountApiServiceImpl.java

@@ -48,9 +48,8 @@ public class BillingAccountApiServiceImpl implements BillingAccountApiService {
     private TodoItemApiService todoItemApiService;
     @Autowired
     private UserApiService userApiService;
-//    @Autowired
-//    private BillingOrderApiService billingOrderApiService;
-
+    @Autowired
+    private BillingOrderApiService billingOrderApiService;
     @Autowired
     private Config config;
 
@@ -186,10 +185,10 @@ public class BillingAccountApiServiceImpl implements BillingAccountApiService {
                             itemDTO.setPackageHours(packageHoursEnum.getMessage());
                         }
                     }
-//                    ServiceResponse<Integer> orderResponse = billingOrderApiService.saveSmsOrderBuyNow(orderDTO, itemDTO);
-//                    //订购短信套餐包
-//                    billingOrderApiService.
-//                            paySmsPackageOrder(enterpriseId, orderResponse.getResult(), PayTypeEnum.BALANCE_PAY.getCode(), null);
+                    ServiceResponse<Integer> orderResponse = billingOrderApiService.saveSmsOrderBuyNow(orderDTO, itemDTO);
+                    //订购短信套餐包
+                    billingOrderApiService.
+                            paySmsPackageOrder(enterpriseId, orderResponse.getResult(), PayTypeEnum.BALANCE_PAY.getCode(), null);
                 }
             }
         } else {