商品表，商家端添加类型

alien-store/src/main/java/shop/alien/store/controller/StoreProductItemController.java

@@ -56,9 +56,9 @@ public class StoreProductItemController {
     @ApiOperation("根据ID查询商品")
     @ApiOperationSupport(order = 4)
     @GetMapping("/getById")
-    public R<List<StoreProductItemDto>> getStoreProductItemById(@RequestParam(value = "id") Integer id) {
+    public R<List<StoreProductItemDto>> getStoreProductItemById(@RequestParam(value = "id") Integer id,@RequestParam(value = "id")Integer modelType) {
         log.info("StoreProductItemController.getStoreProductItemById?id={}", id);
-        return storeProductItemService.getStoreProductItemById(id);
+        return storeProductItemService.getStoreProductItemById(id, modelType);
     }
 
     @ApiOperation("按商品类型查询列表")

alien-store/src/main/java/shop/alien/store/service/StoreProductDelicaciesService.java

@@ -100,5 +100,7 @@ public interface StoreProductDelicaciesService extends IService<StoreProductDeli
      * @return List<StoreProductDelicacies>
      */
     List<StoreProductDelicacies> getListByExtGroup(String extGroup);
+
+    List<StoreProductDelicacies> getByExtId(Integer id);
 }
 

alien-store/src/main/java/shop/alien/store/service/StoreProductGymService.java

@@ -84,4 +84,6 @@ public interface StoreProductGymService extends IService<StoreProductGym> {
      * @return boolean
      */
     boolean deleteBatch(List<Integer> ids);
+
+    List<StoreProductGym> getByExtId(Integer id);
 }

alien-store/src/main/java/shop/alien/store/service/StoreProductItemService.java

@@ -45,7 +45,7 @@ public interface StoreProductItemService extends IService<StoreProductItem> {
      * @param id 主键
      * @return R<StoreProductItem>
      */
-    R<List<StoreProductItemDto>> getStoreProductItemById(Integer id);
+    R<List<StoreProductItemDto>> getStoreProductItemById(Integer id,Integer modelType);
 
 
     /**

alien-store/src/main/java/shop/alien/store/service/impl/StoreProductDelicaciesServiceImpl.java

@@ -171,5 +171,10 @@ public class StoreProductDelicaciesServiceImpl extends ServiceImpl<StoreProductD
                 .orderByDesc(StoreProductDelicacies::getCreatedTime);
         return baseMapper.selectList(queryWrapper);
     }
+
+    @Override
+    public List<StoreProductDelicacies> getByExtId(Integer id) {
+        return this.lambdaQuery().eq(StoreProductDelicacies::getExtId, id).list();
+    }
 }
 

alien-store/src/main/java/shop/alien/store/service/impl/StoreProductGymServiceImpl.java

@@ -161,4 +161,9 @@ public class StoreProductGymServiceImpl extends ServiceImpl<StoreProductGymMappe
         // 逻辑删除，MyBatis-Plus会自动处理
         return this.removeByIds(ids);
     }
+
+    @Override
+    public List<StoreProductGym> getByExtId(Integer id) {
+        return this.lambdaQuery().eq(StoreProductGym::getExtId, id).list();
+    }
 }

alien-store/src/main/java/shop/alien/store/service/impl/StoreProductItemServiceImpl.java

@@ -163,7 +163,7 @@ public class StoreProductItemServiceImpl extends ServiceImpl<StoreProductItemMap
     }
 
     @Override
-    public R<List<StoreProductItemDto>> getStoreProductItemById(Integer id) {
+    public R<List<StoreProductItemDto>> getStoreProductItemById(Integer id,Integer modelType) {
         log.info("StoreProductItemServiceImpl.getStoreProductItemById?id={}", id);
         StoreProductItem storeProductItem = this.getById(id);
         if (storeProductItem == null) {
@@ -171,8 +171,15 @@ public class StoreProductItemServiceImpl extends ServiceImpl<StoreProductItemMap
             StoreProductItemDto storeProductItemDto = new StoreProductItemDto();
             list.add(storeProductItemDto);
             BeanUtils.copyProperties(storeProductItem,storeProductItemDto);
-            List<StoreProductBar> barList = storeProductBarService.getByExtId(id);
-            storeProductItemDto.setSubList(barList);
+            List<?> sublist =null;
+            if (modelType == CommonEnum.ModelType.BAR.getCode()) {
+                sublist = storeProductBarService.getByExtId(id);
+            }else if (modelType == CommonEnum.ModelType.DELICACY.getCode()) {
+                sublist = storeProductDelicaciesService.getByExtId(id);
+            }else if (modelType == CommonEnum.ModelType.GYM.getCode()) {
+                sublist = storeProductGymService.getByExtId(id);
+            }
+            storeProductItemDto.setSubList(sublist);
             return R.data(list);
         }
         return R.fail("未找到数据");