更新

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

@@ -54,16 +54,25 @@ public class AppletConfigGoodsController {
     private EsBusinessOperaApiService esBusinessOperaApiService;
 
     @RequestMapping("get-mall-cord-list")
-    public RestResponse getMallCordList(String appConfigId) {
-        ServiceResponse<AppletsConfigSimpleOutputDTO> appServiceResponse = appletsConfigApiService.selectAppletsConfigIdByAppId(appConfigId, 1129);
-        if (appServiceResponse.getResult() == null) {
-            return RestResponse.failure(ErrorCodeEnums.MAll_ERR.getCode(), "小程序不存在");
-        }
-        ServiceResponse<ShopDTO> shopDTOServiceResponse = shopApiService.getShopByAppletId(appServiceResponse.getResult().getAppletConfigId(), 1129, 1);
-        if (shopDTOServiceResponse.getResult() == null) {
-            return RestResponse.failure(ErrorCodeEnums.MAll_ERR.getCode(), "不存在店铺");
+    public RestResponse getMallCordList(String appConfigId, Long shopId) {
+        Long areaId = null;
+        if (StringUtils.isNotBlank(appConfigId)) {
+            ServiceResponse<AppletsConfigSimpleOutputDTO> appServiceResponse = appletsConfigApiService.selectAppletsConfigIdByAppId(appConfigId, 1129);
+            if (appServiceResponse.getResult() == null) {
+                return RestResponse.failure(ErrorCodeEnums.MAll_ERR.getCode(), "小程序不存在");
+            }
+            ServiceResponse<ShopDTO> shopDTOServiceResponse = shopApiService.getShopByAppletId(appServiceResponse.getResult().getAppletConfigId(), 1129, 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);
+            if (shopDTOServiceResponse.getResult() == null) {
+                return RestResponse.failure(ErrorCodeEnums.MAll_ERR.getCode(), "不存在店铺");
+            }
+            areaId = shopDTOServiceResponse.getResult().getAreaId();
         }
-        Long areaId = shopDTOServiceResponse.getResult().getAreaId();
         ServiceResponse<List<SpecCordDTO>> listServiceResponse = cordApiService.listSpecCordDTO(areaId);
         return RestResponse
                 .success(EntityUtil.changeEntityListByOrika(MallGoodsCordVO.class, listServiceResponse.getResult()));
@@ -80,17 +89,27 @@ public class AppletConfigGoodsController {
      */
     @RequestMapping("list-mall-goods-selector")
     public RestResponse listGoodsByChannel(@RequestParam(value = "currentPage", defaultValue = "1") Integer currentPage,
-            @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize, String appConfigId, String search, Long cordId) {
-        ServiceResponse<AppletsConfigSimpleOutputDTO> appServiceResponse = appletsConfigApiService.selectAppletsConfigIdByAppId(appConfigId, 1129);
-        if (appServiceResponse.getResult() == null) {
-            return RestResponse.failure(ErrorCodeEnums.MAll_ERR.getCode(), "小程序不存在");
-        }
-        Integer shopType = 1;
-        ServiceResponse<ShopDTO> shopDTOServiceResponse = shopApiService.getShopByAppletId(appServiceResponse.getResult().getAppletConfigId(), 1129, shopType);
-        if (shopDTOServiceResponse.getResult() == null) {
-            return RestResponse.failure(ErrorCodeEnums.MAll_ERR.getCode(), "不存在店铺");
+            @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize, String appConfigId, String search, Long cordId,
+                                           Long shopId) {
+        Long areaId = null;
+        if (StringUtils.isNotBlank(appConfigId)) {
+            ServiceResponse<AppletsConfigSimpleOutputDTO> appServiceResponse = appletsConfigApiService.selectAppletsConfigIdByAppId(appConfigId, 1129);
+            if (appServiceResponse.getResult() == null) {
+                return RestResponse.failure(ErrorCodeEnums.MAll_ERR.getCode(), "小程序不存在");
+            }
+            Integer shopType = 1;
+            ServiceResponse<ShopDTO> shopDTOServiceResponse = shopApiService.getShopByAppletId(appServiceResponse.getResult().getAppletConfigId(), 1129, 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);
+            if (shopDTOServiceResponse.getResult() == null) {
+                return RestResponse.failure(ErrorCodeEnums.MAll_ERR.getCode(), "不存在店铺");
+            }
+            areaId = shopDTOServiceResponse.getResult().getAreaId();
         }
-        Long areaId = shopDTOServiceResponse.getResult().getAreaId();
         JSONObject cordJSON = null;
         if (cordId != null) {
             ServiceResponse<List<GoodsCordDTO>> serviceResponse = cordApiService.listChildAll(cordId);