当有商品license且没有商品权限的时候，开通服务给一默认的商品9个，否则无法订购

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

@@ -449,24 +449,20 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
         List<com.gic.enterprise.dto.market.OrderBuyLicenseDTO> orderBuyLicenseDTOList = basicParams.getLicenseList();
         List<OrderBuyLicenseDTO> licenseListParams = EntityUtil.changeEntityListNew(OrderBuyLicenseDTO.class,
                 orderBuyLicenseDTOList);
-//        if (basicParams.getOrderType() != null && basicParams.getOrderType().intValue() == 4
-//                && CollectionUtils.isEmpty(licenseListParams)) {
-//            //扩容
-//            if (!basicParams.isCommitFlag()) {
-//                //获取基本数据信息
-//                List<EnterpriseLicenseDTO> gicLicenseList = enterpriseLicenseService
-//                        .listByEnterpriseId(basicParams.getEnterpriseId().intValue());
-//                if (CollectionUtils.isNotEmpty(gicLicenseList)) {
-//                    licenseListParams = new ArrayList<>();
-//                    for (EnterpriseLicenseDTO licenseDTO : gicLicenseList) {
-//                        OrderBuyLicenseDTO temp = new OrderBuyLicenseDTO();
-//                        temp.setLicenseId(licenseDTO.getLicenseId());
-//                        temp.setNum(licenseDTO.getUpperLimit());
-//                        licenseListParams.add(temp);
-//                    }
-//                }
-//            }
-//        }
+
+        //是否是服务开通操作
+        boolean isOpenService = basicParams.getOrderType() != null && basicParams.getOrderType() == 1;
+        if (isOpenService && !hasGoodsAuth) {
+            //没有商品权限
+            Long goodsLicenseId = getGoodsLicenseId(basicParams.getEnterpriseId(), basicParams.getOrderType());
+            if (goodsLicenseId != null) {
+                //有商品license，给一个默认的商品license 9个
+                OrderBuyLicenseDTO orderBuyLicenseDTO = new OrderBuyLicenseDTO();
+                orderBuyLicenseDTO.setNum(9);
+                orderBuyLicenseDTO.setLicenseId(goodsLicenseId);
+                licenseListParams.add(orderBuyLicenseDTO);
+            }
+        }
 
         ServiceResponse<OrderCheckDTO> result = orderPurchaseApiService.buyForGic(basicParams.getEnterpriseId(),
                 basicParams.getName(), basicParams.getSkuId(), basicParams.getCouponLogId(), basicParams.getOrderType(),
@@ -694,4 +690,28 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
         return id.toString();
     }
 
+    private Long getGoodsLicenseId(Long enterpriseId, Integer orderType) {
+        ServiceResponse<OrderCheckDTO> result = orderPurchaseApiService.buyForGic(enterpriseId,
+                null, null,null, orderType,
+                null, null,false, null);
+        if (result.isSuccess()) {
+            OrderCheckDTO orderClerk = result.getResult();
+            OrderDTO orderDTO = orderClerk.getOrderDTO();
+            if (orderClerk.getCanBuy().intValue() == 0) {
+                return null;
+            }
+            List<OrderItemDTO> orderItemList = orderDTO.getOrderItemList();
+            for (OrderItemDTO orderItem : orderItemList) {
+                Integer serviceType = orderItem.getServeType();
+                if (serviceType == 2) {
+                    //license
+                    if (LicenseUtils.isGoodsLicense(orderItem.getLicenseDetail().getLicenseCode())) {
+                        return orderItem.getServeId();
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
 }