Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer

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

@@ -460,20 +460,6 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
         List<OrderBuyLicenseDTO> licenseListParams = EntityUtil.changeEntityListNew(OrderBuyLicenseDTO.class,
                 orderBuyLicenseDTOList);
 
-        //是否是服务开通操作
-        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(),
                 licenseListParams, basicParams.getPrice(), basicParams.isCommitFlag(), null);

gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/EnterpriseController.java

@@ -659,6 +659,7 @@ public class EnterpriseController {
         return ResultControllerUtils.commonResult(enterpriseInitApiService.completeMemberIndex(enterpriseId, UserUtils.getUser().getId(), UserUtils.getUser().getRealName()));
     }
 
+    @Deprecated
     @RequestMapping("/init-goods-index")
     public RestResponse completeGoodsIndex(Integer enterpriseId) {
         return ResultControllerUtils.commonResult(enterpriseInitApiService.completeGoodsIndex(enterpriseId));