Merge remote-tracking branch 'origin/main' into main

# Conflicts:
#	edu-travel-service/edu-travel-service-tenement/src/main/java/edu/travel/tenant/utils/RedisUtil.java

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/remote/commodity/ShopCategoryRemoteController.java

@@ -32,7 +32,7 @@ public interface ShopCategoryRemoteController extends RemoteBaseController<ShopC
     @PostMapping("/updateTargetFormId")
     public RPCBaseResponse<ShopCategoryVo> updateTargetFormId(ShopCategoryDto entity);
 
-    @PostMapping("/saveFormTarget")
+    @PostMapping("/saveForm")
     public RPCBaseResponse<ShopCategoryVo> saveFormTarget(@RequestBody ShopCategoryDto entity);
 
     /**

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/remote/dto/ProductSpecInsertShopSpecDto.java

@@ -0,0 +1,25 @@
+package edu.travel.remote.dto;
+
+import lombok.Data;
+
+
+@Data
+public class ProductSpecInsertShopSpecDto extends BaseDto {
+    /**
+     * 商品规格ID
+     */
+    private String id;
+    /**
+     * 商品id
+     */
+    private String productId;
+    /**
+     * 规格名称
+     */
+    private String specName;
+
+    /**
+     * 规格Id
+     */
+    private String specId;
+}

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

