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

edu-travel-adapter/edu-travel-adapter-warehouse/src/main/java/edu/travel/adapter/service/warehouse/WarehouseAdapter.java

@@ -40,14 +40,14 @@ public class WarehouseAdapter {
 
     //库房连表新增
     @AdapterAnnotation
-    public RPCBaseResponse<ShopWarehouseVo> saveAllForm(@RequestBody ShopWarehouseSaveDto entity, HttpServletRequest request) {
-        return shopWarehouseRemoteController.saveAllForm(entity, request);
+    public RPCBaseResponse<ShopWarehouseVo> saveAllForm(@RequestBody ShopWarehouseSaveDto entity) {
+        return shopWarehouseRemoteController.saveAllForm(entity);
     }
 
     //库房连表修改
     @AdapterAnnotation
-    public RPCBaseResponse<ShopWarehouseVo> updateWarehouse(@RequestBody ShopWarehouseSaveDto entity, HttpServletRequest request) {
-        return shopWarehouseRemoteController.updateWarehouse(entity, request);
+    public RPCBaseResponse<ShopWarehouseVo> updateWarehouse(@RequestBody ShopWarehouseSaveDto entity) {
+        return shopWarehouseRemoteController.updateWarehouse(entity);
     }
 
     //查询库房详情

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

@@ -1,5 +1,6 @@
 package edu.travel.remote.commodity;
 
+import edu.travel.remote.base.RemoteBaseController;
 import edu.travel.remote.dto.ProductSpecDto;
 import edu.travel.remote.vo.ProductSpecVo;
 import edu.travel.rpc.RPCBaseResponse;
@@ -8,7 +9,7 @@ import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.GetMapping;
 
 @FeignClient(name = "commodity-dev", path = "/shopProductSpec")
-public interface ShopProductSpecRemoteController {
+public interface ShopProductSpecRemoteController extends RemoteBaseController<ProductSpecVo, ProductSpecDto> {
     @GetMapping("/getShopSpec")
     public RPCBaseResponse<ProductSpecVo> getShopSpec(@SpringQueryMap ProductSpecDto param);
 }

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

@@ -0,0 +1,10 @@
+package edu.travel.remote.commodity;
+
+import edu.travel.remote.base.RemoteBaseController;
+import edu.travel.remote.dto.ShopSkuSpecValueDto;
+import edu.travel.remote.vo.ShopSkuSpecValueVo;
+import org.springframework.cloud.openfeign.FeignClient;
+
+@FeignClient(name = "commodity-dev", path = "/shopSkuSpecValue")
+public interface ShopSkuSpecValueRemoteController extends RemoteBaseController<ShopSkuSpecValueVo, ShopSkuSpecValueDto> {
+}

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

@@ -0,0 +1,32 @@
+package edu.travel.remote.dto;
+
+import edu.travel.po.PagePO;
+import lombok.Data;
+
+@Data
+public class ShopSkuSpecValueDto extends PagePO {
+    /**
+     * SKU规格值关联表ID
+     */
+    private String id;
+    /**
+     * SKU
+     */
+    private String skuId;
+    /**
+     * 规格值id
+     */
+    private String specValueId;
+    /**
+     * 规格值
+     */
+    private String specValue;
+    /**
+     * 规格值id
+     */
+    private String specId;
+    /**
+     * 规格名称
+     */
+    private String specName;
+}

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

@@ -1,9 +1,10 @@
 package edu.travel.remote.vo;
 
+import edu.travel.entity.BaseEntity;
 import lombok.Data;
 
 @Data
-public class ShopSkuSpecValueVo {
+public class ShopSkuSpecValueVo extends BaseEntity {
     /**
      * SKU规格值关联表ID
      */

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

@@ -0,0 +1,29 @@
+package edu.travel.remote.feign.mode.dto.tenant;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import edu.travel.po.PagePO;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class BannerDefaultAndEnableDto extends PagePO {
+    /**
+     * 轮播图ID
+     */
+    private String id;
+
+    /**
+     * 排序
+     */
+    private Integer sortOrder;
+    /**
+     * 是否默认 0 否 1是
+     */
+    private Integer isDefault;
+    /**
+     * 是否启用
+     */
+    private Integer enable;
+
+}

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

@@ -44,6 +44,10 @@ public class BannerDto extends PagePO {
      */
     private String mode;
     /**
+     * 排序
+     */
+    private Integer sortOrder;
+    /**
      * 是否默认 0 否 1是
      */
     private Integer isDefault;

edu-travel-remote/edu-travel-remote-tenant/src/main/java/edu/travel/remote/feign/mode/vo/banner/BannerDefaultAndEnableVo.java

@@ -0,0 +1,29 @@
+package edu.travel.remote.feign.mode.vo.banner;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import edu.travel.entity.BaseEntity;
+import edu.travel.po.PagePO;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class BannerDefaultAndEnableVo extends BaseEntity {
+    /**
+     * 轮播图ID
+     */
+    private String id;
+
+    /**
+     * 排序
+     */
+    private Integer sortOrder;
+    /**
+     * 是否默认 0 否 1是
+     */
+    private Integer isDefault;
+    /**
+     * 是否启用
+     */
+    private Integer enable;
+}

edu-travel-remote/edu-travel-remote-tenant/src/main/java/edu/travel/remote/feign/mode/vo/banner/BannerVo.java

@@ -34,6 +34,10 @@ public class BannerVo {
      */
     private String mode;
     /**
+     * 排序
+     */
+    private Integer sortOrder;
+    /**
      * 链接地址
      */
     private String linkUrl;

edu-travel-remote/edu-travel-remote-warehouse/src/main/java/edu/travel/remote/ShopWarehouseRemoteController.java

@@ -27,8 +27,8 @@ public interface ShopWarehouseRemoteController extends RemoteBaseController<Shop
     public RPCBaseResponse<List<ShopWarehouseStaffVo>> getWarehouseTenantRole(String id);
 
     @PostMapping("/saveAllForm")
-    public RPCBaseResponse<ShopWarehouseVo> saveAllForm(@RequestBody ShopWarehouseSaveDto entity, HttpServletRequest request);
+    public RPCBaseResponse<ShopWarehouseVo> saveAllForm(@RequestBody ShopWarehouseSaveDto entity);
 
     @PostMapping("/updateWarehouse")
-    public RPCBaseResponse<ShopWarehouseVo> updateWarehouse(@RequestBody ShopWarehouseSaveDto entity, HttpServletRequest request);
+    public RPCBaseResponse<ShopWarehouseVo> updateWarehouse(@RequestBody ShopWarehouseSaveDto entity);
 }

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

@@ -8,10 +8,9 @@ import edu.travel.remote.vo.ProductSpecVo;
 import edu.travel.resp.BaseResponse;
 import edu.travel.rpc.RPCBaseResponse;
 import edu.travel.web.BaseController;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -41,4 +40,77 @@ public class ShopProductSpecController extends BaseController<ShopProductSpec> i
     public RPCBaseResponse<ProductSpecVo> getShopSpec(ProductSpecDto param) {
         return success(shopProductSpecService.getShopSpec(param));
     }
+
+    /**
+     * 查找商品规格中间表
+     * @param id
+     * @return
+     */
+    @Override
+    @GetMapping("/getFormId")
+    public RPCBaseResponse<ProductSpecVo> getFormId(String id) {
+        RPCBaseResponse<ShopProductSpec> shopProductSpecRPCBaseResponse = super.getId(id);
+        RPCBaseResponse<ProductSpecVo> productSpecVoRPCBaseResponse = new RPCBaseResponse<>();
+        BeanUtils.copyProperties(shopProductSpecRPCBaseResponse, productSpecVoRPCBaseResponse);
+        return productSpecVoRPCBaseResponse;
+    }
+
+    /**
+     * 更新商品规格中间表
+     * @param entity
+     * @return
+     */
+    @Override
+    @PostMapping("/updateById")
+    public RPCBaseResponse<ProductSpecVo> updateTargetFormId(ProductSpecDto entity) {
+        ShopProductSpec shopProductSpec = new ShopProductSpec();
+        BeanUtils.copyProperties(entity, shopProductSpec);
+        RPCBaseResponse<ShopProductSpec> shopProductSpecRPCBaseResponse = super.updateTargetById(shopProductSpec);
+        RPCBaseResponse<ProductSpecVo> productSpecVoRPCBaseResponse = new RPCBaseResponse<>();
+        BeanUtils.copyProperties(shopProductSpecRPCBaseResponse, productSpecVoRPCBaseResponse);
+        return productSpecVoRPCBaseResponse;
+    }
+
+    /**
+     * 新增商品规格中间表
+     * @param entity
+     * @return
+     */
+    @Override
+    @PostMapping("/saveFormTarget")
+    public RPCBaseResponse<ProductSpecVo> saveFormTarget(ProductSpecDto entity) {
+        ShopProductSpec shopProductSpec = new ShopProductSpec();
+        BeanUtils.copyProperties(entity, shopProductSpec);
+        RPCBaseResponse<ShopProductSpec> shopProductSpecRPCBaseResponse = super.saveTarget(shopProductSpec);
+        RPCBaseResponse<ProductSpecVo> productSpecVoRPCBaseResponse = new RPCBaseResponse<>();
+        BeanUtils.copyProperties(shopProductSpecRPCBaseResponse, productSpecVoRPCBaseResponse);
+        return productSpecVoRPCBaseResponse;
+    }
+
+    /**
+     * 删除商品规格中间表
+     * @param ids
+     * @return
+     */
+    @Override
+    @PostMapping("/deleteFormId")
+    public RPCBaseResponse<ProductSpecVo> deleteTargetFormId(@RequestBody List<String> ids) {
+        RPCBaseResponse<ShopProductSpec> shopProductSpecRPCBaseResponse = super.deleteTargetById(ids);
+        RPCBaseResponse<ProductSpecVo> productSpecVoRPCBaseResponse = new RPCBaseResponse<>();
+        BeanUtils.copyProperties(shopProductSpecRPCBaseResponse, productSpecVoRPCBaseResponse);
+        return productSpecVoRPCBaseResponse;
+    }
+
+    /**
+     * 获取所有商品中间表
+     * @return
+     */
+    @Override
+    @GetMapping("/getAllForm")
+    public RPCBaseResponse<List<ProductSpecVo>> getAllForm() {
+        RPCBaseResponse<List<ShopProductSpec>> shopProductSpecRPCBaseResponse = super.listAll();
+        RPCBaseResponse<List<ProductSpecVo>> productSpecVoRPCBaseResponse = new RPCBaseResponse<>();
+        BeanUtils.copyProperties(shopProductSpecRPCBaseResponse, productSpecVoRPCBaseResponse);
+        return productSpecVoRPCBaseResponse;
+    }
 }

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

@@ -1,10 +1,20 @@
 package edu.travel.commodity.web;
 
+import edu.travel.commodity.entity.ShopSkuSpecValue;
 import edu.travel.commodity.service.ShopSkuSpecValueService;
+import edu.travel.remote.commodity.ShopSkuSpecValueRemoteController;
+import edu.travel.remote.dto.ShopSkuSpecValueDto;
+import edu.travel.remote.vo.ShopSkuSpecValueVo;
+import edu.travel.rpc.RPCBaseResponse;
+import edu.travel.web.BaseController;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * SKU规格值关联表(shop_sku_spec_value)表控制层
  *
@@ -12,12 +22,81 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/shop_sku_spec_value")
-public class ShopSkuSpecValueController {
+public class ShopSkuSpecValueController extends BaseController<ShopSkuSpecValue> implements ShopSkuSpecValueRemoteController {
     /**
      * 服务对象
      */
     @Autowired
     private ShopSkuSpecValueService shopSkuSpecValueService;
+    /**
+     * 通过product_id获取规格
+     */
+
+    /**
+     * 通过id获取sku
+     * @param id
+     * @return
+     */
+    @Override
+    public RPCBaseResponse<ShopSkuSpecValueVo> getFormId(@RequestParam("id") String id) {
+        RPCBaseResponse<ShopSkuSpecValue> eduFileRPCBaseResponse = super.getId(id);
+        RPCBaseResponse<ShopSkuSpecValueVo> eduFileVoRPCBaseResponse = new RPCBaseResponse<>();
+        BeanUtils.copyProperties(eduFileRPCBaseResponse, eduFileVoRPCBaseResponse);
+        return eduFileVoRPCBaseResponse;
+    }
+
+    /**
+     * 通过id更新
+     * @param entity
+     * @return
+     */
+    @Override
+    public RPCBaseResponse<ShopSkuSpecValueVo> updateTargetFormId(ShopSkuSpecValueDto entity) {
+        ShopSkuSpecValue shopSkuSpecValue = new ShopSkuSpecValue();
+        BeanUtils.copyProperties(entity, shopSkuSpecValue);
+        RPCBaseResponse<ShopSkuSpecValue> eduFileRPCBaseResponse = super.updateTargetById(shopSkuSpecValue);
+        RPCBaseResponse<ShopSkuSpecValueVo> eduFileVoRPCBaseResponse = new RPCBaseResponse<>();
+        BeanUtils.copyProperties(eduFileRPCBaseResponse, eduFileVoRPCBaseResponse);
+        return eduFileVoRPCBaseResponse;
+    }
+
+    /**
+     * 新增
+     * @param entity
+     * @return
+     */
+    @Override
+    public RPCBaseResponse<ShopSkuSpecValueVo> saveFormTarget(ShopSkuSpecValueDto entity) {
+        ShopSkuSpecValue shopSkuSpecValue = new ShopSkuSpecValue();
+        BeanUtils.copyProperties(entity, shopSkuSpecValue);
+        RPCBaseResponse<ShopSkuSpecValue> eduFileRPCBaseResponse = super.saveTarget(shopSkuSpecValue);
+        RPCBaseResponse<ShopSkuSpecValueVo> eduFileVoRPCBaseResponse = new RPCBaseResponse<>();
+        BeanUtils.copyProperties(eduFileRPCBaseResponse, eduFileVoRPCBaseResponse);
+        return eduFileVoRPCBaseResponse;
+    }
 
+    /**
+     * 删除
+     * @param ids
+     * @return
+     */
+    @Override
+    public RPCBaseResponse<ShopSkuSpecValueVo> deleteTargetFormId(List<String> ids) {
+        RPCBaseResponse<ShopSkuSpecValue> eduFileRPCBaseResponse = super.deleteTargetById(ids);
+        RPCBaseResponse<ShopSkuSpecValueVo> eduFileVoRPCBaseResponse = new RPCBaseResponse<>();
+        BeanUtils.copyProperties(eduFileRPCBaseResponse, eduFileVoRPCBaseResponse);
+        return eduFileVoRPCBaseResponse;
+    }
 
+    /**
+     * 查询全部
+     * @return
+     */
+    @Override
+    public RPCBaseResponse<List<ShopSkuSpecValueVo>> getAllForm() {
+        RPCBaseResponse<List<ShopSkuSpecValue>> eduFileRPCBaseResponse = super.listAll();
+        RPCBaseResponse<List<ShopSkuSpecValueVo>> eduFileVoRPCBaseResponse = new RPCBaseResponse<>();
+        BeanUtils.copyProperties(eduFileRPCBaseResponse, eduFileVoRPCBaseResponse);
+        return eduFileVoRPCBaseResponse;
+    }
 }

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

@@ -46,6 +46,7 @@ public class ShopSpecValueController extends BaseController<ShopSpecValue> imple
     }
 
     /**
+     * 更新规格值
      * @param entity
      * @return
      */
@@ -59,6 +60,11 @@ public class ShopSpecValueController extends BaseController<ShopSpecValue> imple
         return shopSpecValueVoRPCBaseResponse;
     }
 
+    /**
+     * 新增规格值
+     * @param entity
+     * @return
+     */
     @Override
     public RPCBaseResponse<ShopSpecValueVo> saveFormTarget(ShopSpecValueDto entity) {
         ShopSpecValue shopSpecValue = new ShopSpecValue();
@@ -69,6 +75,11 @@ public class ShopSpecValueController extends BaseController<ShopSpecValue> imple
         return shopSpecValueVoRPCBaseResponse;
     }
 
+    /**
+     * 删除规格值
+     * @param ids
+     * @return
+     */
     @Override
     public RPCBaseResponse<ShopSpecValueVo> deleteTargetFormId(List<String> ids) {
         RPCBaseResponse<ShopSpecValue> shopSpecValueRPCBaseResponse = super.deleteTargetById(ids);
@@ -77,6 +88,10 @@ public class ShopSpecValueController extends BaseController<ShopSpecValue> imple
         return shopSpecValueVoRPCBaseResponse;
     }
 
+    /**
+     * 获取所有规格值
+     * @return
+     */
     @Override
     public RPCBaseResponse<List<ShopSpecValueVo>> getAllForm() {
         RPCBaseResponse<List<ShopSpecValue>> shopSpecValueRPCBaseResponse = super.listAll();

edu-travel-service/edu-travel-service-tenement/src/main/java/edu/travel/tenant/entity/ShopBanner.java

@@ -24,7 +24,7 @@ public class ShopBanner extends BaseEntity {
      * 轮播图ID
      */
     @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private Long id;
+    private String id;
 
     /**
      * 图片/视频
@@ -47,7 +47,7 @@ public class ShopBanner extends BaseEntity {
      * 国家
      */
     @TableField(value = "country_id")
-    private Long countryId;
+    private String countryId;
 
     /**
      * 链接地址

edu-travel-service/edu-travel-service-tenement/src/main/java/edu/travel/tenant/service/ShopBannerService.java

@@ -2,7 +2,9 @@ package edu.travel.tenant.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import edu.travel.remote.feign.mode.dto.tenant.BannerDefaultAndEnableDto;
 import edu.travel.remote.feign.mode.dto.tenant.BannerDto;
+import edu.travel.remote.feign.mode.vo.banner.BannerDefaultAndEnableVo;
 import edu.travel.remote.feign.mode.vo.banner.BannerVo;
 import edu.travel.rpc.RPCBaseResponse;
 import edu.travel.tenant.entity.ShopBanner;
@@ -23,4 +25,6 @@ public interface ShopBannerService extends IService<ShopBanner> {
     RPCBaseResponse<BannerVo> updateBannerCountry(BannerDto banner);
 
     RPCBaseResponse<IPage<BannerVo>> getBannerAllPage(BannerDto banner);
+
+    RPCBaseResponse<BannerDefaultAndEnableVo> updateBannerDefaultAndEnable(BannerDefaultAndEnableDto banner);
 }

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

@@ -12,7 +12,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import edu.travel.adapter.service.country.CountryAdapter;
 import edu.travel.adapter.service.upload.UploadAdapter;
+import edu.travel.remote.feign.mode.dto.tenant.BannerDefaultAndEnableDto;
 import edu.travel.remote.feign.mode.dto.tenant.BannerDto;
+import edu.travel.remote.feign.mode.vo.banner.BannerDefaultAndEnableVo;
 import edu.travel.remote.feign.mode.vo.banner.BannerVo;
 import edu.travel.remote.upload.dto.EduFileDTO;
 import edu.travel.remote.upload.vo.EduFileVo;
@@ -23,6 +25,7 @@ import edu.travel.tenant.mapper.ShopBannerMapper;
 import edu.travel.tenant.service.ShopBannerService;
 import edu.travel.tenant.utils.FIleUtil;
 import edu.travel.vo.BaseCountryServeVo;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -287,6 +290,32 @@ public class ShopBannerServiceImpl extends ServiceImpl<ShopBannerMapper, ShopBan
         return new RPCBaseResponse<>(200, "SUCCESS", pageVoLink);
     }
 
+    @Override
+    public RPCBaseResponse<BannerDefaultAndEnableVo> updateBannerDefaultAndEnable(BannerDefaultAndEnableDto banner) {
+        // 验证输入数据是否合法
+        if (ObjectUtil.isEmpty(banner) || ObjectUtil.isEmpty(banner.getId())) {
+            return new RPCBaseResponse<>(400, "Banner data cannot be null and id must be provided", null);
+        }
+        // 创建对象，用于更新
+        ShopBanner shopBanner = new ShopBanner();
+        shopBanner.setId(banner.getId());
+        shopBanner.setEnable(banner.getEnable());
+        shopBanner.setIsDefault(banner.getIsDefault());
+        shopBanner.setSortOrder(banner.getSortOrder());
+        //执行更新操作
+        boolean success = shopBannerService.updateById(shopBanner);
+        //检查是否更新成功
+        if (!success) {
+            return new RPCBaseResponse<>(500, "FAIL", null);
+        }
+        //创建返回的结果对象
+        BannerDefaultAndEnableVo bannerDefaultAndEnableVo = new BannerDefaultAndEnableVo();
+        BeanUtils.copyProperties(shopBanner, bannerDefaultAndEnableVo);
+        //返回成功的响应
+        return new RPCBaseResponse<>(200, "SUCCESS", bannerDefaultAndEnableVo);
+    }
+
+
     //查询国家信息
     private Map<String, BannerVo> fetchCountryData(Set<String> countryIds) {
         Map<String, BannerVo> countryMap = new HashMap<>();

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

@@ -1,8 +1,11 @@
 package edu.travel.tenant.web;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import edu.travel.remote.feign.mode.dto.tenant.BannerDefaultAndEnableDto;
 import edu.travel.remote.feign.mode.dto.tenant.BannerDto;
 import edu.travel.remote.feign.mode.romote.ShopBannerRemoteController;
+import edu.travel.remote.feign.mode.vo.banner.BannerDefaultAndEnableVo;
 import edu.travel.remote.feign.mode.vo.banner.BannerVo;
 import edu.travel.resp.BaseResponse;
 import edu.travel.rpc.RPCBaseResponse;
@@ -64,10 +67,16 @@ public class ShopBannerController extends BaseController<ShopBanner> implements
      * 更新轮播图信息（通过上传返回id自动填充）
      */
     @PostMapping("/updateBannerCountry")
-    public RPCBaseResponse<BannerVo> updateBannerCountry(BannerDto banner) {
+    public RPCBaseResponse<BannerVo> updateBannerCountry(@RequestBody BannerDto banner) {
         return shopBannerService.updateBannerCountry(banner);
     }
-
+    /**
+     * 排序/默认/启用状态更新
+     */
+    @PostMapping("/updateBannerDefaultAndEnable")
+    public RPCBaseResponse<BannerDefaultAndEnableVo> updateBannerDefaultAndEnable(@RequestBody BannerDefaultAndEnableDto banner) {
+        return shopBannerService.updateBannerDefaultAndEnable(banner);
+    }
     /**
      * 上传banner图片
      *
@@ -136,7 +145,7 @@ public class ShopBannerController extends BaseController<ShopBanner> implements
      */
     @Override
     @GetMapping("/deleteFormTarget")
-    public RPCBaseResponse<BannerVo> deleteTargetFormId(List<String> ids) {
+    public RPCBaseResponse<BannerVo> deleteTargetFormId(@RequestBody List<String> ids) {
         RPCBaseResponse<ShopBanner> shopBannerRPCBaseResponse = super.deleteTargetById(ids);
         RPCBaseResponse<BannerVo> shopBannerVoRPCBaseResponse = new RPCBaseResponse<>();
         BeanUtils.copyProperties(shopBannerRPCBaseResponse, shopBannerVoRPCBaseResponse);

edu-travel-service/edu-travel-service-upload/src/main/java/edu/travel/upload/web/UploadController.java

@@ -189,7 +189,7 @@ public class UploadController extends BaseController<EduFile> implements UploadR
 
 
     /**
-     * 通过id上传文件
+     * 通过id查找上传文件
      *
      * @param id
      * @return

edu-travel-service/edu-travel-service-warehouse/src/main/java/edu/travel/warehouse/service/ShopWarehouseService.java

@@ -24,8 +24,8 @@ public interface ShopWarehouseService extends IService<ShopWarehouse> {
     RPCBaseResponse<List<ShopWarehouseStaffVo>> getWarehouseTenantRole(String id);
 
     //连表新增
-    RPCBaseResponse<ShopWarehouseVo> saveAllForm(@RequestBody ShopWarehouseSaveDto entity, HttpServletRequest request);
+    RPCBaseResponse<ShopWarehouseVo> saveAllForm(@RequestBody ShopWarehouseSaveDto entity);
 
     //连表修改
-    RPCBaseResponse<ShopWarehouseVo> updateWarehouse(@RequestBody ShopWarehouseSaveDto entity, HttpServletRequest request);
+    RPCBaseResponse<ShopWarehouseVo> updateWarehouse(@RequestBody ShopWarehouseSaveDto entity);
 }

edu-travel-service/edu-travel-service-warehouse/src/main/java/edu/travel/warehouse/service/impl/ShopWarehouseServiceImpl.java

@@ -305,12 +305,12 @@ public class ShopWarehouseServiceImpl extends SysServiceImpl<ShopWarehouseMapper
      */
     @Override
     @Transactional
-    public RPCBaseResponse<ShopWarehouseVo> saveAllForm(@RequestBody ShopWarehouseSaveDto entity, HttpServletRequest request) {
+    public RPCBaseResponse<ShopWarehouseVo> saveAllForm(ShopWarehouseSaveDto entity) {
         // 创建一个新的 ShopWarehouse 实体
         ShopWarehouse warehouse = new ShopWarehouse();
 
-        // 从请求头中获取 project 的值
-        String project = request.getHeader("Project");
+        // 获取项目值（现在从 DTO 中获取）
+        String project = entity.getProject();
         warehouse.setProject(project); // 设置 project
 
         // 获取当前用户 ID
@@ -339,39 +339,40 @@ public class ShopWarehouseServiceImpl extends SysServiceImpl<ShopWarehouseMapper
 
     @Override
     @Transactional
-    public RPCBaseResponse<ShopWarehouseVo> updateWarehouse(@RequestBody ShopWarehouseSaveDto entity, HttpServletRequest request) {
-        // 根据 ID 查找现有的仓库信息
-        ShopWarehouse existingWarehouse = shopWarehouseMapper.selectById(entity.getId());
+    public RPCBaseResponse<ShopWarehouseVo> updateWarehouse(ShopWarehouseSaveDto entity) {
+        // 创建一个新的 ShopWarehouse 实体
+        ShopWarehouse warehouse = shopWarehouseMapper.selectById(entity.getId());
 
         // 如果找不到该仓库，返回错误响应
-        if (existingWarehouse == null) {
+        if (warehouse == null) {
             return new RPCBaseResponse<>(404, "找不到仓库", null);
         }
 
-        // 从请求头中获取 project 的值
-        String project = request.getHeader("Project");
-        existingWarehouse.setProject(project); // 设置 project
-
-        // 更新现有仓库的属性
-        copyWarehouseProperties(entity, existingWarehouse);
+        // 从 DTO 中复制属性
+        copyWarehouseProperties(entity, warehouse);
 
         // 获取当前用户 ID
         Long currentUserId = getCurrentUserId();
-        existingWarehouse.setUpdateUserId(String.valueOf(currentUserId));
+        warehouse.setUpdateUserId(String.valueOf(currentUserId));
+
+        // 检查项目是否存在
+        if (warehouse.getProject() == null) {
+            return new RPCBaseResponse<>(400, "项目不能为空", null);
+        }
 
         // 更新仓库信息到数据库
-        shopWarehouseMapper.updateById(existingWarehouse);
+        shopWarehouseMapper.updateById(warehouse);
 
         // 更新员工角色信息
         if (entity.getStaffList() != null) {
             // 先删除原有员工信息
-            shopWarehouseStaffMapper.deleteByWarehouseId(existingWarehouse.getId());
+            shopWarehouseStaffMapper.deleteByWarehouseId(warehouse.getId());
             // 然后插入新的员工角色信息
-            saveStaffRoles(entity.getStaffList(), existingWarehouse.getId(), currentUserId, project); // 传入 project
+            saveStaffRoles(entity.getStaffList(), warehouse.getId(), currentUserId, entity.getProject());
         }
 
         // 构建并返回响应对象
-        return buildWarehouseResponse(existingWarehouse);
+        return buildWarehouseResponse(warehouse);
     }
 
 
@@ -410,8 +411,8 @@ public class ShopWarehouseServiceImpl extends SysServiceImpl<ShopWarehouseMapper
         for (ShopWarehouseStaffDto staffDto : staffList) {
             ShopWarehouseStaff staff = new ShopWarehouseStaff();
             staff.setWarehouseId(warehouseId);
-            staff.setUserId(staffDto.getUserId());
-            staff.setRoleId(staffDto.getRoleId());
+            staff.setUserId(Long.valueOf(staffDto.getUserId()));
+            staff.setRoleId(Long.valueOf(staffDto.getRoleId()));
             staff.setCreateUserId(String.valueOf(currentUserId)); // 设置创建用户 ID
             staff.setProject(project); // 设置项目
 

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

@@ -12,7 +12,10 @@ import edu.travel.warehouse.service.ShopWarehouseService;
 import edu.travel.web.BaseController;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -58,19 +61,28 @@ public class ShopWarehouseController extends BaseController<ShopWarehouse> imple
      * 库房连表新增
      */
     @PostMapping("/saveAllForm")
-    public RPCBaseResponse<ShopWarehouseVo> saveAllForm(@RequestBody ShopWarehouseSaveDto entity, HttpServletRequest request) {
-        return shopWarehouseService.saveAllForm(entity, request);
+    public RPCBaseResponse<ShopWarehouseVo> saveAllForm(@RequestBody ShopWarehouseSaveDto entity) {
+        HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
+
+        // 从请求头中获取 project 的值并设置到 DTO 中
+        String project = request.getHeader("Project");
+        entity.setProject(project); // 设置项目到 DTO 中
+        return shopWarehouseService.saveAllForm(entity); // 只传递 DTO
     }
 
+
+
     /**
      * 库房连表修改
      */
     @PostMapping("/updateWarehouse")
-    public RPCBaseResponse<ShopWarehouseVo> updateWarehouse(@RequestBody ShopWarehouseSaveDto entity, HttpServletRequest request) {
-        return shopWarehouseService.updateWarehouse(entity, request);
+    public RPCBaseResponse<ShopWarehouseVo> updateWarehouse(@RequestBody ShopWarehouseSaveDto entity) {
+        HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
+        // 从请求头中获取 project 的值并设置到 DTO 中
+        String project = request.getHeader("Project");
+        entity.setProject(project); // 将 project 设置到 DTO 中
+        return shopWarehouseService.updateWarehouse(entity); // 只传递 DTO
     }
-
-
     /**
      * 查询库房详情
      */