Merge branch 'developer' into 'master'

企业id写死bug

See merge request !4

src/main/java/com/gic/plug/web/controller/ScreeningController.java

@@ -50,14 +50,6 @@ public class ScreeningController {
     private EsScreeningInitService esScreeningInitService;
     @Autowired
     private EsScreeningTemplateService esScreeningTemplateService;
-    @Autowired
-    private StrategyInit strategyInit;
-    @Autowired
-    private StoreWidgetApiService storeWidgetApiService;
-    @Autowired
-    private UserResourceApiService userResourceApiService;
-    @Autowired
-    private ResourceApiService resourceApiService;
 
     /**
      * @return
@@ -90,7 +82,7 @@ public class ScreeningController {
         }
         if (Constant.ERP_GOODS_SCREEN.equals(sceneCode) || Constant.WEIMOB_GOODS_SCREEN.equals(sceneCode)) {
             //TODO
-            enterpriseId = "goods-test-1129";
+            enterpriseId = "goods-test-"+enterpriseId;
         }
         List<EsScreeningEnterpriseCategorySceneInfoDTO> list = this.esScreeningInitService
                 .queryEsScreeningByEnterpriseAndScene(enterpriseId, sceneCode);

src/main/java/com/gic/plug/web/controller/goods/AppletConfigGoodsController.java

@@ -68,17 +68,17 @@ public class AppletConfigGoodsController extends BaseGoodsController {
     public RestResponse getMallCordList(String appConfigId, Long shopId) {
         Long areaId = null;
         if (StringUtils.isNotBlank(appConfigId)) {
-            ServiceResponse<AppletsConfigSimpleOutputDTO> appServiceResponse = appletsConfigApiService.selectAppletsConfigIdByAppId(appConfigId, 1129);
+            ServiceResponse<AppletsConfigSimpleOutputDTO> appServiceResponse = appletsConfigApiService.selectAppletsConfigIdByAppId(appConfigId, getEnterpriseId());
             if (appServiceResponse.getResult() == null) {
                 return RestResponse.failure(ErrorCodeEnums.MAll_ERR.getCode(), "小程序不存在");
             }
-            ServiceResponse<ShopDTO> shopDTOServiceResponse = shopApiService.getShopByAppletId(appServiceResponse.getResult().getAppletConfigId(), 1129, 1);
+            ServiceResponse<ShopDTO> shopDTOServiceResponse = shopApiService.getShopByAppletId(appServiceResponse.getResult().getAppletConfigId(), getEnterpriseId(), 1);
             if (shopDTOServiceResponse.getResult() == null) {
                 return RestResponse.failure(ErrorCodeEnums.MAll_ERR.getCode(), "不存在店铺");
             }
             areaId = shopDTOServiceResponse.getResult().getAreaId();
         } else if (shopId != null) {
-            ServiceResponse<ShopDTO> shopDTOServiceResponse = shopApiService.getShopDetailsById(shopId, 1129);
+            ServiceResponse<ShopDTO> shopDTOServiceResponse = shopApiService.getShopDetailsById(shopId, getEnterpriseId());
             if (shopDTOServiceResponse.getResult() == null) {
                 return RestResponse.failure(ErrorCodeEnums.MAll_ERR.getCode(), "不存在店铺");
             }
@@ -104,18 +104,18 @@ public class AppletConfigGoodsController extends BaseGoodsController {
                                            Long shopId) {
         Long areaId = null;
         if (StringUtils.isNotBlank(appConfigId)) {
-            ServiceResponse<AppletsConfigSimpleOutputDTO> appServiceResponse = appletsConfigApiService.selectAppletsConfigIdByAppId(appConfigId, 1129);
+            ServiceResponse<AppletsConfigSimpleOutputDTO> appServiceResponse = appletsConfigApiService.selectAppletsConfigIdByAppId(appConfigId, getEnterpriseId());
             if (appServiceResponse.getResult() == null) {
                 return RestResponse.failure(ErrorCodeEnums.MAll_ERR.getCode(), "小程序不存在");
             }
             Integer shopType = 1;
-            ServiceResponse<ShopDTO> shopDTOServiceResponse = shopApiService.getShopByAppletId(appServiceResponse.getResult().getAppletConfigId(), 1129, shopType);
+            ServiceResponse<ShopDTO> shopDTOServiceResponse = shopApiService.getShopByAppletId(appServiceResponse.getResult().getAppletConfigId(), getEnterpriseId(), shopType);
             if (shopDTOServiceResponse.getResult() == null) {
                 return RestResponse.failure(ErrorCodeEnums.MAll_ERR.getCode(), "不存在店铺");
             }
             areaId = shopDTOServiceResponse.getResult().getAreaId();
         } else if (shopId != null) {
-            ServiceResponse<ShopDTO> shopDTOServiceResponse = shopApiService.getShopDetailsById(shopId, 1129);
+            ServiceResponse<ShopDTO> shopDTOServiceResponse = shopApiService.getShopDetailsById(shopId, getEnterpriseId());
             if (shopDTOServiceResponse.getResult() == null) {
                 return RestResponse.failure(ErrorCodeEnums.MAll_ERR.getCode(), "不存在店铺");
             }
@@ -142,7 +142,7 @@ public class AppletConfigGoodsController extends BaseGoodsController {
                         goodsIds.add(goodsId);
                     });
                 }
-                ServiceResponse<Map<Long, BigDecimal>> mapServiceResponse = mallGoodsBusinessApiService.getLowestSkuPrice(goodsIds, 1129);
+                ServiceResponse<Map<Long, BigDecimal>> mapServiceResponse = mallGoodsBusinessApiService.getLowestSkuPrice(goodsIds, getEnterpriseId());
                 if (mapServiceResponse.isSuccess()) {
                     Map<Long, BigDecimal> map = mapServiceResponse.getResult();
                     serviceResponse.getResult().getRes().forEach(json -> {

src/main/java/com/gic/plug/web/controller/goods/GoodsSelectorController.java

@@ -169,7 +169,7 @@ public class GoodsSelectorController extends BaseGoodsController {
     @RequestMapping("check-selector-goods-hit")
     public RestResponse checkSelectorGoodsHit(Long goodsSelectorId, String goodsCode, String skuCode) {
         ServiceResponse<Boolean>  serviceResponse =
-                goodsSelectorApiService.isSelectorHitGoods(goodsSelectorId, skuCode, goodsCode, 1129);
+                goodsSelectorApiService.isSelectorHitGoods(goodsSelectorId, skuCode, goodsCode,  getEnterpriseId());
         return RestResponse.success(serviceResponse.getResult());
     }