商品参数（连表)查询上传

edu-travel-remote/edu-travel-remote-commodity/pom.xml

@@ -61,6 +61,12 @@
             <artifactId>edu-travel-remote-base</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>edu.travel</groupId>
+            <artifactId>edu-travel-common-datasource</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 </project>

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/remote/vo/ShopParametersVo.java

@@ -3,6 +3,7 @@ package edu.travel.remote.vo;
 import edu.travel.entity.BaseEntity;
 import lombok.Data;
 
+import java.util.List;
 import java.util.Map;
 
 @Data
@@ -38,4 +39,8 @@ public class ShopParametersVo extends BaseEntity {
      * Map
      */
     private Map<String,Object> map;
+    /**
+     * ProductParametersMap
+     */
+    private List<Map<String,Object>> productParametersMap;
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/entity/ShopParameters.java

@@ -5,7 +5,13 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
+import edu.travel.annotation.LinkMany;
+import edu.travel.annotation.LinkOne;
+import edu.travel.commodity.mapper.ShopParametersMapper;
+import edu.travel.commodity.mapper.ShopProductParametersMapper;
 import edu.travel.entity.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -41,10 +47,10 @@ public class ShopParameters extends BaseEntity {
      */
     @TableField(value = "country_id")
     private Long countryId;
-
     /**
-     * 国家ID
+     * 连表shopProductParameters表
      */
-    @TableField(value = "country_id")
-    private Long countryId;
+    @TableField(exist = false)
+    @LinkMany(linkField = "id",linkMapper = ShopProductParametersMapper.class,linkPrimaryField = "parameters_id")
+    private List<Map<String,Object>> productParametersMap;
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/service/ShopParametersService.java

@@ -8,6 +8,8 @@ import edu.travel.remote.dto.ProductSpecDto;
 import edu.travel.remote.vo.ParametersVo;
 import edu.travel.remote.vo.ShopParametersVo;
 
+import java.util.List;
+
 public interface ShopParametersService extends IService<ShopParameters>{
 
 
@@ -15,4 +17,5 @@ public interface ShopParametersService extends IService<ShopParameters>{
 
     Page<ParametersVo> getAllParameters(ParametersDto param);
 
+    List<ShopParameters> getAllList();
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/service/impl/ShopParametersServiceImpl.java

@@ -15,16 +15,18 @@ import edu.travel.remote.dto.ParametersDto;
 import edu.travel.remote.dto.ProductSpecDto;
 import edu.travel.remote.vo.ParametersVo;
 import edu.travel.remote.vo.ShopParametersVo;
+import edu.travel.service.SysServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
 @Service
-public class ShopParametersServiceImpl extends ServiceImpl<ShopParametersMapper, ShopParameters> implements ShopParametersService {
+public class ShopParametersServiceImpl extends SysServiceImpl<ShopParametersMapper, ShopParameters> implements ShopParametersService {
     @Autowired
     private ShopProductParametersService shopProductParametersService;
 
@@ -69,5 +71,10 @@ public class ShopParametersServiceImpl extends ServiceImpl<ShopParametersMapper,
         return PageUtil.toPageEntity(page, ParametersVo.class);
     }
 
+    @Override
+    public List<ShopParameters> getAllList() {
+        return getListLink(null);
+    }
+
 
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/web/ShopParametersController.java

@@ -19,6 +19,7 @@ import edu.travel.vo.BaseCountryServeVo;
 import edu.travel.vo.BaseCountryVo;
 import edu.travel.web.BaseController;
 import org.springframework.beans.BeanUtils;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -155,8 +156,8 @@ public class ShopParametersController extends BaseController<ShopParameters> imp
     @Override
     @GetMapping("/getAllForm")
     public RPCBaseResponse<List<ShopParametersVo>> getAllForm() {
+        List<ShopParameters> shopParametersList = shopParametersService.getAllList();
         // Step 1: 获取所有 ShopParameters 数据
-        RPCBaseResponse<List<ShopParameters>> countryRPCBaseResponse = super.listAll();
 
         // Step 2: 创建一个用于存储每个 ShopParametersVo 的映射
         Map<Long, ShopParametersVo> parametersMap = new HashMap<>();
@@ -166,8 +167,8 @@ public class ShopParametersController extends BaseController<ShopParameters> imp
         Map<Long, BaseCountryVo> countryDataMap = new HashMap<>();
 
         // Step 4: 将所有 ShopParameters 转换为 ShopParametersVo，并存储在 map 中
-        if (countryRPCBaseResponse.getData() != null) {
-            for (ShopParameters parameters : countryRPCBaseResponse.getData()) {
+        if (shopParametersList != null && !shopParametersList.isEmpty()) {
+            for (ShopParameters parameters : shopParametersList) {
                 ShopParametersVo parametersVo = new ShopParametersVo();
                 BeanUtils.copyProperties(parameters, parametersVo);
                 parametersMap.put(parameters.getId(), parametersVo);
@@ -198,9 +199,10 @@ public class ShopParametersController extends BaseController<ShopParameters> imp
 
         // Step 7: 创建返回的 RPCBaseResponse
         RPCBaseResponse<List<ShopParametersVo>> shopParametersVoRPCBaseResponse = new RPCBaseResponse<>();
-        BeanUtils.copyProperties(countryRPCBaseResponse, shopParametersVoRPCBaseResponse);
-        shopParametersVoRPCBaseResponse.setData(result); // 设置结果数据
 
+        shopParametersVoRPCBaseResponse.setData(result); // 设置结果数据
+        shopParametersVoRPCBaseResponse.setCode(HttpStatus.OK.value());
+        shopParametersVoRPCBaseResponse.setMsg("success");
         return shopParametersVoRPCBaseResponse;
     }
 

edu-travel-service/edu-travel-service-warehouse/src/main/java/edu/travel/warehouse/web/ShopWarehouseController.java

@@ -18,7 +18,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
- * 库房表
+ * 库房表（shop_warehouse)
  */
 
 @RestController