@@ -0,0 +1,27 @@
+package edu.travel.remote.vo;
+
+import edu.travel.entity.BaseEntity;
+import edu.travel.remote.dto.BaseDto;
+import lombok.Data;
+
+
+@Data
+public class ProductSpecInsertShopSpecVo extends BaseEntity {
+    /**
+     * 商品规格ID
+     */
+    private String id;
+    /**
+     * 商品规格ID
+     */
+    private String productId;
+    /**
+     * 规格名称
+     */
+    private String specName;
+
+    /**
+     * 规格Id
+     */
+    private String specId;
+}

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

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 @Data
 public class ProductSpecVo {
@@ -45,4 +46,9 @@ public class ProductSpecVo {
      * 商品对应的规格值
      */
     private List<ProductSkuVo> skuList;
+    /**
+     * map
+     *
+     */
+    private List<Map<String, Object>>specMap;
 }

edu-travel-remote/edu-travel-remote-tenant/src/main/java/edu/travel/remote/feign/mode/dto/tenant/BannerDto.java

@@ -73,6 +73,9 @@ public class BannerDto extends PagePO {
      */
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
-
+    /**
+     * 删除
+     */
+    private Integer deleteFlag;
 
 }

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

@@ -4,11 +4,16 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import edu.travel.annotation.LinkMany;
+import edu.travel.commodity.mapper.ShopSpecValueMapper;
 import edu.travel.entity.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 商品规格表
  */
@@ -46,5 +51,11 @@ public class ShopProductSpec extends BaseEntity {
      */
     @TableField(value = "sort_order")
     private Long sortOrder;
+    /**
+     * 规格值Map
+     */
+    @TableField(exist = false)
+    @LinkMany(linkField = "id", linkMapper = ShopSpecValueMapper.class, linkPrimaryField = "product_spec_id")
+    private List<Map<String, Object>>specMap;
 
 }

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

@@ -5,8 +5,12 @@ import edu.travel.commodity.entity.ShopProduct;
 import edu.travel.commodity.entity.ShopProductSpec;
 import edu.travel.remote.dto.InsertProductSpecDto;
 import edu.travel.remote.dto.ProductSpecDto;
+import edu.travel.remote.dto.ProductSpecInsertShopSpecDto;
+import edu.travel.remote.vo.ProductSpecInsertShopSpecVo;
 import edu.travel.remote.vo.ProductSpecVo;
 import edu.travel.remote.vo.SpecSortVo;
+import edu.travel.remote.vo.SpecValueSortVo;
+import edu.travel.rpc.RPCBaseResponse;
 
 import java.util.List;
 
@@ -18,4 +22,8 @@ public interface ShopProductSpecService extends IService<ShopProductSpec> {
     List<SpecSortVo> getSpecSortVoList(String productId);
 
     boolean insertProductSpec(List<InsertProductSpecDto> specs, ShopProduct bean);
+
+    RPCBaseResponse<List<ProductSpecVo>> getShopSpecSortVoList(String specId);
+     //通过product_id，自动填充商品规格
+    RPCBaseResponse<ProductSpecInsertShopSpecVo> insertOrUpdateProductSpecAndShopSpec(ProductSpecInsertShopSpecDto entity);
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import edu.travel.commodity.entity.ShopSpec;
 import edu.travel.remote.dto.SpecDto;
+import edu.travel.remote.vo.ProductSpecInsertShopSpecVo;
 import edu.travel.remote.vo.SpecVo;
 import edu.travel.rpc.RPCBaseResponse;
 
@@ -16,7 +17,7 @@ public interface ShopSpecService extends IService<ShopSpec> {
     Page<SpecVo> getShopSpec(Long countryId, Integer currentPage, Integer pageSize);
 
 
-    void insertOrUpdate(SpecDto specDto);
+    RPCBaseResponse<ProductSpecInsertShopSpecVo> insertOrUpdate(SpecDto specDto);
 
     RPCBaseResponse<List<SpecVo>> getSpecName(String specName);
 }

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

@@ -12,11 +12,10 @@ import edu.travel.commodity.entity.*;
 import edu.travel.commodity.mapper.ShopProductSpecMapper;
 import edu.travel.commodity.service.*;
 import edu.travel.commodity.utils.IdUtils;
-import edu.travel.remote.dto.FileDto;
-import edu.travel.remote.dto.InsertProductSpecDto;
-import edu.travel.remote.dto.ProductSpecDto;
-import edu.travel.remote.dto.SpecValueDto;
+import edu.travel.remote.dto.*;
 import edu.travel.remote.vo.*;
+import edu.travel.rpc.RPCBaseResponse;
+import edu.travel.service.SysServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -27,8 +26,10 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static edu.travel.rpc.RPCBaseResponse.error;
+
 @Service
-public class ShopProductSpecServiceImpl extends ServiceImpl<ShopProductSpecMapper, ShopProductSpec> implements ShopProductSpecService {
+public class ShopProductSpecServiceImpl extends SysServiceImpl<ShopProductSpecMapper, ShopProductSpec> implements ShopProductSpecService {
     @Autowired
     private ShopProductService shopProductService;
     @Autowired
@@ -41,6 +42,8 @@ public class ShopProductSpecServiceImpl extends ServiceImpl<ShopProductSpecMappe
     private ShopProductSpecService shopProductSpecService;
     @Autowired
     private ShopProductSpecMapper shopProductSpecMapper;
+    @Autowired
+    private ShopSpecService shopSpecService;
 
     @Override
     public ProductSpecVo getShopSpec(ProductSpecDto param) {
@@ -145,6 +148,73 @@ public class ShopProductSpecServiceImpl extends ServiceImpl<ShopProductSpecMappe
         this.saveBatch(list);
         return shopSpecValueService.saveBatch(shopSpecValues);
     }
+    //通过spec_id获取规格值
+    @Override
+    public RPCBaseResponse<List<ProductSpecVo>> getShopSpecSortVoList(String specId) {
+        //查询所有规格
+        LambdaQueryWrapper<ShopProductSpec> queryWrapper = new LambdaQueryWrapper<>();
+        List<ShopProductSpec> specs = super.getListLink(queryWrapper);
+        //转换vo
+        List<ProductSpecVo> specs1 = BeanUtil.copyToList(specs, ProductSpecVo.class);
+        return new RPCBaseResponse<>(200, "SUCCESS", specs1);
+    }
+
+    //通过product_id添加规格，自动填充商品规格
+    @Override
+    public RPCBaseResponse<ProductSpecInsertShopSpecVo> insertOrUpdateProductSpecAndShopSpec(ProductSpecInsertShopSpecDto entity) {
+        // 1. 获取与 productId 相关的所有中间表信息
+        LambdaQueryWrapper<ShopProductSpec> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ShopProductSpec::getProductId, entity.getProductId());
+
+        // 查询与 productId 相关的商品规格
+        List<ShopProductSpec> shopProductSpecs = shopProductSpecMapper.selectList(queryWrapper);
+
+        // 2. 检查是否找到了相关的商品规格
+        if (shopProductSpecs == null || shopProductSpecs.isEmpty()) {
+            return error("No specifications found for the provided productId");
+        }
+
+        // 3. 将 ProductSpecInsertShopSpecDto 转换为 SpecDto
+        SpecDto specDto = new SpecDto();
+        specDto.setSpecId(entity.getSpecId());
+        specDto.setSpecName(entity.getSpecName());
+        specDto.setCountryId(entity.getCountryId());
+
+        // 4. 调用 shopSpecService 的 insertOrUpdate 方法新增或更新规格
+        RPCBaseResponse<ProductSpecInsertShopSpecVo> response = shopSpecService.insertOrUpdate(specDto);
+
+        System.out.println("response = " + response);
+        // 5. 检查是否成功新增或更新规格
+        if (response == null || response.getData() == null) {
+            return error("Failed to insert or update shop specification");
+        }
+
+        // 6. 设置返回的规格 ID 和名称
+        ProductSpecInsertShopSpecVo specVo = response.getData();
+        entity.setSpecId(specVo.getId()); // 从返回结果中获取规格 ID
+        entity.setSpecName(specVo.getSpecName()); // 从返回结果中获取规格名称
+
+        // 7. 完成新增操作，保存或更新与商品相关的规格
+        ShopProductSpec newShopProductSpec = new ShopProductSpec();
+        newShopProductSpec.setProductId(Long.valueOf(entity.getProductId()));
+        newShopProductSpec.setSpecId(Long.valueOf(entity.getSpecId()));
+        newShopProductSpec.setSpecName(entity.getSpecName());
+
+        // 保存 ShopProductSpec
+        int result = shopProductSpecMapper.insert(newShopProductSpec); // 或者 update，根据业务逻辑
+
+        // 检查插入或更新结果
+        if (result <= 0) {
+            return error("Failed to associate product with specification");
+        }
+
+        // 8. 返回最终的响应，返回之前的 response，或根据需要修改
+        return new RPCBaseResponse<>(200, "SUCCESS", specVo);
+    }
+
+
+
+
 
 
 }

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

@@ -5,12 +5,12 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import edu.travel.commodity.entity.ShopSpec;
 import edu.travel.commodity.mapper.ShopSpecMapper;
 import edu.travel.commodity.service.ShopSpecService;
 import edu.travel.commodity.utils.PageUtil;
 import edu.travel.remote.dto.SpecDto;
+import edu.travel.remote.vo.ProductSpecInsertShopSpecVo;
 import edu.travel.remote.vo.SpecVo;
 import edu.travel.rpc.RPCBaseResponse;
 import edu.travel.service.SysServiceImpl;
@@ -31,24 +31,50 @@ public class ShopSpecServiceImpl extends SysServiceImpl<ShopSpecMapper, ShopSpec
     }
 
     @Override
-    public void insertOrUpdate(SpecDto specDto) {
+    public RPCBaseResponse<ProductSpecInsertShopSpecVo> insertOrUpdate(SpecDto specDto) {
+        // 获取现有的 ShopSpec 对象
         ShopSpec spec = getById(specDto.getSpecId());
+
+        // 如果规格不存在，则执行新增逻辑
         if (ObjectUtil.isEmpty(spec)) {
-            LambdaQueryWrapper<ShopSpec> query =
-                    Wrappers.<ShopSpec>lambdaQuery().eq(ShopSpec::getSpecName, specDto.getSpecName())
-                            .eq(ShopSpec::getCountryId, specDto.getCountryId());
-            ShopSpec one = getOne(query);
-            if (one != null) {
-                throw new RuntimeException("规格名称已存在");
+            // 构建查询条件，检查是否有相同的规格名称
+            LambdaQueryWrapper<ShopSpec> query = Wrappers.<ShopSpec>lambdaQuery()
+                    .eq(ShopSpec::getSpecName, specDto.getSpecName())
+                    .eq(ShopSpec::getCountryId, specDto.getCountryId());
+
+            // 查询是否存在同名规格
+            ShopSpec existingSpec = getOne(query);
+            if (existingSpec != null) {
+                // 如果存在同名规格，返回其名称和 ID
+                ProductSpecInsertShopSpecVo responseVo = new ProductSpecInsertShopSpecVo();
+                responseVo.setSpecName(existingSpec.getSpecName());
+                responseVo.setId(String.valueOf(existingSpec.getId()));
+                return new RPCBaseResponse<>(200, "规格名称已存在", responseVo);
             }
-            ShopSpec bean = BeanUtil.toBean(specDto, ShopSpec.class);
-            save(bean);
-            return;
+
+            // 如果不存在同名规格，则新增
+            ShopSpec newSpec = BeanUtil.toBean(specDto, ShopSpec.class);
+            save(newSpec);
+
+            // 返回新增规格的名称和 ID
+            ProductSpecInsertShopSpecVo responseVo = new ProductSpecInsertShopSpecVo();
+            responseVo.setSpecName(newSpec.getSpecName());
+            responseVo.setId(String.valueOf(newSpec.getId()));
+            return new RPCBaseResponse<>(201, "新增成功", responseVo);
         }
+
+        // 如果规格已存在，更新名称
         spec.setSpecName(specDto.getSpecName());
         updateById(spec);
+
+        // 返回更新后的规格名称和 ID
+        ProductSpecInsertShopSpecVo responseVo = new ProductSpecInsertShopSpecVo();
+        responseVo.setSpecName(spec.getSpecName());
+        responseVo.setId(String.valueOf(spec.getId()));
+        return new RPCBaseResponse<>(200, "更新成功", responseVo);
     }
 
+
     /**
      * 获取规格名称（模糊查询）
      * @param specName

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

@@ -111,7 +111,7 @@ public class ShopCategoryController extends BaseController<ShopCategory> impleme
      * 新增商品类型
      */
     @Override
-    @PostMapping("/saveFormTarget")
+    @PostMapping("/saveForm")
     public RPCBaseResponse<ShopCategoryVo> saveFormTarget(@RequestBody ShopCategoryDto entity) {
         ShopCategory shopCurrency = new ShopCategory();
         BeanUtils.copyProperties(entity, shopCurrency);

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

@@ -4,6 +4,8 @@ import edu.travel.commodity.entity.ShopProductSpec;
 import edu.travel.commodity.service.ShopProductSpecService;
 import edu.travel.remote.commodity.ShopProductSpecRemoteController;
 import edu.travel.remote.dto.ProductSpecDto;
+import edu.travel.remote.dto.ProductSpecInsertShopSpecDto;
+import edu.travel.remote.vo.ProductSpecInsertShopSpecVo;
 import edu.travel.remote.vo.ProductSpecVo;
 import edu.travel.resp.BaseResponse;
 import edu.travel.rpc.RPCBaseResponse;
@@ -39,6 +41,20 @@ public class ShopProductSpecController extends BaseController<ShopProductSpec> i
     public RPCBaseResponse<ProductSpecVo> getShopSpec(ProductSpecDto param) {
         return success(shopProductSpecService.getShopSpec(param));
     }
+    /**
+     * 通过spec_id，查找多规格值
+     */
+    @GetMapping("/getShopSpecSortVoList")
+    public RPCBaseResponse<List<ProductSpecVo>> getShopSpecSortVoList(String specId) {
+        return shopProductSpecService.getShopSpecSortVoList(specId);
+    }
+    /**
+     * 通过product_id，自动填充商品规格
+     */
+    @PostMapping("/insertOrUpdate")
+    public RPCBaseResponse<ProductSpecInsertShopSpecVo> insertOrUpdateProductSpecAndShopSpec(@RequestBody ProductSpecInsertShopSpecDto entity) {
+        return shopProductSpecService.insertOrUpdateProductSpecAndShopSpec(entity);
+    }
 
     /**
      * 查找商品规格中间表

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

@@ -34,6 +34,9 @@ public class ShopSpecValueController extends BaseController<ShopSpecValue> imple
         return shopSpecValueService.getSpecValue(specValue);
     }
     /**
+     * 新增规格值（带规格id）
+     */
+    /**
      * 通过id查找规格值
      *
      */

edu-travel-service/edu-travel-service-tenement/src/main/java/edu/travel/tenant/service/impl/ShopBannerServiceImpl.java

@@ -259,21 +259,19 @@ public class ShopBannerServiceImpl extends ServiceImpl<ShopBannerMapper, ShopBan
      */
     @Override
     public RPCBaseResponse<IPage<BannerVo>> getBannerAllPage(BannerDto bannerDto) {
-        //查询轮播图数据，确保返回类型正确
         List<BannerVo> bannerVos = shopBannerMapper.selectBannerWithCountry(bannerDto);
-        List<BannerVo> shopBannerVos = bannerVos;
 
         int total = shopBannerMapper.countAll(bannerDto);
 
-        //提取CountryID
-        Set<String> countryIds = shopBannerVos.stream()
+        // 提取CountryID
+        Set<String> countryIds = bannerVos.stream()
                 .map(BannerVo::getCountryId)
                 .collect(Collectors.toSet());
-        //查询国家信息
+        // 查询国家信息
         Map<String, BannerVo> countryMap = fetchCountryData(countryIds);
 
-        //遍历并设置国家信息
-        for (BannerVo shopBannerVo : shopBannerVos) {
+        // 遍历并设置国家信息
+        for (BannerVo shopBannerVo : bannerVos) {
             if (shopBannerVo.getMap() == null) {
                 shopBannerVo.setMap(new HashMap<>());
             }
@@ -281,15 +279,16 @@ public class ShopBannerServiceImpl extends ServiceImpl<ShopBannerMapper, ShopBan
                 shopBannerVo.getMap().put("countryServe", countryMap.get(shopBannerVo.getCountryId()));
             }
         }
-        //封装返回结果
+        // 封装返回结果
         IPage<BannerVo> pageVoLink = new Page<>();
-        pageVoLink.setRecords(shopBannerVos);
+        pageVoLink.setRecords(bannerVos);
         pageVoLink.setTotal(total);
         pageVoLink.setCurrent(bannerDto.getCurrentPage());
         pageVoLink.setSize(bannerDto.getPageSize());
         return new RPCBaseResponse<>(200, "SUCCESS", pageVoLink);
     }
 
+
     @Override
     public RPCBaseResponse<BannerDefaultAndEnableVo> updateBannerDefaultAndEnable(BannerDefaultAndEnableDto banner) {
         // 验证输入数据是否合法

edu-travel-service/edu-travel-service-tenement/src/main/java/edu/travel/tenant/web/ShopBannerController.java

@@ -144,7 +144,7 @@ public class ShopBannerController extends BaseController<ShopBanner> implements
      * @return
      */
     @Override
-    @GetMapping("/deleteFormTarget")
+    @PostMapping("/deleteFormTarget")
     public RPCBaseResponse<BannerVo> deleteTargetFormId(@RequestBody List<String> ids) {
         RPCBaseResponse<ShopBanner> shopBannerRPCBaseResponse = super.deleteTargetById(ids);
         RPCBaseResponse<BannerVo> shopBannerVoRPCBaseResponse = new RPCBaseResponse<>();

edu-travel-service/edu-travel-service-tenement/src/main/resources/mapper/ShopBannerMapper.xml

@@ -71,8 +71,12 @@
             <if test="enable != null and enable !=''">
                 AND sb.enable = #{enable}
             </if>
+            <if test="deleteFlag != null">
+                AND sb.delete_flag = #{deleteFlag}
+            </if>
         </where>
     </select>
+
     <select id="countAll" resultType="int">
         SELECT COUNT(*)
         FROM shop_banner sb
@@ -86,6 +90,10 @@
             <if test="content != null and content != ''">
                 AND sb.content LIKE CONCAT('%', #{content}, '%')
             </if>
+            <if test="deleteFlag != null">
+                AND sb.delete_flag = #{deleteFlag}
+            </if>
         </where>
     </select>
+
 </mapper>