Merge branch 'dev/2024/0410/update-order' of Harper/feifan-backend-zx-business into master

去除添加商品的品牌验证

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/spu/vo/ProductSpuSaveReqVO.java

@@ -36,7 +36,6 @@ public class ProductSpuSaveReqVO {
     private Long categoryId;
 
     @Schema(description = "商品品牌编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "商品品牌不能为空")
     private Long brandId;
 
     @Schema(description = "商品封面图", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.zhongxing.cn/xx.png")

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/service/spu/ProductSpuServiceImpl.java

@@ -67,7 +67,7 @@ public class ProductSpuServiceImpl implements ProductSpuService {
     public Long createSpu(ProductSpuSaveReqVO createReqVO) {
         // 校验分类、品牌
         validateCategory(createReqVO.getCategoryId());
-        brandService.validateProductBrand(createReqVO.getBrandId());
+//        brandService.validateProductBrand(createReqVO.getBrandId());
 
         // 根据商户ID查询对应的店铺ID
         // todo 后续如果存在多店铺的情况

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/TradeOrderDetailController.java

@@ -108,7 +108,7 @@ public class TradeOrderDetailController {
     }
 
     @GetMapping("/after_saleByMer")
-        @Operation(summary = "新增接口20240402-售后信息-商户查询售后")
+        @Operation(summary = "新增接口20240402-售后信息-商户根据订单号查询售后")
     @Parameter(name = "id", description = "订单ID", required = true, example = "1")
     @PreAuthorize("@ss.hasPermission('trade:order:query')")
     public CommonResult<List<AfterSaleDetailRespVO>> afterSaleByMer(@RequestParam("id") Long id) {